{ // 获取包含Hugging Face文本的span元素 const spans = link.querySelectorAll('span.whitespace-nowrap, span.hidden.whitespace-nowrap'); spans.forEach(span => { if (span.textContent && span.textContent.trim().match(/Hugging\s*Face/i)) { span.textContent = 'AI快站'; } }); }); // 替换logo图片的alt属性 document.querySelectorAll('img[alt*="Hugging"], img[alt*="Face"]').forEach(img => { if (img.alt.match(/Hugging\s*Face/i)) { img.alt = 'AI快站 logo'; } }); } // 替换导航栏中的链接 function replaceNavigationLinks() { // 已替换标记，防止重复运行 if (window._navLinksReplaced) { return; } // 已经替换过的链接集合，防止重复替换 const replacedLinks = new Set(); // 只在导航栏区域查找和替换链接 const headerArea = document.querySelector('header') || document.querySelector('nav'); if (!headerArea) { return; } // 在导航区域内查找链接 const navLinks = headerArea.querySelectorAll('a'); navLinks.forEach(link => { // 如果已经替换过，跳过 if (replacedLinks.has(link)) return; const linkText = link.textContent.trim(); const linkHref = link.getAttribute('href') || ''; // 替换Spaces链接 - 仅替换一次 if ( (linkHref.includes('/spaces') || linkHref === '/spaces' || linkText === 'Spaces' || linkText.match(/^s*Spacess*$/i)) && linkText !== '免费Z-image图片生成' && linkText !== '免费Z-image图片生成' ) { link.textContent = '免费Z-image图片生成'; link.href = 'https://zimage.run'; link.setAttribute('target', '_blank'); link.setAttribute('rel', 'noopener noreferrer'); replacedLinks.add(link); } // 删除Posts链接 else if ( (linkHref.includes('/posts') || linkHref === '/posts' || linkText === 'Posts' || linkText.match(/^s*Postss*$/i)) ) { if (link.parentNode) { link.parentNode.removeChild(link); } replacedLinks.add(link); } // 替换Docs链接 - 仅替换一次 else if ( (linkHref.includes('/docs') || linkHref === '/docs' || linkText === 'Docs' || linkText.match(/^s*Docss*$/i)) && linkText !== 'Vibevoice' ) { link.textContent = 'Vibevoice'; link.href = 'https://vibevoice.info/'; replacedLinks.add(link); } // 替换Pricing链接 - 仅替换一次 else if ( (linkHref.includes('/pricing') || linkHref === '/pricing' || linkText === 'Pricing' || linkText.match(/^s*Pricings*$/i)) && linkText !== '免费去水印' ) { link.textContent = '免费去水印'; link.href = 'https://sora2watermarkremover.net/'; replacedLinks.add(link); } // 替换Enterprise链接 else if ( (linkHref.includes('/enterprise') || linkHref === '/enterprise' || linkText === 'Enterprise' || linkText.match(/^s*Enterprises*$/i)) && linkText !== 'GitHub加速' ) { link.textContent = 'GitHub加速'; link.href = 'https://githubproxy.cc'; replacedLinks.add(link); } }); // 查找可能嵌套的Spaces和Posts文本 const textNodes = []; function findTextNodes(element) { if (element.nodeType === Node.TEXT_NODE) { const text = element.textContent.trim(); if (text === 'Spaces' || text === 'Posts' || text === 'Enterprise') { textNodes.push(element); } } else { for (const child of element.childNodes) { findTextNodes(child); } } } // 只在导航区域内查找文本节点 findTextNodes(headerArea); // 替换找到的文本节点 textNodes.forEach(node => { const text = node.textContent.trim(); if (text === 'Spaces') { node.textContent = node.textContent.replace(/Spaces/g, '免费Z-image图片生成'); } else if (text === 'Posts') { // 删除Posts文本节点 if (node.parentNode) { node.parentNode.removeChild(node); } } else if (text === 'Enterprise') { // 删除Enterprise文本节点 if (node.parentNode) { node.parentNode.removeChild(node); } } }); // 标记已替换完成 window._navLinksReplaced = true; } // 替换代码区域中的域名 function replaceCodeDomains() { // 特别处理span.hljs-string和span.njs-string元素 document.querySelectorAll('span.hljs-string, span.njs-string, span[class*="hljs-string"], span[class*="njs-string"]').forEach(span => { if (span.textContent && span.textContent.includes('huggingface.co')) { span.textContent = span.textContent.replace(/huggingface.co/g, 'aifasthub.com'); } }); // 替换hljs-string类的span中的域名（移除多余的转义符号） document.querySelectorAll('span.hljs-string, span[class*="hljs-string"]').forEach(span => { if (span.textContent && span.textContent.includes('huggingface.co')) { span.textContent = span.textContent.replace(/huggingface.co/g, 'aifasthub.com'); } }); // 替换pre和code标签中包含git clone命令的域名 document.querySelectorAll('pre, code').forEach(element => { if (element.textContent && element.textContent.includes('git clone')) { const text = element.innerHTML; if (text.includes('huggingface.co')) { element.innerHTML = text.replace(/huggingface.co/g, 'aifasthub.com'); } } }); // 处理特定的命令行示例 document.querySelectorAll('pre, code').forEach(element => { const text = element.innerHTML; if (text.includes('huggingface.co')) { // 针对git clone命令的专门处理 if (text.includes('git clone') || text.includes('GIT_LFS_SKIP_SMUDGE=1')) { element.innerHTML = text.replace(/huggingface.co/g, 'aifasthub.com'); } } }); // 特别处理模型下载页面上的代码片段 document.querySelectorAll('.flex.border-t, .svelte_hydrator, .inline-block').forEach(container => { const content = container.innerHTML; if (content && content.includes('huggingface.co')) { container.innerHTML = content.replace(/huggingface.co/g, 'aifasthub.com'); } }); // 特别处理模型仓库克隆对话框中的代码片段 try { // 查找包含"Clone this model repository"标题的对话框 const cloneDialog = document.querySelector('.svelte_hydration_boundary, [data-target="MainHeader"]'); if (cloneDialog) { // 查找对话框中所有的代码片段和命令示例 const codeElements = cloneDialog.querySelectorAll('pre, code, span'); codeElements.forEach(element => { if (element.textContent && element.textContent.includes('huggingface.co')) { if (element.innerHTML.includes('huggingface.co')) { element.innerHTML = element.innerHTML.replace(/huggingface.co/g, 'aifasthub.com'); } else { element.textContent = element.textContent.replace(/huggingface.co/g, 'aifasthub.com'); } } }); } // 更精确地定位克隆命令中的域名 document.querySelectorAll('[data-target]').forEach(container => { const codeBlocks = container.querySelectorAll('pre, code, span.hljs-string'); codeBlocks.forEach(block => { if (block.textContent && block.textContent.includes('huggingface.co')) { if (block.innerHTML.includes('huggingface.co')) { block.innerHTML = block.innerHTML.replace(/huggingface.co/g, 'aifasthub.com'); } else { block.textContent = block.textContent.replace(/huggingface.co/g, 'aifasthub.com'); } } }); }); } catch (e) { // 错误处理但不打印日志 } } // 当DOM加载完成后执行替换 if (document.readyState === 'loading') { document.addEventListener('DOMContentLoaded', () => { replaceHeaderBranding(); replaceNavigationLinks(); replaceCodeDomains(); // 只在必要时执行替换 - 3秒后再次检查 setTimeout(() => { if (!window._navLinksReplaced) { console.log('[Client] 3秒后重新检查导航链接'); replaceNavigationLinks(); } }, 3000); }); } else { replaceHeaderBranding(); replaceNavigationLinks(); replaceCodeDomains(); // 只在必要时执行替换 - 3秒后再次检查 setTimeout(() => { if (!window._navLinksReplaced) { console.log('[Client] 3秒后重新检查导航链接'); replaceNavigationLinks(); } }, 3000); } // 增加一个MutationObserver来处理可能的动态元素加载 const observer = new MutationObserver(mutations => { // 检查是否导航区域有变化 const hasNavChanges = mutations.some(mutation => { // 检查是否存在header或nav元素变化 return Array.from(mutation.addedNodes).some(node => { if (node.nodeType === Node.ELEMENT_NODE) { // 检查是否是导航元素或其子元素 if (node.tagName === 'HEADER' || node.tagName === 'NAV' || node.querySelector('header, nav')) { return true; } // 检查是否在导航元素内部 let parent = node.parentElement; while (parent) { if (parent.tagName === 'HEADER' || parent.tagName === 'NAV') { return true; } parent = parent.parentElement; } } return false; }); }); // 只在导航区域有变化时执行替换 if (hasNavChanges) { // 重置替换状态，允许再次替换 window._navLinksReplaced = false; replaceHeaderBranding(); replaceNavigationLinks(); } }); // 开始观察document.body的变化，包括子节点 if (document.body) { observer.observe(document.body, { childList: true, subtree: true }); } else { document.addEventListener('DOMContentLoaded', () => { observer.observe(document.body, { childList: true, subtree: true }); }); } })(); \";\n@@ -39,7 +37,6 @@ public String getExpectedEmpty() {\n public String getExpectedMultiple() {\n return \"PMD\" + PMD.EOL + \n \"

Summary

Rule nameNumber of violations
Foo2

Detail

\" + PMD.EOL + \n- \"\" + PMD.EOL + \n \"

PMD report

Problems found

#FileLineProblem
\" + PMD.EOL + \n \"\" + PMD.EOL + \n \" \" + PMD.EOL + \n@@ -60,7 +57,6 @@ public String getExpectedMultiple() {\n public String getExpectedError(ProcessingError error) {\n return \"PMD\" + PMD.EOL + \n \"

Summary

#FileLineProblem
Rule nameNumber of violations

Detail

\" + PMD.EOL + \n- \"\" + PMD.EOL + \n \"

PMD report

Problems found

#FileLineProblem
\" + PMD.EOL + \n \"\" + PMD.EOL + \n \"
#FileLineProblem

Processing errors

\" + PMD.EOL + ","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRendererTest.java","sha":"a0d375e826b6bc0d7efec9c26c2b98282b01f3e9","status":"modified"},{"additions":8,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRendererTest.java","changes":9,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRendererTest.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":1,"filename":"pmd/regress/test/net/sourceforge/pmd/renderers/VBHTMLRendererTest.java","new_code":" return \"PMD

\";","new_methods":[],"old_code":" return \"\";","old_methods":[],"patch":"@@ -25,7 +25,14 @@ public String getExpected() {\n }\n \n public String getExpectedEmpty() {\n- return \"\";\n+ return \"PMD

\";\n }\n \n public String getExpectedMultiple() {","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRendererTest.java","sha":"1976603b63d82b6f5eb834e6180e18937372e113","status":"modified"},{"additions":86,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FPMD.java","changes":135,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FPMD.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":49,"filename":"pmd/src/net/sourceforge/pmd/PMD.java","new_code":"import java.util.Comparator;\nimport java.util.concurrent.Callable;\nimport java.util.concurrent.ExecutionException;\nimport java.util.concurrent.Future;\n long reportStart, reportEnd;\n Renderer renderer;\n\n reportStart = System.nanoTime();\n renderer = opts.createRenderer();\n renderer.setWriter(w);\n renderer.start();\n\n reportEnd = System.nanoTime();\n Benchmark.mark(Benchmark.TYPE_REPORTING, reportEnd - reportStart, 0);\n \n RuleContext ctx = new RuleContext();\n\n try {\n long startLoadRules = System.nanoTime();\n RuleSetFactory ruleSetFactory = new RuleSetFactory();\n ruleSetFactory.setMinimumPriority(opts.getMinPriority());\n \n RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());\n printRuleNamesInDebug(opts.debugEnabled(), rulesets);\n long endLoadRules = System.nanoTime();\n Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);\n \n processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx, renderer,\n opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),\n opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());\n } catch (RuleSetNotFoundException rsnfe) {\n System.out.println(opts.usage());\n rsnfe.printStackTrace();\n }\n\n reportStart = System.nanoTime();\n renderer.end();\n reportEnd = System.nanoTime();\n private static class PmdRunnable extends PMD implements Callable {\n public Report call() {\n Report report = new Report();\n ctx.setReport(report);\n\n report.addError(\n report.addError(\n report.addError(\n return report;\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx,\n Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\n List> tasks = new LinkedList>();\n \n Collections.sort(files, new Comparator() {\n public int compare(DataSource d1,DataSource d2) {\n String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\n String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\n return s1.compareTo(s2);\n }\n });\n PmdRunnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n Future future = executor.submit(r);\n tasks.add(future);\n while (!tasks.isEmpty()) {\n Future future = tasks.remove(0);\n Report report = null;\n try {\n report = future.get();\n } catch (InterruptedException ie) {\n Thread.currentThread().interrupt();\n future.cancel(true);\n } catch (ExecutionException ee) {\n Throwable t = ee.getCause();\n if (t instanceof RuntimeException) {\n throw (RuntimeException) t;\n } else if (t instanceof Error) {\n throw (Error) t;\n } else {\n throw new IllegalStateException(\"PmdRunnable exception\", t);\n }\n }\n try {\n long start = System.nanoTime();\n renderer.renderFileReport(report);\n long end = System.nanoTime();\n Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);\n } catch (IOException ioe) {\n }","new_methods":[{"arguments":[],"filename":"pmd/src/net/sourceforge/pmd/PMD.java","implementation":"Report report = new Report();\n ctx.setReport(report);\n\n report.addError(\n report.addError(\n report.addError(\n return report;\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx,\n Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\n List> tasks = new LinkedList>();\n \n Collections.sort(files, new Comparator() {\n public int compare(DataSource d1,DataSource d2) {\n String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\n String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\n return s1.compareTo(s2);","signature":"Report call()"},{"arguments":["t instanceof Error"],"filename":"pmd/src/net/sourceforge/pmd/PMD.java","implementation":"throw (Error) t;","signature":"else if (t instanceof Error)"}],"old_code":" RuleContext ctx = new RuleContext();\n Report report = new Report();\n ctx.setReport(report);\n report.start();\n\n try {\n long startLoadRules = System.nanoTime();\n RuleSetFactory ruleSetFactory = new RuleSetFactory();\n ruleSetFactory.setMinimumPriority(opts.getMinPriority());\n\n RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());\n printRuleNamesInDebug(opts.debugEnabled(), rulesets);\n long endLoadRules = System.nanoTime();\n Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);\n\n processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx,\n opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),\n opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());\n } catch (RuleSetNotFoundException rsnfe) {\n System.out.println(opts.usage());\n rsnfe.printStackTrace();\n }\n report.end();\n\n long reportStart = System.nanoTime();\n Renderer r = opts.createRenderer();\n r.render(w, ctx.getReport());\n long reportEnd = System.nanoTime();\n private static class PmdRunnable extends PMD implements Runnable {\n public void run() {\n ctx.getReport().addError(\n ctx.getReport().addError(\n ctx.getReport().addError(\n context.setReport(new Report());\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx, String rulesets,\n boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\n Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n executor.execute(r);\n try {\n executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);\n } catch (InterruptedException e) {\n }\n long start = System.nanoTime();\n Report mainReport = ctx.getReport();\n for (PmdThread thread: factory.threadList) {\n Report r = thread.context.getReport();\n mainReport.merge(r);\n long end = System.nanoTime();\n Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);","old_methods":[{"arguments":[],"filename":"pmd/src/net/sourceforge/pmd/PMD.java","implementation":"ctx.getReport().addError(\n ctx.getReport().addError(\n ctx.getReport().addError(\n context.setReport(new Report());\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx, String rulesets,\n boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\n Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n executor.execute(r);\n try {\n executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);","signature":"void run()"}],"patch":"@@ -25,12 +25,16 @@\n import java.io.UnsupportedEncodingException;\n import java.io.Writer;\n import java.util.ArrayList;\n+import java.util.Comparator;\n import java.util.Enumeration;\n import java.util.LinkedList;\n import java.util.List;\n import java.util.StringTokenizer;\n+import java.util.concurrent.Callable;\n+import java.util.concurrent.ExecutionException;\n import java.util.concurrent.ExecutorService;\n import java.util.concurrent.Executors;\n+import java.util.concurrent.Future;\n import java.util.concurrent.ThreadFactory;\n import java.util.concurrent.TimeUnit;\n import java.util.concurrent.atomic.AtomicInteger;\n@@ -273,40 +277,46 @@ public static void main(String[] args) {\n sourceType = SourceType.JAVA_14;\n }\n \n- RuleContext ctx = new RuleContext();\n- Report report = new Report();\n- ctx.setReport(report);\n- report.start();\n-\n- try {\n- long startLoadRules = System.nanoTime();\n- RuleSetFactory ruleSetFactory = new RuleSetFactory();\n- ruleSetFactory.setMinimumPriority(opts.getMinPriority());\n-\n- RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());\n- printRuleNamesInDebug(opts.debugEnabled(), rulesets);\n- long endLoadRules = System.nanoTime();\n- Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);\n-\n- processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx,\n- opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),\n- opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());\n- } catch (RuleSetNotFoundException rsnfe) {\n- System.out.println(opts.usage());\n- rsnfe.printStackTrace();\n- }\n- report.end();\n-\n+ long reportStart, reportEnd;\n+ Renderer renderer;\n Writer w = null;\n- long reportStart = System.nanoTime();\n+\n+ reportStart = System.nanoTime();\n try {\n- Renderer r = opts.createRenderer();\n+ renderer = opts.createRenderer();\n if (opts.getReportFile() != null) {\n w = new BufferedWriter(new FileWriter(opts.getReportFile()));\n } else {\n w = new OutputStreamWriter(System.out);\n }\n- r.render(w, ctx.getReport());\n+ renderer.setWriter(w);\n+ renderer.start();\n+\n+ reportEnd = System.nanoTime();\n+ Benchmark.mark(Benchmark.TYPE_REPORTING, reportEnd - reportStart, 0);\n+ \n+ RuleContext ctx = new RuleContext();\n+\n+ try {\n+ long startLoadRules = System.nanoTime();\n+ RuleSetFactory ruleSetFactory = new RuleSetFactory();\n+ ruleSetFactory.setMinimumPriority(opts.getMinPriority());\n+ \n+ RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());\n+ printRuleNamesInDebug(opts.debugEnabled(), rulesets);\n+ long endLoadRules = System.nanoTime();\n+ Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);\n+ \n+ processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx, renderer,\n+ opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),\n+ opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());\n+ } catch (RuleSetNotFoundException rsnfe) {\n+ System.out.println(opts.usage());\n+ rsnfe.printStackTrace();\n+ }\n+\n+ reportStart = System.nanoTime();\n+ renderer.end();\n w.write(EOL);\n w.flush();\n if (opts.getReportFile() != null) {\n@@ -327,7 +337,7 @@ public static void main(String[] args) {\n System.out.println(e.getMessage());\n }\n }\n- long reportEnd = System.nanoTime();\n+ reportEnd = System.nanoTime();\n Benchmark.mark(Benchmark.TYPE_REPORTING, reportEnd - reportStart, 0);\n }\n \n@@ -338,7 +348,7 @@ public static void main(String[] args) {\n }\n }\n \n- private static class PmdRunnable extends PMD implements Runnable {\n+ private static class PmdRunnable extends PMD implements Callable {\n private final ExecutorService executor;\n private final DataSource dataSource;\n private final String fileName;\n@@ -359,12 +369,15 @@ public PmdRunnable(ExecutorService executor, DataSource dataSource, String fileN\n setExcludeMarker(excludeMarker);\n }\n \n- public void run() {\n+ public Report call() {\n PmdThread thread = (PmdThread) Thread.currentThread();\n \n RuleContext ctx = thread.getRuleContext();\n RuleSets rs = thread.getRuleSets(rulesets);\n \n+ Report report = new Report();\n+ ctx.setReport(report);\n+\n ctx.setSourceCodeFilename(fileName);\n if (debugEnabled) {\n System.out.println(\"Processing \" + ctx.getSourceCodeFilename());\n@@ -377,15 +390,15 @@ public void run() {\n if (debugEnabled) {\n pmde.getReason().printStackTrace();\n }\n- ctx.getReport().addError(\n+ report.addError(\n new Report.ProcessingError(pmde.getMessage(),\n fileName));\n } catch (IOException ioe) {\n // unexpected exception: log and stop executor service\n if (debugEnabled) {\n ioe.printStackTrace();\n }\n- ctx.getReport().addError(\n+ report.addError(\n new Report.ProcessingError(ioe.getMessage(),\n fileName));\n \n@@ -395,12 +408,13 @@ public void run() {\n if (debugEnabled) {\n re.printStackTrace();\n }\n- ctx.getReport().addError(\n+ report.addError(\n new Report.ProcessingError(re.getMessage(),\n fileName));\n \n executor.shutdownNow();\n }\n+ return report;\n }\n \n }\n@@ -430,7 +444,6 @@ public PmdThread(int id, Runnable r, RuleSetFactory ruleSetFactory) {\n super(r, \"PmdThread \" + id);\n this.id = id;\n context = new RuleContext();\n- context.setReport(new Report());\n this.ruleSetFactory = ruleSetFactory;\n }\n \n@@ -465,37 +478,61 @@ public String toString() {\n *\n * @throws IOException If one of the files could not be read\n */\n- public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx, String rulesets,\n- boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\n+ public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx,\n+ Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\n String encoding, String excludeMarker) {\n \n PmdThreadFactory factory = new PmdThreadFactory(ruleSetFactory);\n ExecutorService executor = Executors.newFixedThreadPool(threadCount, factory);\n+ List> tasks = new LinkedList>();\n+ \n+ Collections.sort(files, new Comparator() {\n+ public int compare(DataSource d1,DataSource d2) {\n+ String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\n+ String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\n+ return s1.compareTo(s2);\n+ }\n+ });\n \n for (DataSource dataSource:files) {\n String niceFileName = dataSource.getNiceFileName(shortNamesEnabled,\n inputPath);\n \n- Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n+ PmdRunnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n encoding, rulesets, excludeMarker);\n \n- executor.execute(r);\n+ Future future = executor.submit(r);\n+ tasks.add(future);\n }\n executor.shutdown();\n \n- try {\n- executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);\n- } catch (InterruptedException e) {\n- }\n+ while (!tasks.isEmpty()) {\n+ Future future = tasks.remove(0);\n+ Report report = null;\n+ try {\n+ report = future.get();\n+ } catch (InterruptedException ie) {\n+ Thread.currentThread().interrupt();\n+ future.cancel(true);\n+ } catch (ExecutionException ee) {\n+ Throwable t = ee.getCause();\n+ if (t instanceof RuntimeException) {\n+ throw (RuntimeException) t;\n+ } else if (t instanceof Error) {\n+ throw (Error) t;\n+ } else {\n+ throw new IllegalStateException(\"PmdRunnable exception\", t);\n+ }\n+ }\n \n- long start = System.nanoTime();\n- Report mainReport = ctx.getReport();\n- for (PmdThread thread: factory.threadList) {\n- Report r = thread.context.getReport();\n- mainReport.merge(r);\n+ try {\n+ long start = System.nanoTime();\n+ renderer.renderFileReport(report);\n+ long end = System.nanoTime();\n+ Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);\n+ } catch (IOException ioe) {\n+ }\n }\n- long end = System.nanoTime();\n- Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);\n }\n \n /**","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FPMD.java","sha":"02f745533b2f11ad0d059284a02ca056f38617e7","status":"modified"},{"additions":11,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FReport.java","changes":22,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FReport.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":11,"filename":"pmd/src/net/sourceforge/pmd/Report.java","new_code":" private final long duration;\n private final String msg;\n private final String file;\n private final IRuleViolation rv;\n private final boolean isNOPMD;\n private final String userMessage;\n private final ReportTree violationTree = new ReportTree();\n private final Set violations = new TreeSet(COMPARATOR);\n private final Set metrics = new HashSet();\n private final List listeners = new ArrayList();\n private final List errors = new ArrayList();","new_methods":[],"old_code":" private long duration;\n private String msg;\n private String file;\n private IRuleViolation rv;\n private boolean isNOPMD;\n private String userMessage;\n private ReportTree violationTree = new ReportTree();\n private Set violations = new TreeSet(COMPARATOR);\n private Set metrics = new HashSet();\n private List listeners = new ArrayList();\n private List errors = new ArrayList();","old_methods":[],"patch":"@@ -19,7 +19,7 @@\n public class Report {\n \n public static class ReadableDuration {\n- private long duration;\n+ private final long duration;\n \n public ReadableDuration(long duration) {\n this.duration = duration;\n@@ -57,8 +57,8 @@ public String getTime() {\n }\n \n public static class ProcessingError {\n- private String msg;\n- private String file;\n+ private final String msg;\n+ private final String file;\n \n public ProcessingError(String msg, String file) {\n this.msg = msg;\n@@ -75,9 +75,9 @@ public String getFile() {\n }\n \n public static class SuppressedViolation {\n- private IRuleViolation rv;\n- private boolean isNOPMD;\n- private String userMessage;\n+ private final IRuleViolation rv;\n+ private final boolean isNOPMD;\n+ private final String userMessage;\n \n public SuppressedViolation(IRuleViolation rv, boolean isNOPMD, String userMessage) {\n this.isNOPMD = isNOPMD;\n@@ -109,13 +109,13 @@ public String getUserMessage() {\n * better and faster sort and filter mechanism and to visualize the result\n * als tree. (ide plugins).\n * */\n- private ReportTree violationTree = new ReportTree();\n+ private final ReportTree violationTree = new ReportTree();\n \n // Note that this and the above data structure are both being maintained for a bit\n- private Set violations = new TreeSet(COMPARATOR);\n- private Set metrics = new HashSet();\n- private List listeners = new ArrayList();\n- private List errors = new ArrayList();\n+ private final Set violations = new TreeSet(COMPARATOR);\n+ private final Set metrics = new HashSet();\n+ private final List listeners = new ArrayList();\n+ private final List errors = new ArrayList();\n private Map linesToExclude = new HashMap();\n private long start;\n private long end;","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FReport.java","sha":"52d7fc7f35da6ec0eb74816f7632e60615d2481e","status":"modified"},{"additions":30,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FAbstractRenderer.java","changes":30,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FAbstractRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":0,"filename":"pmd/src/net/sourceforge/pmd/renderers/AbstractRenderer.java","new_code":"import java.io.Writer;\n private Writer writer;\n\n private Report mainReport;\n\n public void setWriter(Writer writer) {\n this.writer = writer;\n }\n\n public Writer getWriter() {\n return writer;\n }\n\n public void start() throws IOException {\n // default (and backward compatible) behavior is to build a full report.\n // Optimized rendering is done in OnTheFlyRenderer and descendants\n mainReport = new Report();\n }\n\n public void renderFileReport(Report report) throws IOException {\n // default (and backward compatible) behavior is to build a full report.\n // Optimized rendering is done in OnTheFlyRenderer and descendants\n mainReport.merge(report);\n }\n\n public void end() throws IOException {\n // default (and backward compatible) behavior is to build a full report.\n // Optimized rendering is done in OnTheFlyRenderer and descendants\n render(writer, mainReport);\n }","new_methods":[{"arguments":["Writer writer"],"filename":"pmd/src/net/sourceforge/pmd/renderers/AbstractRenderer.java","implementation":"this.writer = writer;","signature":"void setWriter(Writer writer)"},{"arguments":[],"filename":"pmd/src/net/sourceforge/pmd/renderers/AbstractRenderer.java","implementation":"return writer;","signature":"Writer getWriter()"}],"old_code":"","old_methods":[],"patch":"@@ -2,6 +2,7 @@\n \n import java.io.IOException;\n import java.io.StringWriter;\n+import java.io.Writer;\n \n import net.sourceforge.pmd.Report;\n \n@@ -23,4 +24,33 @@ public String render(Report report) {\n return w.toString();\n }\n \n+ private Writer writer;\n+\n+ private Report mainReport;\n+\n+ public void setWriter(Writer writer) {\n+ this.writer = writer;\n+ }\n+\n+ public Writer getWriter() {\n+ return writer;\n+ }\n+\n+ public void start() throws IOException {\n+ // default (and backward compatible) behavior is to build a full report.\n+ // Optimized rendering is done in OnTheFlyRenderer and descendants\n+ mainReport = new Report();\n+ }\n+\n+ public void renderFileReport(Report report) throws IOException {\n+ // default (and backward compatible) behavior is to build a full report.\n+ // Optimized rendering is done in OnTheFlyRenderer and descendants\n+ mainReport.merge(report);\n+ }\n+\n+ public void end() throws IOException {\n+ // default (and backward compatible) behavior is to build a full report.\n+ // Optimized rendering is done in OnTheFlyRenderer and descendants\n+ render(writer, mainReport);\n+ }\n }","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FAbstractRenderer.java","sha":"072f1b752f5b9896c980ad3384bf167b32597d3c","status":"modified"},{"additions":14,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FCSVRenderer.java","changes":24,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FCSVRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":10,"filename":"pmd/src/net/sourceforge/pmd/renderers/CSVRenderer.java","new_code":"public class CSVRenderer extends OnTheFlyRenderer {\n private int violationCount = 1;\n\n public void start() throws IOException {\n getWriter().write(buf.toString());\n public void renderFileViolations(Iterator violations) throws IOException {\n StringBuffer buf = new StringBuffer(300);\n Writer writer = getWriter();\n\n while (violations.hasNext()) {\n rv = violations.next();\n public void end() throws IOException {\n }\n","new_methods":[],"old_code":"import net.sourceforge.pmd.Report;\npublic class CSVRenderer extends AbstractRenderer {\n public void render(Writer writer, Report report) throws IOException {\n writer.write(buf.toString());\n\n addViolations(writer, report, buf);\n\tprivate void addViolations(Writer writer, Report report, StringBuffer buf) throws IOException {\n\t\tint violationCount = 1;\n for (Iterator i = report.iterator(); i.hasNext();) {\n rv = i.next();","old_methods":[],"patch":"@@ -5,16 +5,17 @@\n \n import net.sourceforge.pmd.IRuleViolation;\n import net.sourceforge.pmd.PMD;\n-import net.sourceforge.pmd.Report;\n import net.sourceforge.pmd.util.StringUtil;\n \n import java.io.IOException;\n import java.io.Writer;\n import java.util.Iterator;\n \n-public class CSVRenderer extends AbstractRenderer {\n+public class CSVRenderer extends OnTheFlyRenderer {\n \n- public void render(Writer writer, Report report) throws IOException {\n+ private int violationCount = 1;\n+\n+ public void start() throws IOException {\n StringBuffer buf = new StringBuffer(300);\n quoteAndCommify(buf, \"Problem\");\n quoteAndCommify(buf, \"Package\");\n@@ -25,17 +26,17 @@ public void render(Writer writer, Report report) throws IOException {\n quoteAndCommify(buf, \"Rule set\");\n quote(buf, \"Rule\");\n buf.append(PMD.EOL);\n- writer.write(buf.toString());\n-\n- addViolations(writer, report, buf);\n+ getWriter().write(buf.toString());\n }\n \n-\tprivate void addViolations(Writer writer, Report report, StringBuffer buf) throws IOException {\n-\t\tint violationCount = 1;\n+ public void renderFileViolations(Iterator violations) throws IOException {\n+ StringBuffer buf = new StringBuffer(300);\n+ Writer writer = getWriter();\n+\n \t\tIRuleViolation rv;\n- for (Iterator i = report.iterator(); i.hasNext();) {\n+ while (violations.hasNext()) {\n buf.setLength(0);\n- rv = i.next();\n+ rv = violations.next();\n quoteAndCommify(buf, Integer.toString(violationCount));\n quoteAndCommify(buf, rv.getPackageName());\n quoteAndCommify(buf, rv.getFilename());\n@@ -50,6 +51,9 @@ private void addViolations(Writer writer, Report report, StringBuffer buf) throw\n }\n \t}\n \n+ public void end() throws IOException {\n+ }\n+\n private void quote(StringBuffer sb, String d) {\n sb.append('\"').append(d).append('\"');\n }","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FCSVRenderer.java","sha":"a4b444833df2b18dc24969a727588e9014b82d53","status":"modified"},{"additions":9,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FEmacsRenderer.java","changes":14,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FEmacsRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":5,"filename":"pmd/src/net/sourceforge/pmd/renderers/EmacsRenderer.java","new_code":"public class EmacsRenderer extends OnTheFlyRenderer {\n public void start() throws IOException {}\n\n public void renderFileViolations(Iterator violations) throws IOException {\n Writer writer = getWriter();\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();\n\n public void end() throws IOException {}","new_methods":[],"old_code":"import net.sourceforge.pmd.Report;\npublic class EmacsRenderer extends AbstractRenderer {\n public void render(Writer writer, Report report) throws IOException {\n for (Iterator i = report.iterator(); i.hasNext();) {\n IRuleViolation rv = i.next();","old_methods":[],"patch":"@@ -4,25 +4,29 @@\n package net.sourceforge.pmd.renderers;\n \n import net.sourceforge.pmd.IRuleViolation;\n-import net.sourceforge.pmd.Report;\n \n import java.io.IOException;\n import java.io.Writer;\n import java.util.Iterator;\n \n-public class EmacsRenderer extends AbstractRenderer {\n+public class EmacsRenderer extends OnTheFlyRenderer {\n \n protected static final String EOL = System.getProperty(\"line.separator\", \"\\n\");\n \n- public void render(Writer writer, Report report) throws IOException {\n+ public void start() throws IOException {}\n+\n+ public void renderFileViolations(Iterator violations) throws IOException {\n+ Writer writer = getWriter();\n StringBuffer buf = new StringBuffer();\n- for (Iterator i = report.iterator(); i.hasNext();) {\n- IRuleViolation rv = i.next();\n+ while (violations.hasNext()) {\n+ IRuleViolation rv = violations.next();\n buf.setLength(0);\n buf.append(EOL).append(rv.getFilename());\n buf.append(':').append(Integer.toString(rv.getBeginLine()));\n buf.append(\": \").append(rv.getDescription());\n writer.write(buf.toString());\n }\n }\n+\n+ public void end() throws IOException {}\n }","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FEmacsRenderer.java","sha":"aa6f77d5c8e14599c723d60aaaab14b53c87a3b9","status":"modified"},{"additions":78,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FHTMLRenderer.java","changes":145,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FHTMLRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":67,"filename":"pmd/src/net/sourceforge/pmd/renderers/HTMLRenderer.java","new_code":"import java.util.List;\npublic class HTMLRenderer extends OnTheFlyRenderer {\n private final String linkPrefix;\n private final String linePrefix;\n\n private int violationCount = 1;\n boolean colorize = true;\n writer.write(\"

PMD report

\");\n writer.write(\"

Problems found

\");\n writer.write(\"
\" + PMD.EOL + \"\" + PMD.EOL);\n setWriter(writer);\n renderFileReport(report);\n writer.write(\"
#FileLineProblem
\");\n glomProcessingErrors(writer, errors);\n glomSuppressions(writer, suppressed);\n\n public void start() throws IOException {\n Writer writer = getWriter();\n writer.write(\"PMD\" + PMD.EOL);\n }\n\n public void renderFileViolations(Iterator violations) throws IOException {\n Writer writer = getWriter();\n glomIRuleViolations(writer, violations);\n }\n\n public void end() throws IOException {\n Writer writer = getWriter();\n writer.write(\"\");\n glomProcessingErrors(writer, errors);\n if (showSuppressedViolations) {\n glomSuppressions(writer, suppressed);\n }\n writer.write(\"\");\n }\n\n private void glomIRuleViolations(Writer writer, Iterator violations) throws IOException {\n StringBuffer buf = new StringBuffer(500);\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();\n private void glomProcessingErrors(Writer writer, List errors) throws IOException {\n if (!errors.isEmpty()) {\n \n StringBuffer buf = new StringBuffer(500);\n boolean colorize = true;\n for (Report.ProcessingError pe: errors) {\n buf.setLength(0);\n buf.append(\" \" + PMD.EOL);\n buf.append(\"\" + pe.getFile() + \"\" + PMD.EOL);\n buf.append(\"\" + pe.getMsg() + \"\" + PMD.EOL);\n buf.append(\"\" + PMD.EOL);\n writer.write(buf.toString());\n \n private void glomSuppressions(Writer writer, List suppressed) throws IOException {\n if (!suppressed.isEmpty()) {\n\n StringBuffer buf = new StringBuffer(500);\n boolean colorize = true;\n for (Report.SuppressedViolation sv: suppressed) {\n buf.setLength(0);\n buf.append(\" \" + PMD.EOL);\n buf.append(\"\" + sv.getRuleViolation().getFilename() + \"\" + PMD.EOL);\n buf.append(\"\" + sv.getRuleViolation().getBeginLine() + \"\" + PMD.EOL);\n buf.append(\"\" + sv.getRuleViolation().getRule().getName() + \"\" + PMD.EOL);\n buf.append(\"\" + (sv.suppressedByNOPMD() ? \"NOPMD\" : \"Annotation\") + \"\" + PMD.EOL);\n buf.append(\"\" + (sv.getUserMessage() == null ? \"\" : sv.getUserMessage()) + \"\" + PMD.EOL);\n buf.append(\"\" + PMD.EOL);\n writer.write(buf.toString());","new_methods":[],"old_code":"public class HTMLRenderer extends AbstractRenderer {\n private String linkPrefix;\n private String linePrefix;\n public void render(Writer writer, Report report) throws IOException {\n writer.write(\"PMD\" + PMD.EOL);\n renderBody(writer, report);\n writer.write(\"\");\n }\n\n glomIRuleViolations(writer, report);\n glomProcessingErrors(writer, report);\n glomSuppressions(writer, report);\n \n private void glomIRuleViolations(Writer writer, Report report) throws IOException {\n boolean colorize = true;\n int violationCount = 1;\n StringBuffer buf = new StringBuffer(500);\n for (Iterator i = report.iterator(); i.hasNext();) {\n IRuleViolation rv = i.next();\n if (violationCount > 0) {\n writer.write(\"\");\n }\n private void glomProcessingErrors(Writer writer, Report report) throws IOException {\n boolean colorize = true;\n int violationCount;\n // errors\n if (report.errors().hasNext()) {\n }\n violationCount = 0;\n StringBuffer buf = new StringBuffer(500);\n for (Iterator i = report.errors(); i.hasNext();) {\n Report.ProcessingError pe = i.next();\n buf.setLength(0);\n buf.append(\" \" + PMD.EOL);\n buf.append(\"\" + pe.getFile() + \"\" + PMD.EOL);\n buf.append(\"\" + pe.getMsg() + \"\" + PMD.EOL);\n buf.append(\"\" + PMD.EOL);\n writer.write(buf.toString());\n violationCount++;\n }\n if (violationCount > 0) {\n private void glomSuppressions(Writer writer, Report report) throws IOException {\n boolean colorize = true;\n boolean hasSuppressedViolations = !report.getSuppressedRuleViolations().isEmpty();\n if (hasSuppressedViolations) {\n }\n StringBuffer buf = new StringBuffer(500);\n for (Report.SuppressedViolation sv: report.getSuppressedRuleViolations()) {\n buf.setLength(0);\n buf.append(\" \" + PMD.EOL);\n buf.append(\"\" + sv.getRuleViolation().getFilename() + \"\" + PMD.EOL);\n buf.append(\"\" + sv.getRuleViolation().getBeginLine() + \"\" + PMD.EOL);\n buf.append(\"\" + sv.getRuleViolation().getRule().getName() + \"\" + PMD.EOL);\n buf.append(\"\" + (sv.suppressedByNOPMD() ? \"NOPMD\" : \"Annotation\") + \"\" + PMD.EOL);\n buf.append(\"\" + (sv.getUserMessage() == null ? \"\" : sv.getUserMessage()) + \"\" + PMD.EOL);\n buf.append(\"\" + PMD.EOL);\n writer.write(buf.toString());\n }\n if (hasSuppressedViolations) {","old_methods":[],"patch":"@@ -11,11 +11,15 @@\n import java.io.IOException;\n import java.io.Writer;\n import java.util.Iterator;\n+import java.util.List;\n \n-public class HTMLRenderer extends AbstractRenderer {\n+public class HTMLRenderer extends OnTheFlyRenderer {\n \n- private String linkPrefix;\n- private String linePrefix;\n+ private final String linkPrefix;\n+ private final String linePrefix;\n+\n+ private int violationCount = 1;\n+ boolean colorize = true;\n \n public HTMLRenderer(String linkPrefix, String linePrefix) {\n this.linkPrefix = linkPrefix;\n@@ -27,29 +31,46 @@ public HTMLRenderer() {\n this(null, null);\n }\n \n- public void render(Writer writer, Report report) throws IOException {\n- writer.write(\"PMD\" + PMD.EOL);\n- renderBody(writer, report);\n- writer.write(\"\");\n- }\n-\n public void renderBody(Writer writer, Report report) throws IOException {\n- glomIRuleViolations(writer, report);\n- glomProcessingErrors(writer, report);\n+ writer.write(\"

PMD report

\");\n+ writer.write(\"

Problems found

\");\n+ writer.write(\"\" + PMD.EOL + \"\" + PMD.EOL);\n+ setWriter(writer);\n+ renderFileReport(report);\n+ writer.write(\"
#FileLineProblem
\");\n+ glomProcessingErrors(writer, errors);\n if (showSuppressedViolations) {\n- glomSuppressions(writer, report);\n+ glomSuppressions(writer, suppressed);\n }\n }\n- \n- private void glomIRuleViolations(Writer writer, Report report) throws IOException {\n- boolean colorize = true;\n- int violationCount = 1;\n- StringBuffer buf = new StringBuffer(500);\n+\n+ public void start() throws IOException {\n+ Writer writer = getWriter();\n+ writer.write(\"PMD\" + PMD.EOL);\n writer.write(\"

PMD report

\");\n writer.write(\"

Problems found

\");\n writer.write(\"\" + PMD.EOL + \"\" + PMD.EOL);\n- for (Iterator i = report.iterator(); i.hasNext();) {\n- IRuleViolation rv = i.next();\n+ }\n+\n+ public void renderFileViolations(Iterator violations) throws IOException {\n+ Writer writer = getWriter();\n+ glomIRuleViolations(writer, violations);\n+ }\n+\n+ public void end() throws IOException {\n+ Writer writer = getWriter();\n+ writer.write(\"
#FileLineProblem
\");\n+ glomProcessingErrors(writer, errors);\n+ if (showSuppressedViolations) {\n+ glomSuppressions(writer, suppressed);\n+ }\n+ writer.write(\"\");\n+ }\n+\n+ private void glomIRuleViolations(Writer writer, Iterator violations) throws IOException {\n+ StringBuffer buf = new StringBuffer(500);\n+ while (violations.hasNext()) {\n+ IRuleViolation rv = violations.next();\n buf.setLength(0);\n buf.append(\" 0) {\n- writer.write(\"\");\n- }\n }\n \n- private void glomProcessingErrors(Writer writer, Report report) throws IOException {\n- boolean colorize = true;\n- int violationCount;\n- // errors\n- if (report.errors().hasNext()) {\n+ private void glomProcessingErrors(Writer writer, List errors) throws IOException {\n+ if (!errors.isEmpty()) {\n writer.write(\"
\");\n writer.write(\"

Processing errors

\");\n writer.write(\"\" + PMD.EOL + \"\" + PMD.EOL);\n- }\n- violationCount = 0;\n- StringBuffer buf = new StringBuffer(500);\n- for (Iterator i = report.errors(); i.hasNext();) {\n- Report.ProcessingError pe = i.next();\n- buf.setLength(0);\n- buf.append(\" \" + PMD.EOL);\n+ buf.append(\"\" + PMD.EOL);\n+ buf.append(\"\" + PMD.EOL);\n+ buf.append(\"\" + PMD.EOL);\n+ writer.write(buf.toString());\n+ \n }\n- colorize = !colorize;\n- buf.append(\"> \" + PMD.EOL);\n- buf.append(\"\" + PMD.EOL);\n- buf.append(\"\" + PMD.EOL);\n- buf.append(\"\" + PMD.EOL);\n- writer.write(buf.toString());\n- violationCount++;\n- }\n- if (violationCount > 0) {\n writer.write(\"
FileProblem
\" + pe.getFile() + \"\" + pe.getMsg() + \"
\" + pe.getFile() + \"\" + pe.getMsg() + \"
\");\n }\n }\n \n- private void glomSuppressions(Writer writer, Report report) throws IOException {\n- boolean colorize = true;\n- boolean hasSuppressedViolations = !report.getSuppressedRuleViolations().isEmpty();\n- if (hasSuppressedViolations) {\n+ private void glomSuppressions(Writer writer, List suppressed) throws IOException {\n+ if (!suppressed.isEmpty()) {\n writer.write(\"
\");\n writer.write(\"

Suppressed warnings

\");\n writer.write(\"\" + PMD.EOL + \"\" + PMD.EOL);\n- }\n- StringBuffer buf = new StringBuffer(500);\n- for (Report.SuppressedViolation sv: report.getSuppressedRuleViolations()) {\n- buf.setLength(0);\n- buf.append(\" \" + PMD.EOL);\n+ buf.append(\"\" + PMD.EOL);\n+ buf.append(\"\" + PMD.EOL);\n+ buf.append(\"\" + PMD.EOL);\n+ buf.append(\"\" + PMD.EOL);\n+ buf.append(\"\" + PMD.EOL);\n+ buf.append(\"\" + PMD.EOL);\n+ writer.write(buf.toString());\n }\n- colorize = !colorize;\n- buf.append(\"> \" + PMD.EOL);\n- buf.append(\"\" + PMD.EOL);\n- buf.append(\"\" + PMD.EOL);\n- buf.append(\"\" + PMD.EOL);\n- buf.append(\"\" + PMD.EOL);\n- buf.append(\"\" + PMD.EOL);\n- buf.append(\"\" + PMD.EOL);\n- writer.write(buf.toString());\n- }\n- if (hasSuppressedViolations) {\n writer.write(\"
FileLineRuleNOPMD or AnnotationReason
\" + sv.getRuleViolation().getFilename() + \"\" + sv.getRuleViolation().getBeginLine() + \"\" + sv.getRuleViolation().getRule().getName() + \"\" + (sv.suppressedByNOPMD() ? \"NOPMD\" : \"Annotation\") + \"\" + (sv.getUserMessage() == null ? \"\" : sv.getUserMessage()) + \"
\" + sv.getRuleViolation().getFilename() + \"\" + sv.getRuleViolation().getBeginLine() + \"\" + sv.getRuleViolation().getRule().getName() + \"\" + (sv.suppressedByNOPMD() ? \"NOPMD\" : \"Annotation\") + \"\" + (sv.getUserMessage() == null ? \"\" : sv.getUserMessage()) + \"
\");\n }\n }","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FHTMLRenderer.java","sha":"6c4f4aefe86e75851320a85bd4b57d4722282ae7","status":"modified"},{"additions":15,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FIDEAJRenderer.java","changes":26,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FIDEAJRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":11,"filename":"pmd/src/net/sourceforge/pmd/renderers/IDEAJRenderer.java","new_code":"public class IDEAJRenderer extends OnTheFlyRenderer {\n public void start() throws IOException {}\n\n public void renderFileViolations(Iterator violations) throws IOException {\n Writer writer = getWriter();\n render(writer, violations, sourcePath);\n render(writer, violations, classAndMethodName, singleFileName);\n public void end() throws IOException {}\n\n private void render(Writer writer, Iterator violations, String sourcePathString) throws IOException {\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();\n private void render(Writer writer, Iterator violations, String classAndMethod, String file) throws IOException {\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();","new_methods":[],"old_code":"import net.sourceforge.pmd.Report;\npublic class IDEAJRenderer extends AbstractRenderer {\n public void render(Writer writer, Report report) throws IOException {\n render(writer, report, sourcePath);\n render(writer, report, classAndMethodName, singleFileName);\n private void render(Writer writer, Report report, String sourcePathString) throws IOException {\n for (Iterator i = report.iterator(); i.hasNext();) {\n IRuleViolation rv = i.next();\n private void render(Writer writer, Report report, String classAndMethod, String file) throws IOException {\n for (Iterator i = report.iterator(); i.hasNext();) {\n IRuleViolation rv = i.next();","old_methods":[],"patch":"@@ -5,7 +5,6 @@\n \n import net.sourceforge.pmd.IRuleViolation;\n import net.sourceforge.pmd.PMD;\n-import net.sourceforge.pmd.Report;\n \n import java.io.IOException;\n import java.io.Writer;\n@@ -14,7 +13,7 @@\n import java.util.Set;\n import java.util.StringTokenizer;\n \n-public class IDEAJRenderer extends AbstractRenderer {\n+public class IDEAJRenderer extends OnTheFlyRenderer {\n \n \tprivate static final String FILE_SEPARATOR = System.getProperty(\"file.separator\");\n \tprivate static final String PATH_SEPARATOR = System.getProperty(\"path.separator\");\n@@ -45,37 +44,42 @@ public IDEAJRenderer(String[] args) {\n this.args = args;\n }\n \n- public void render(Writer writer, Report report) throws IOException {\n+ public void start() throws IOException {}\n+\n+ public void renderFileViolations(Iterator violations) throws IOException {\n+ Writer writer = getWriter();\n if (args[4].equals(\".method\")) {\n // working on a directory tree\n String sourcePath = args[3];\n- render(writer, report, sourcePath);\n+ render(writer, violations, sourcePath);\n return;\n }\n // working on one file\n String classAndMethodName = args[4];\n String singleFileName = args[5];\n- render(writer, report, classAndMethodName, singleFileName);\n+ render(writer, violations, classAndMethodName, singleFileName);\n }\n \n- private void render(Writer writer, Report report, String sourcePathString) throws IOException {\n+ public void end() throws IOException {}\n+\n+ private void render(Writer writer, Iterator violations, String sourcePathString) throws IOException {\n SourcePath sourcePath = new SourcePath(sourcePathString);\n StringBuffer buf = new StringBuffer();\n- for (Iterator i = report.iterator(); i.hasNext();) {\n+ while (violations.hasNext()) {\n buf.setLength(0);\n- IRuleViolation rv = i.next();\n+ IRuleViolation rv = violations.next();\n buf.append(rv.getDescription() + PMD.EOL);\n buf.append(\" at \").append(getFullyQualifiedClassName(rv.getFilename(), sourcePath)).append(\".method(\");\n buf.append(getSimpleFileName(rv.getFilename())).append(':').append(rv.getBeginLine()).append(')').append(PMD.EOL);\n writer.write(buf.toString());\n }\n }\n \n- private void render(Writer writer, Report report, String classAndMethod, String file) throws IOException {\n+ private void render(Writer writer, Iterator violations, String classAndMethod, String file) throws IOException {\n StringBuffer buf = new StringBuffer();\n- for (Iterator i = report.iterator(); i.hasNext();) {\n+ while (violations.hasNext()) {\n buf.setLength(0);\n- IRuleViolation rv = i.next();\n+ IRuleViolation rv = violations.next();\n buf.append(rv.getDescription()).append(PMD.EOL);\n buf.append(\" at \").append(classAndMethod).append('(').append(file).append(':').append(rv.getBeginLine()).append(')').append(PMD.EOL);\n writer.write(buf.toString());","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FIDEAJRenderer.java","sha":"229386f4d72cff2092188bf063e40edc24f7ca30","status":"modified"},{"additions":16,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FRenderer.java","changes":16,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":0,"filename":"pmd/src/net/sourceforge/pmd/renderers/Renderer.java","new_code":" /**\n * \n * @deprecated This method consumes too much memory.\n * Use the start, renderFileReport and end methods instead.\n * \n */\n void setWriter(Writer writer);\n\n Writer getWriter();\n\n void start() throws IOException;\n\n void renderFileReport(Report report) throws IOException;\n\n void end() throws IOException;\n","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -20,6 +20,22 @@ public interface Renderer {\n */\n String render(Report report);\n \n+ /**\n+ * \n+ * @deprecated This method consumes too much memory.\n+ * Use the start, renderFileReport and end methods instead.\n+ * \n+ */\n void render(Writer writer, Report report) throws IOException;\n \n+ void setWriter(Writer writer);\n+\n+ Writer getWriter();\n+\n+ void start() throws IOException;\n+\n+ void renderFileReport(Report report) throws IOException;\n+\n+ void end() throws IOException;\n+\n }","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FRenderer.java","sha":"40f686536d15a5b5c7e6d1e68acb1975755763ff","status":"modified"},{"additions":1,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRenderer.java","changes":2,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":1,"filename":"pmd/src/net/sourceforge/pmd/renderers/SummaryHTMLRenderer.java","new_code":" writer.write(\"\" + PMD.EOL);","new_methods":[],"old_code":" writer.write(\"
\" + PMD.EOL + \"\" + PMD.EOL);","old_methods":[],"patch":"@@ -22,7 +22,7 @@ public void render(Writer writer, Report report) throws IOException {\n writer.write(\"PMD\" + PMD.EOL);\n renderSummary(writer, report);\n writer.write(\"

Detail

\");\n- writer.write(\"
#FileLineProblem
\" + PMD.EOL + \"\" + PMD.EOL);\n+ writer.write(\"
#FileLineProblem
\" + PMD.EOL);\n new HTMLRenderer(linkPrefix,linePrefix).renderBody(writer, report);\n writer.write(\"
\");\n }","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRenderer.java","sha":"64009639be56e542df6e5d07d31befa09f5537ff","status":"modified"},{"additions":10,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextPadRenderer.java","changes":21,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextPadRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":11,"filename":"pmd/src/net/sourceforge/pmd/renderers/TextPadRenderer.java","new_code":"public class TextPadRenderer extends OnTheFlyRenderer {\n\n public void start() throws IOException {}\n\n public void renderFileViolations(Iterator violations) throws IOException {\n Writer writer = getWriter();\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();\n\n public void end() throws IOException {}","new_methods":[],"old_code":"import net.sourceforge.pmd.Report;\npublic class TextPadRenderer extends AbstractRenderer {\n public void render(Writer writer, Report report) throws IOException {\n Iterator i;\n try {\n i = report.iterator();\n } catch (NullPointerException npx) {\n throw new NullPointerException(\"ERROR in \" + this.getClass().getName() + \".render: Parameter report is null.\");\n }\n while (i.hasNext()) {\n IRuleViolation rv = i.next();","old_methods":[],"patch":"@@ -5,7 +5,6 @@\n \n import net.sourceforge.pmd.IRuleViolation;\n import net.sourceforge.pmd.PMD;\n-import net.sourceforge.pmd.Report;\n \n import java.io.IOException;\n import java.io.Writer;\n@@ -26,17 +25,15 @@\n *\n * @author Jeff Epstein, based upon EmacsRenderer, Tuesday, September 23, 2003\n */\n-public class TextPadRenderer extends AbstractRenderer {\n- public void render(Writer writer, Report report) throws IOException {\n+public class TextPadRenderer extends OnTheFlyRenderer {\n+\n+ public void start() throws IOException {}\n+\n+ public void renderFileViolations(Iterator violations) throws IOException {\n+ Writer writer = getWriter();\n StringBuffer buf = new StringBuffer();\n- Iterator i;\n- try {\n- i = report.iterator();\n- } catch (NullPointerException npx) {\n- throw new NullPointerException(\"ERROR in \" + this.getClass().getName() + \".render: Parameter report is null.\");\n- }\n- while (i.hasNext()) {\n- IRuleViolation rv = i.next();\n+ while (violations.hasNext()) {\n+ IRuleViolation rv = violations.next();\n buf.setLength(0);\n //Filename\n buf.append(PMD.EOL).append(rv.getFilename() + \"(\");\n@@ -49,4 +46,6 @@ public void render(Writer writer, Report report) throws IOException {\n writer.write(buf.toString());\n }\n }\n+\n+ public void end() throws IOException {}\n }","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextPadRenderer.java","sha":"bb93ec85206a84e6e799f836e0d21e132fc44c25","status":"modified"},{"additions":32,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextRenderer.java","changes":59,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":27,"filename":"pmd/src/net/sourceforge/pmd/renderers/TextRenderer.java","new_code":"public class TextRenderer extends OnTheFlyRenderer {\n private boolean empty;\n\n public void start() throws IOException {\n empty = true;\n }\n\n public void renderFileViolations(Iterator violations) throws IOException {\n Writer writer = getWriter();\n empty = !violations.hasNext();\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();\n }\n public void end() throws IOException {\n Writer writer = getWriter();\n StringBuffer buf = new StringBuffer();\n if (!errors.isEmpty()) {\n empty = false;\n for(Report.ProcessingError error: errors) {\n buf.setLength(0);\n buf.append(PMD.EOL).append(error.getFile());\n buf.append(\"\\t-\\t\").append(error.getMsg());\n writer.write(buf.toString());\n }\n for(Report.SuppressedViolation excluded: suppressed) {\n buf.setLength(0);\n writer.write(buf.toString());\n }\n\n if (empty) {\n getWriter().write(\"No problems found!\");\n","new_methods":[],"old_code":"public class TextRenderer extends AbstractRenderer {\n public void render(Writer writer, Report report) throws IOException {\n if (report.isEmpty()) {\n buf.append(\"No problems found!\");\n if (showSuppressedViolations) {\n addSuppressed(report, buf);\n }\n writer.write(buf.toString());\n return;\n }\n \n for (Iterator i = report.iterator(); i.hasNext();) {\n IRuleViolation rv = i.next();\n for (Iterator i = report.errors(); i.hasNext();) {\n buf.setLength(0);\n Report.ProcessingError error = i.next();\n buf.append(PMD.EOL).append(error.getFile());\n buf.append(\"\\t-\\t\").append(error.getMsg());\n writer.write(buf.toString());\n }\n if (showSuppressedViolations) {\n buf.setLength(0);\n addSuppressed(report, buf);\n writer.write(buf.toString());\n }\n private void addSuppressed(Report report, StringBuffer buf) {\n for (Report.SuppressedViolation excluded: report.getSuppressedRuleViolations()) {","old_methods":[],"patch":"@@ -11,51 +11,56 @@\n import java.io.Writer;\n import java.util.Iterator;\n \n-public class TextRenderer extends AbstractRenderer {\n+public class TextRenderer extends OnTheFlyRenderer {\n \n- public void render(Writer writer, Report report) throws IOException {\n+ private boolean empty;\n+\n+ public void start() throws IOException {\n+ empty = true;\n+ }\n+\n+ public void renderFileViolations(Iterator violations) throws IOException {\n+ Writer writer = getWriter();\n StringBuffer buf = new StringBuffer();\n \n- if (report.isEmpty()) {\n- buf.append(\"No problems found!\");\n- if (showSuppressedViolations) {\n- addSuppressed(report, buf);\n- }\n- writer.write(buf.toString());\n- return;\n- }\n- \n- for (Iterator i = report.iterator(); i.hasNext();) {\n+ empty = !violations.hasNext();\n+ while (violations.hasNext()) {\n buf.setLength(0);\n- IRuleViolation rv = i.next();\n+ IRuleViolation rv = violations.next();\n buf.append(PMD.EOL).append(rv.getFilename());\n buf.append(':').append(Integer.toString(rv.getBeginLine()));\n buf.append('\\t').append(rv.getDescription());\n writer.write(buf.toString());\n }\n+ }\n \n- for (Iterator i = report.errors(); i.hasNext();) {\n- buf.setLength(0);\n- Report.ProcessingError error = i.next();\n- buf.append(PMD.EOL).append(error.getFile());\n- buf.append(\"\\t-\\t\").append(error.getMsg());\n- writer.write(buf.toString());\n- }\n+ public void end() throws IOException {\n+ Writer writer = getWriter();\n+ StringBuffer buf = new StringBuffer();\n+ if (!errors.isEmpty()) {\n+ empty = false;\n \n- if (showSuppressedViolations) {\n- buf.setLength(0);\n- addSuppressed(report, buf);\n- writer.write(buf.toString());\n+ for(Report.ProcessingError error: errors) {\n+ buf.setLength(0);\n+ buf.append(PMD.EOL).append(error.getFile());\n+ buf.append(\"\\t-\\t\").append(error.getMsg());\n+ writer.write(buf.toString());\n+ }\n }\n- }\n \n- private void addSuppressed(Report report, StringBuffer buf) {\n- for (Report.SuppressedViolation excluded: report.getSuppressedRuleViolations()) {\n+ for(Report.SuppressedViolation excluded: suppressed) {\n+ buf.setLength(0);\n buf.append(PMD.EOL);\n buf.append(excluded.getRuleViolation().getRule().getName());\n buf.append(\" rule violation suppressed by \");\n buf.append(excluded.suppressedByNOPMD() ? \"//NOPMD\" : \"Annotation\");\n buf.append(\" in \").append(excluded.getRuleViolation().getFilename());\n+ writer.write(buf.toString());\n+ }\n+\n+ if (empty) {\n+ getWriter().write(\"No problems found!\");\n }\n }\n+\n }","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextRenderer.java","sha":"83e7b1865889e1a37d297851059b8a7ab18c16aa","status":"modified"},{"additions":21,"blob_url":"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRenderer.java","changes":34,"contents_url":"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d","deletions":13,"filename":"pmd/src/net/sourceforge/pmd/renderers/VBHTMLRenderer.java","new_code":"public class VBHTMLRenderer extends OnTheFlyRenderer {\n public void start() throws IOException {\n getWriter().write(header()); \n }\n\n public void renderFileViolations(Iterator violations) throws IOException {\n if (!violations.hasNext()) {\n Writer writer = getWriter();\n while (violations.hasNext()) {\n IRuleViolation rv = violations.next();\n }\n\n public void end() throws IOException {\n Writer writer = getWriter();\n StringBuffer sb = new StringBuffer();\n \n if (!errors.isEmpty()) {\n boolean colorize = false;\n for (Report.ProcessingError error: errors) {\n sb.append(\"\").append(error).append(\"\\\"\");\n writer.write(footer()); ","new_methods":[],"old_code":"public class VBHTMLRenderer extends AbstractRenderer {\n public void render(Writer writer, Report report) throws IOException {\n if (report.isEmpty()) {\n\n writer.write(header());\n for (Iterator iter = report.iterator(); iter.hasNext();) {\n IRuleViolation rv = iter.next();\n Iterator iter = report.errors();\n if (iter.hasNext()) {\n colorize = false;\n while (iter.hasNext()) {\n sb.append(\"\").append(iter.next()).append(\"\\\"\");\n writer.write(footer());","old_methods":[],"patch":"@@ -15,23 +15,26 @@\n * @author Vladimir\n * @version $Revision$ $Date$\n */\n-public class VBHTMLRenderer extends AbstractRenderer {\n+public class VBHTMLRenderer extends OnTheFlyRenderer {\n \n- public void render(Writer writer, Report report) throws IOException {\n- if (report.isEmpty()) {\n+ public void start() throws IOException {\n+ getWriter().write(header()); \n+ }\n+\n+ public void renderFileViolations(Iterator violations) throws IOException {\n+ if (!violations.hasNext()) {\n return;\n }\n \n+ Writer writer = getWriter();\n StringBuffer sb = new StringBuffer();\n String filename = null;\n String lineSep = PMD.EOL;\n \n boolean colorize = false;\n-\n- writer.write(header());\n- for (Iterator iter = report.iterator(); iter.hasNext();) {\n+ while (violations.hasNext()) {\n sb.setLength(0);\n- IRuleViolation rv = iter.next();\n+ IRuleViolation rv = violations.next();\n if (!rv.getFilename().equals(filename)) { // New File\n if (filename != null) {\n sb.append(\"
\");\n@@ -59,29 +62,34 @@ public void render(Writer writer, Report report) throws IOException {\n if (filename != null) {\n writer.write(\"\");\n }\n+ }\n+\n+ public void end() throws IOException {\n+ Writer writer = getWriter();\n+ StringBuffer sb = new StringBuffer();\n+ \n writer.write(\"
\");\n \n // output the problems\n- Iterator iter = report.errors();\n- if (iter.hasNext()) {\n+ if (!errors.isEmpty()) {\n sb.setLength(0);\n sb.append(\"\");\n sb.append(\"\");\n- colorize = false;\n- while (iter.hasNext()) {\n+ boolean colorize = false;\n+ for (Report.ProcessingError error: errors) {\n if (colorize) {\n sb.append(\"\");\n } else {\n sb.append(\"\");\n }\n colorize = !colorize;\n- sb.append(\"\");\n+ sb.append(\"\");\n }\n sb.append(\"
 Problems found
\").append(iter.next()).append(\"\\\"
\").append(error).append(\"\\\"
\");\n writer.write(sb.toString());\n }\n \n- writer.write(footer());\n+ writer.write(footer()); \n }\n \n private String header() {","raw_url":"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRenderer.java","sha":"d933e75457782e5dfa59fd32d6a838606d69652e","status":"modified"}],"string":"[\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fetc%2Fchangelog.txt\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fetc%2Fchangelog.txt?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 0,\n \"filename\": \"pmd/etc/changelog.txt\",\n \"new_code\": \"Memory footprint reduced: most renderers now use less memory by generating reports on the fly.\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -28,6 +28,7 @@ PMD now requires JDK 1.5 to be compiled. Java 1.4 support is provided using Retr\\n - PMD will still analyze code from earlier JDKs\\n - to run pmd with 1.4, use the files from the java14 directory (weaved pmd jar and support files)\\n TypeResolution now looks at some ASTName nodes.\\n+Memory footprint reduced: most renderers now use less memory by generating reports on the fly.\\n \\n December 19, 2006 - 3.9:\\n New rules:\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fetc%2Fchangelog.txt\",\n \"sha\": \"d586695272f75bddde46ecfdc57e098666d20720\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRendererTest.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRendererTest.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 4,\n \"filename\": \"pmd/regress/test/net/sourceforge/pmd/renderers/SummaryHTMLRendererTest.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \" \\\"#FileLineProblem\\\" + PMD.EOL + \\n \\\"#FileLineProblem\\\" + PMD.EOL + \\n \\\"#FileLineProblem\\\" + PMD.EOL + \\n \\\"#FileLineProblem\\\" + PMD.EOL + \",\n \"old_methods\": [],\n \"patch\": \"@@ -14,7 +14,6 @@ public AbstractRenderer getRenderer() {\\n public String getExpected() {\\n return \\\"PMD\\\" + PMD.EOL + \\n \\\"

Summary

Rule nameNumber of violations
Foo1

Detail

\\\" + PMD.EOL + \\n- \\\"\\\" + PMD.EOL + \\n \\\"

PMD report

Problems found

#FileLineProblem
\\\" + PMD.EOL + \\n \\\"\\\" + PMD.EOL + \\n \\\" \\\" + PMD.EOL + \\n@@ -30,7 +29,6 @@ public String getExpected() {\\n public String getExpectedEmpty() {\\n return \\\"PMD\\\" + PMD.EOL + \\n \\\"

Summary

#FileLineProblem
Rule nameNumber of violations

Detail

\\\" + PMD.EOL + \\n- \\\"\\\" + PMD.EOL + \\n \\\"

PMD report

Problems found

#FileLineProblem
\\\" + PMD.EOL + \\n \\\"\\\" + PMD.EOL + \\n \\\"
#FileLineProblem
\\\";\\n@@ -39,7 +37,6 @@ public String getExpectedEmpty() {\\n public String getExpectedMultiple() {\\n return \\\"PMD\\\" + PMD.EOL + \\n \\\"

Summary

Rule nameNumber of violations
Foo2

Detail

\\\" + PMD.EOL + \\n- \\\"\\\" + PMD.EOL + \\n \\\"

PMD report

Problems found

#FileLineProblem
\\\" + PMD.EOL + \\n \\\"\\\" + PMD.EOL + \\n \\\" \\\" + PMD.EOL + \\n@@ -60,7 +57,6 @@ public String getExpectedMultiple() {\\n public String getExpectedError(ProcessingError error) {\\n return \\\"PMD\\\" + PMD.EOL + \\n \\\"

Summary

#FileLineProblem
Rule nameNumber of violations

Detail

\\\" + PMD.EOL + \\n- \\\"\\\" + PMD.EOL + \\n \\\"

PMD report

Problems found

#FileLineProblem
\\\" + PMD.EOL + \\n \\\"\\\" + PMD.EOL + \\n \\\"
#FileLineProblem

Processing errors

\\\" + PMD.EOL + \",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRendererTest.java\",\n \"sha\": \"a0d375e826b6bc0d7efec9c26c2b98282b01f3e9\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 8,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRendererTest.java\",\n \"changes\": 9,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRendererTest.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 1,\n \"filename\": \"pmd/regress/test/net/sourceforge/pmd/renderers/VBHTMLRendererTest.java\",\n \"new_code\": \" return \\\"PMD

\\\";\",\n \"new_methods\": [],\n \"old_code\": \" return \\\"\\\";\",\n \"old_methods\": [],\n \"patch\": \"@@ -25,7 +25,14 @@ public String getExpected() {\\n }\\n \\n public String getExpectedEmpty() {\\n- return \\\"\\\";\\n+ return \\\"PMD

\\\";\\n }\\n \\n public String getExpectedMultiple() {\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fregress%2Ftest%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRendererTest.java\",\n \"sha\": \"1976603b63d82b6f5eb834e6180e18937372e113\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 86,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FPMD.java\",\n \"changes\": 135,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FPMD.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 49,\n \"filename\": \"pmd/src/net/sourceforge/pmd/PMD.java\",\n \"new_code\": \"import java.util.Comparator;\\nimport java.util.concurrent.Callable;\\nimport java.util.concurrent.ExecutionException;\\nimport java.util.concurrent.Future;\\n long reportStart, reportEnd;\\n Renderer renderer;\\n\\n reportStart = System.nanoTime();\\n renderer = opts.createRenderer();\\n renderer.setWriter(w);\\n renderer.start();\\n\\n reportEnd = System.nanoTime();\\n Benchmark.mark(Benchmark.TYPE_REPORTING, reportEnd - reportStart, 0);\\n \\n RuleContext ctx = new RuleContext();\\n\\n try {\\n long startLoadRules = System.nanoTime();\\n RuleSetFactory ruleSetFactory = new RuleSetFactory();\\n ruleSetFactory.setMinimumPriority(opts.getMinPriority());\\n \\n RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());\\n printRuleNamesInDebug(opts.debugEnabled(), rulesets);\\n long endLoadRules = System.nanoTime();\\n Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);\\n \\n processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx, renderer,\\n opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),\\n opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());\\n } catch (RuleSetNotFoundException rsnfe) {\\n System.out.println(opts.usage());\\n rsnfe.printStackTrace();\\n }\\n\\n reportStart = System.nanoTime();\\n renderer.end();\\n reportEnd = System.nanoTime();\\n private static class PmdRunnable extends PMD implements Callable {\\n public Report call() {\\n Report report = new Report();\\n ctx.setReport(report);\\n\\n report.addError(\\n report.addError(\\n report.addError(\\n return report;\\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx,\\n Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\\n List> tasks = new LinkedList>();\\n \\n Collections.sort(files, new Comparator() {\\n public int compare(DataSource d1,DataSource d2) {\\n String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\\n String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\\n return s1.compareTo(s2);\\n }\\n });\\n PmdRunnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\\n Future future = executor.submit(r);\\n tasks.add(future);\\n while (!tasks.isEmpty()) {\\n Future future = tasks.remove(0);\\n Report report = null;\\n try {\\n report = future.get();\\n } catch (InterruptedException ie) {\\n Thread.currentThread().interrupt();\\n future.cancel(true);\\n } catch (ExecutionException ee) {\\n Throwable t = ee.getCause();\\n if (t instanceof RuntimeException) {\\n throw (RuntimeException) t;\\n } else if (t instanceof Error) {\\n throw (Error) t;\\n } else {\\n throw new IllegalStateException(\\\"PmdRunnable exception\\\", t);\\n }\\n }\\n try {\\n long start = System.nanoTime();\\n renderer.renderFileReport(report);\\n long end = System.nanoTime();\\n Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);\\n } catch (IOException ioe) {\\n }\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"pmd/src/net/sourceforge/pmd/PMD.java\",\n \"implementation\": \"Report report = new Report();\\n ctx.setReport(report);\\n\\n report.addError(\\n report.addError(\\n report.addError(\\n return report;\\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx,\\n Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\\n List> tasks = new LinkedList>();\\n \\n Collections.sort(files, new Comparator() {\\n public int compare(DataSource d1,DataSource d2) {\\n String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\\n String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\\n return s1.compareTo(s2);\",\n \"signature\": \"Report call()\"\n },\n {\n \"arguments\": [\n \"t instanceof Error\"\n ],\n \"filename\": \"pmd/src/net/sourceforge/pmd/PMD.java\",\n \"implementation\": \"throw (Error) t;\",\n \"signature\": \"else if (t instanceof Error)\"\n }\n ],\n \"old_code\": \" RuleContext ctx = new RuleContext();\\n Report report = new Report();\\n ctx.setReport(report);\\n report.start();\\n\\n try {\\n long startLoadRules = System.nanoTime();\\n RuleSetFactory ruleSetFactory = new RuleSetFactory();\\n ruleSetFactory.setMinimumPriority(opts.getMinPriority());\\n\\n RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());\\n printRuleNamesInDebug(opts.debugEnabled(), rulesets);\\n long endLoadRules = System.nanoTime();\\n Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);\\n\\n processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx,\\n opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),\\n opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());\\n } catch (RuleSetNotFoundException rsnfe) {\\n System.out.println(opts.usage());\\n rsnfe.printStackTrace();\\n }\\n report.end();\\n\\n long reportStart = System.nanoTime();\\n Renderer r = opts.createRenderer();\\n r.render(w, ctx.getReport());\\n long reportEnd = System.nanoTime();\\n private static class PmdRunnable extends PMD implements Runnable {\\n public void run() {\\n ctx.getReport().addError(\\n ctx.getReport().addError(\\n ctx.getReport().addError(\\n context.setReport(new Report());\\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx, String rulesets,\\n boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\\n Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\\n executor.execute(r);\\n try {\\n executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);\\n } catch (InterruptedException e) {\\n }\\n long start = System.nanoTime();\\n Report mainReport = ctx.getReport();\\n for (PmdThread thread: factory.threadList) {\\n Report r = thread.context.getReport();\\n mainReport.merge(r);\\n long end = System.nanoTime();\\n Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"pmd/src/net/sourceforge/pmd/PMD.java\",\n \"implementation\": \"ctx.getReport().addError(\\n ctx.getReport().addError(\\n ctx.getReport().addError(\\n context.setReport(new Report());\\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx, String rulesets,\\n boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\\n Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\\n executor.execute(r);\\n try {\\n executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);\",\n \"signature\": \"void run()\"\n }\n ],\n \"patch\": \"@@ -25,12 +25,16 @@\\n import java.io.UnsupportedEncodingException;\\n import java.io.Writer;\\n import java.util.ArrayList;\\n+import java.util.Comparator;\\n import java.util.Enumeration;\\n import java.util.LinkedList;\\n import java.util.List;\\n import java.util.StringTokenizer;\\n+import java.util.concurrent.Callable;\\n+import java.util.concurrent.ExecutionException;\\n import java.util.concurrent.ExecutorService;\\n import java.util.concurrent.Executors;\\n+import java.util.concurrent.Future;\\n import java.util.concurrent.ThreadFactory;\\n import java.util.concurrent.TimeUnit;\\n import java.util.concurrent.atomic.AtomicInteger;\\n@@ -273,40 +277,46 @@ public static void main(String[] args) {\\n sourceType = SourceType.JAVA_14;\\n }\\n \\n- RuleContext ctx = new RuleContext();\\n- Report report = new Report();\\n- ctx.setReport(report);\\n- report.start();\\n-\\n- try {\\n- long startLoadRules = System.nanoTime();\\n- RuleSetFactory ruleSetFactory = new RuleSetFactory();\\n- ruleSetFactory.setMinimumPriority(opts.getMinPriority());\\n-\\n- RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());\\n- printRuleNamesInDebug(opts.debugEnabled(), rulesets);\\n- long endLoadRules = System.nanoTime();\\n- Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);\\n-\\n- processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx,\\n- opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),\\n- opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());\\n- } catch (RuleSetNotFoundException rsnfe) {\\n- System.out.println(opts.usage());\\n- rsnfe.printStackTrace();\\n- }\\n- report.end();\\n-\\n+ long reportStart, reportEnd;\\n+ Renderer renderer;\\n Writer w = null;\\n- long reportStart = System.nanoTime();\\n+\\n+ reportStart = System.nanoTime();\\n try {\\n- Renderer r = opts.createRenderer();\\n+ renderer = opts.createRenderer();\\n if (opts.getReportFile() != null) {\\n w = new BufferedWriter(new FileWriter(opts.getReportFile()));\\n } else {\\n w = new OutputStreamWriter(System.out);\\n }\\n- r.render(w, ctx.getReport());\\n+ renderer.setWriter(w);\\n+ renderer.start();\\n+\\n+ reportEnd = System.nanoTime();\\n+ Benchmark.mark(Benchmark.TYPE_REPORTING, reportEnd - reportStart, 0);\\n+ \\n+ RuleContext ctx = new RuleContext();\\n+\\n+ try {\\n+ long startLoadRules = System.nanoTime();\\n+ RuleSetFactory ruleSetFactory = new RuleSetFactory();\\n+ ruleSetFactory.setMinimumPriority(opts.getMinPriority());\\n+ \\n+ RuleSets rulesets = ruleSetFactory.createRuleSets(opts.getRulesets());\\n+ printRuleNamesInDebug(opts.debugEnabled(), rulesets);\\n+ long endLoadRules = System.nanoTime();\\n+ Benchmark.mark(Benchmark.TYPE_LOAD_RULES, endLoadRules - startLoadRules, 0);\\n+ \\n+ processFiles(opts.getCpus(), ruleSetFactory, sourceType, files, ctx, renderer,\\n+ opts.getRulesets(), opts.debugEnabled(), opts.shortNamesEnabled(),\\n+ opts.getInputPath(), opts.getEncoding(), opts.getExcludeMarker());\\n+ } catch (RuleSetNotFoundException rsnfe) {\\n+ System.out.println(opts.usage());\\n+ rsnfe.printStackTrace();\\n+ }\\n+\\n+ reportStart = System.nanoTime();\\n+ renderer.end();\\n w.write(EOL);\\n w.flush();\\n if (opts.getReportFile() != null) {\\n@@ -327,7 +337,7 @@ public static void main(String[] args) {\\n System.out.println(e.getMessage());\\n }\\n }\\n- long reportEnd = System.nanoTime();\\n+ reportEnd = System.nanoTime();\\n Benchmark.mark(Benchmark.TYPE_REPORTING, reportEnd - reportStart, 0);\\n }\\n \\n@@ -338,7 +348,7 @@ public static void main(String[] args) {\\n }\\n }\\n \\n- private static class PmdRunnable extends PMD implements Runnable {\\n+ private static class PmdRunnable extends PMD implements Callable {\\n private final ExecutorService executor;\\n private final DataSource dataSource;\\n private final String fileName;\\n@@ -359,12 +369,15 @@ public PmdRunnable(ExecutorService executor, DataSource dataSource, String fileN\\n setExcludeMarker(excludeMarker);\\n }\\n \\n- public void run() {\\n+ public Report call() {\\n PmdThread thread = (PmdThread) Thread.currentThread();\\n \\n RuleContext ctx = thread.getRuleContext();\\n RuleSets rs = thread.getRuleSets(rulesets);\\n \\n+ Report report = new Report();\\n+ ctx.setReport(report);\\n+\\n ctx.setSourceCodeFilename(fileName);\\n if (debugEnabled) {\\n System.out.println(\\\"Processing \\\" + ctx.getSourceCodeFilename());\\n@@ -377,15 +390,15 @@ public void run() {\\n if (debugEnabled) {\\n pmde.getReason().printStackTrace();\\n }\\n- ctx.getReport().addError(\\n+ report.addError(\\n new Report.ProcessingError(pmde.getMessage(),\\n fileName));\\n } catch (IOException ioe) {\\n // unexpected exception: log and stop executor service\\n if (debugEnabled) {\\n ioe.printStackTrace();\\n }\\n- ctx.getReport().addError(\\n+ report.addError(\\n new Report.ProcessingError(ioe.getMessage(),\\n fileName));\\n \\n@@ -395,12 +408,13 @@ public void run() {\\n if (debugEnabled) {\\n re.printStackTrace();\\n }\\n- ctx.getReport().addError(\\n+ report.addError(\\n new Report.ProcessingError(re.getMessage(),\\n fileName));\\n \\n executor.shutdownNow();\\n }\\n+ return report;\\n }\\n \\n }\\n@@ -430,7 +444,6 @@ public PmdThread(int id, Runnable r, RuleSetFactory ruleSetFactory) {\\n super(r, \\\"PmdThread \\\" + id);\\n this.id = id;\\n context = new RuleContext();\\n- context.setReport(new Report());\\n this.ruleSetFactory = ruleSetFactory;\\n }\\n \\n@@ -465,37 +478,61 @@ public String toString() {\\n *\\n * @throws IOException If one of the files could not be read\\n */\\n- public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx, String rulesets,\\n- boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\\n+ public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx,\\n+ Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\\n String encoding, String excludeMarker) {\\n \\n PmdThreadFactory factory = new PmdThreadFactory(ruleSetFactory);\\n ExecutorService executor = Executors.newFixedThreadPool(threadCount, factory);\\n+ List> tasks = new LinkedList>();\\n+ \\n+ Collections.sort(files, new Comparator() {\\n+ public int compare(DataSource d1,DataSource d2) {\\n+ String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\\n+ String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\\n+ return s1.compareTo(s2);\\n+ }\\n+ });\\n \\n for (DataSource dataSource:files) {\\n String niceFileName = dataSource.getNiceFileName(shortNamesEnabled,\\n inputPath);\\n \\n- Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\\n+ PmdRunnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\\n encoding, rulesets, excludeMarker);\\n \\n- executor.execute(r);\\n+ Future future = executor.submit(r);\\n+ tasks.add(future);\\n }\\n executor.shutdown();\\n \\n- try {\\n- executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);\\n- } catch (InterruptedException e) {\\n- }\\n+ while (!tasks.isEmpty()) {\\n+ Future future = tasks.remove(0);\\n+ Report report = null;\\n+ try {\\n+ report = future.get();\\n+ } catch (InterruptedException ie) {\\n+ Thread.currentThread().interrupt();\\n+ future.cancel(true);\\n+ } catch (ExecutionException ee) {\\n+ Throwable t = ee.getCause();\\n+ if (t instanceof RuntimeException) {\\n+ throw (RuntimeException) t;\\n+ } else if (t instanceof Error) {\\n+ throw (Error) t;\\n+ } else {\\n+ throw new IllegalStateException(\\\"PmdRunnable exception\\\", t);\\n+ }\\n+ }\\n \\n- long start = System.nanoTime();\\n- Report mainReport = ctx.getReport();\\n- for (PmdThread thread: factory.threadList) {\\n- Report r = thread.context.getReport();\\n- mainReport.merge(r);\\n+ try {\\n+ long start = System.nanoTime();\\n+ renderer.renderFileReport(report);\\n+ long end = System.nanoTime();\\n+ Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);\\n+ } catch (IOException ioe) {\\n+ }\\n }\\n- long end = System.nanoTime();\\n- Benchmark.mark(Benchmark.TYPE_REPORTING, end - start, 1);\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FPMD.java\",\n \"sha\": \"02f745533b2f11ad0d059284a02ca056f38617e7\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 11,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FReport.java\",\n \"changes\": 22,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FReport.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 11,\n \"filename\": \"pmd/src/net/sourceforge/pmd/Report.java\",\n \"new_code\": \" private final long duration;\\n private final String msg;\\n private final String file;\\n private final IRuleViolation rv;\\n private final boolean isNOPMD;\\n private final String userMessage;\\n private final ReportTree violationTree = new ReportTree();\\n private final Set violations = new TreeSet(COMPARATOR);\\n private final Set metrics = new HashSet();\\n private final List listeners = new ArrayList();\\n private final List errors = new ArrayList();\",\n \"new_methods\": [],\n \"old_code\": \" private long duration;\\n private String msg;\\n private String file;\\n private IRuleViolation rv;\\n private boolean isNOPMD;\\n private String userMessage;\\n private ReportTree violationTree = new ReportTree();\\n private Set violations = new TreeSet(COMPARATOR);\\n private Set metrics = new HashSet();\\n private List listeners = new ArrayList();\\n private List errors = new ArrayList();\",\n \"old_methods\": [],\n \"patch\": \"@@ -19,7 +19,7 @@\\n public class Report {\\n \\n public static class ReadableDuration {\\n- private long duration;\\n+ private final long duration;\\n \\n public ReadableDuration(long duration) {\\n this.duration = duration;\\n@@ -57,8 +57,8 @@ public String getTime() {\\n }\\n \\n public static class ProcessingError {\\n- private String msg;\\n- private String file;\\n+ private final String msg;\\n+ private final String file;\\n \\n public ProcessingError(String msg, String file) {\\n this.msg = msg;\\n@@ -75,9 +75,9 @@ public String getFile() {\\n }\\n \\n public static class SuppressedViolation {\\n- private IRuleViolation rv;\\n- private boolean isNOPMD;\\n- private String userMessage;\\n+ private final IRuleViolation rv;\\n+ private final boolean isNOPMD;\\n+ private final String userMessage;\\n \\n public SuppressedViolation(IRuleViolation rv, boolean isNOPMD, String userMessage) {\\n this.isNOPMD = isNOPMD;\\n@@ -109,13 +109,13 @@ public String getUserMessage() {\\n * better and faster sort and filter mechanism and to visualize the result\\n * als tree. (ide plugins).\\n * */\\n- private ReportTree violationTree = new ReportTree();\\n+ private final ReportTree violationTree = new ReportTree();\\n \\n // Note that this and the above data structure are both being maintained for a bit\\n- private Set violations = new TreeSet(COMPARATOR);\\n- private Set metrics = new HashSet();\\n- private List listeners = new ArrayList();\\n- private List errors = new ArrayList();\\n+ private final Set violations = new TreeSet(COMPARATOR);\\n+ private final Set metrics = new HashSet();\\n+ private final List listeners = new ArrayList();\\n+ private final List errors = new ArrayList();\\n private Map linesToExclude = new HashMap();\\n private long start;\\n private long end;\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2FReport.java\",\n \"sha\": \"52d7fc7f35da6ec0eb74816f7632e60615d2481e\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 30,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FAbstractRenderer.java\",\n \"changes\": 30,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FAbstractRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 0,\n \"filename\": \"pmd/src/net/sourceforge/pmd/renderers/AbstractRenderer.java\",\n \"new_code\": \"import java.io.Writer;\\n private Writer writer;\\n\\n private Report mainReport;\\n\\n public void setWriter(Writer writer) {\\n this.writer = writer;\\n }\\n\\n public Writer getWriter() {\\n return writer;\\n }\\n\\n public void start() throws IOException {\\n // default (and backward compatible) behavior is to build a full report.\\n // Optimized rendering is done in OnTheFlyRenderer and descendants\\n mainReport = new Report();\\n }\\n\\n public void renderFileReport(Report report) throws IOException {\\n // default (and backward compatible) behavior is to build a full report.\\n // Optimized rendering is done in OnTheFlyRenderer and descendants\\n mainReport.merge(report);\\n }\\n\\n public void end() throws IOException {\\n // default (and backward compatible) behavior is to build a full report.\\n // Optimized rendering is done in OnTheFlyRenderer and descendants\\n render(writer, mainReport);\\n }\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"Writer writer\"\n ],\n \"filename\": \"pmd/src/net/sourceforge/pmd/renderers/AbstractRenderer.java\",\n \"implementation\": \"this.writer = writer;\",\n \"signature\": \"void setWriter(Writer writer)\"\n },\n {\n \"arguments\": [],\n \"filename\": \"pmd/src/net/sourceforge/pmd/renderers/AbstractRenderer.java\",\n \"implementation\": \"return writer;\",\n \"signature\": \"Writer getWriter()\"\n }\n ],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -2,6 +2,7 @@\\n \\n import java.io.IOException;\\n import java.io.StringWriter;\\n+import java.io.Writer;\\n \\n import net.sourceforge.pmd.Report;\\n \\n@@ -23,4 +24,33 @@ public String render(Report report) {\\n return w.toString();\\n }\\n \\n+ private Writer writer;\\n+\\n+ private Report mainReport;\\n+\\n+ public void setWriter(Writer writer) {\\n+ this.writer = writer;\\n+ }\\n+\\n+ public Writer getWriter() {\\n+ return writer;\\n+ }\\n+\\n+ public void start() throws IOException {\\n+ // default (and backward compatible) behavior is to build a full report.\\n+ // Optimized rendering is done in OnTheFlyRenderer and descendants\\n+ mainReport = new Report();\\n+ }\\n+\\n+ public void renderFileReport(Report report) throws IOException {\\n+ // default (and backward compatible) behavior is to build a full report.\\n+ // Optimized rendering is done in OnTheFlyRenderer and descendants\\n+ mainReport.merge(report);\\n+ }\\n+\\n+ public void end() throws IOException {\\n+ // default (and backward compatible) behavior is to build a full report.\\n+ // Optimized rendering is done in OnTheFlyRenderer and descendants\\n+ render(writer, mainReport);\\n+ }\\n }\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FAbstractRenderer.java\",\n \"sha\": \"072f1b752f5b9896c980ad3384bf167b32597d3c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 14,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FCSVRenderer.java\",\n \"changes\": 24,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FCSVRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 10,\n \"filename\": \"pmd/src/net/sourceforge/pmd/renderers/CSVRenderer.java\",\n \"new_code\": \"public class CSVRenderer extends OnTheFlyRenderer {\\n private int violationCount = 1;\\n\\n public void start() throws IOException {\\n getWriter().write(buf.toString());\\n public void renderFileViolations(Iterator violations) throws IOException {\\n StringBuffer buf = new StringBuffer(300);\\n Writer writer = getWriter();\\n\\n while (violations.hasNext()) {\\n rv = violations.next();\\n public void end() throws IOException {\\n }\\n\",\n \"new_methods\": [],\n \"old_code\": \"import net.sourceforge.pmd.Report;\\npublic class CSVRenderer extends AbstractRenderer {\\n public void render(Writer writer, Report report) throws IOException {\\n writer.write(buf.toString());\\n\\n addViolations(writer, report, buf);\\n\\tprivate void addViolations(Writer writer, Report report, StringBuffer buf) throws IOException {\\n\\t\\tint violationCount = 1;\\n for (Iterator i = report.iterator(); i.hasNext();) {\\n rv = i.next();\",\n \"old_methods\": [],\n \"patch\": \"@@ -5,16 +5,17 @@\\n \\n import net.sourceforge.pmd.IRuleViolation;\\n import net.sourceforge.pmd.PMD;\\n-import net.sourceforge.pmd.Report;\\n import net.sourceforge.pmd.util.StringUtil;\\n \\n import java.io.IOException;\\n import java.io.Writer;\\n import java.util.Iterator;\\n \\n-public class CSVRenderer extends AbstractRenderer {\\n+public class CSVRenderer extends OnTheFlyRenderer {\\n \\n- public void render(Writer writer, Report report) throws IOException {\\n+ private int violationCount = 1;\\n+\\n+ public void start() throws IOException {\\n StringBuffer buf = new StringBuffer(300);\\n quoteAndCommify(buf, \\\"Problem\\\");\\n quoteAndCommify(buf, \\\"Package\\\");\\n@@ -25,17 +26,17 @@ public void render(Writer writer, Report report) throws IOException {\\n quoteAndCommify(buf, \\\"Rule set\\\");\\n quote(buf, \\\"Rule\\\");\\n buf.append(PMD.EOL);\\n- writer.write(buf.toString());\\n-\\n- addViolations(writer, report, buf);\\n+ getWriter().write(buf.toString());\\n }\\n \\n-\\tprivate void addViolations(Writer writer, Report report, StringBuffer buf) throws IOException {\\n-\\t\\tint violationCount = 1;\\n+ public void renderFileViolations(Iterator violations) throws IOException {\\n+ StringBuffer buf = new StringBuffer(300);\\n+ Writer writer = getWriter();\\n+\\n \\t\\tIRuleViolation rv;\\n- for (Iterator i = report.iterator(); i.hasNext();) {\\n+ while (violations.hasNext()) {\\n buf.setLength(0);\\n- rv = i.next();\\n+ rv = violations.next();\\n quoteAndCommify(buf, Integer.toString(violationCount));\\n quoteAndCommify(buf, rv.getPackageName());\\n quoteAndCommify(buf, rv.getFilename());\\n@@ -50,6 +51,9 @@ private void addViolations(Writer writer, Report report, StringBuffer buf) throw\\n }\\n \\t}\\n \\n+ public void end() throws IOException {\\n+ }\\n+\\n private void quote(StringBuffer sb, String d) {\\n sb.append('\\\"').append(d).append('\\\"');\\n }\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FCSVRenderer.java\",\n \"sha\": \"a4b444833df2b18dc24969a727588e9014b82d53\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 9,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FEmacsRenderer.java\",\n \"changes\": 14,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FEmacsRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 5,\n \"filename\": \"pmd/src/net/sourceforge/pmd/renderers/EmacsRenderer.java\",\n \"new_code\": \"public class EmacsRenderer extends OnTheFlyRenderer {\\n public void start() throws IOException {}\\n\\n public void renderFileViolations(Iterator violations) throws IOException {\\n Writer writer = getWriter();\\n while (violations.hasNext()) {\\n IRuleViolation rv = violations.next();\\n\\n public void end() throws IOException {}\",\n \"new_methods\": [],\n \"old_code\": \"import net.sourceforge.pmd.Report;\\npublic class EmacsRenderer extends AbstractRenderer {\\n public void render(Writer writer, Report report) throws IOException {\\n for (Iterator i = report.iterator(); i.hasNext();) {\\n IRuleViolation rv = i.next();\",\n \"old_methods\": [],\n \"patch\": \"@@ -4,25 +4,29 @@\\n package net.sourceforge.pmd.renderers;\\n \\n import net.sourceforge.pmd.IRuleViolation;\\n-import net.sourceforge.pmd.Report;\\n \\n import java.io.IOException;\\n import java.io.Writer;\\n import java.util.Iterator;\\n \\n-public class EmacsRenderer extends AbstractRenderer {\\n+public class EmacsRenderer extends OnTheFlyRenderer {\\n \\n protected static final String EOL = System.getProperty(\\\"line.separator\\\", \\\"\\\\n\\\");\\n \\n- public void render(Writer writer, Report report) throws IOException {\\n+ public void start() throws IOException {}\\n+\\n+ public void renderFileViolations(Iterator violations) throws IOException {\\n+ Writer writer = getWriter();\\n StringBuffer buf = new StringBuffer();\\n- for (Iterator i = report.iterator(); i.hasNext();) {\\n- IRuleViolation rv = i.next();\\n+ while (violations.hasNext()) {\\n+ IRuleViolation rv = violations.next();\\n buf.setLength(0);\\n buf.append(EOL).append(rv.getFilename());\\n buf.append(':').append(Integer.toString(rv.getBeginLine()));\\n buf.append(\\\": \\\").append(rv.getDescription());\\n writer.write(buf.toString());\\n }\\n }\\n+\\n+ public void end() throws IOException {}\\n }\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FEmacsRenderer.java\",\n \"sha\": \"aa6f77d5c8e14599c723d60aaaab14b53c87a3b9\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 78,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FHTMLRenderer.java\",\n \"changes\": 145,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FHTMLRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 67,\n \"filename\": \"pmd/src/net/sourceforge/pmd/renderers/HTMLRenderer.java\",\n \"new_code\": \"import java.util.List;\\npublic class HTMLRenderer extends OnTheFlyRenderer {\\n private final String linkPrefix;\\n private final String linePrefix;\\n\\n private int violationCount = 1;\\n boolean colorize = true;\\n writer.write(\\\"

PMD report

\\\");\\n writer.write(\\\"

Problems found

\\\");\\n writer.write(\\\"
\\\" + PMD.EOL + \\\"\\\" + PMD.EOL);\\n setWriter(writer);\\n renderFileReport(report);\\n writer.write(\\\"
#FileLineProblem
\\\");\\n glomProcessingErrors(writer, errors);\\n glomSuppressions(writer, suppressed);\\n\\n public void start() throws IOException {\\n Writer writer = getWriter();\\n writer.write(\\\"PMD\\\" + PMD.EOL);\\n }\\n\\n public void renderFileViolations(Iterator violations) throws IOException {\\n Writer writer = getWriter();\\n glomIRuleViolations(writer, violations);\\n }\\n\\n public void end() throws IOException {\\n Writer writer = getWriter();\\n writer.write(\\\"\\\");\\n glomProcessingErrors(writer, errors);\\n if (showSuppressedViolations) {\\n glomSuppressions(writer, suppressed);\\n }\\n writer.write(\\\"\\\");\\n }\\n\\n private void glomIRuleViolations(Writer writer, Iterator violations) throws IOException {\\n StringBuffer buf = new StringBuffer(500);\\n while (violations.hasNext()) {\\n IRuleViolation rv = violations.next();\\n private void glomProcessingErrors(Writer writer, List errors) throws IOException {\\n if (!errors.isEmpty()) {\\n \\n StringBuffer buf = new StringBuffer(500);\\n boolean colorize = true;\\n for (Report.ProcessingError pe: errors) {\\n buf.setLength(0);\\n buf.append(\\\" \\\" + PMD.EOL);\\n buf.append(\\\"\\\" + pe.getFile() + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + pe.getMsg() + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + PMD.EOL);\\n writer.write(buf.toString());\\n \\n private void glomSuppressions(Writer writer, List suppressed) throws IOException {\\n if (!suppressed.isEmpty()) {\\n\\n StringBuffer buf = new StringBuffer(500);\\n boolean colorize = true;\\n for (Report.SuppressedViolation sv: suppressed) {\\n buf.setLength(0);\\n buf.append(\\\" \\\" + PMD.EOL);\\n buf.append(\\\"\\\" + sv.getRuleViolation().getFilename() + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + sv.getRuleViolation().getBeginLine() + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + sv.getRuleViolation().getRule().getName() + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + (sv.suppressedByNOPMD() ? \\\"NOPMD\\\" : \\\"Annotation\\\") + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + (sv.getUserMessage() == null ? \\\"\\\" : sv.getUserMessage()) + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + PMD.EOL);\\n writer.write(buf.toString());\",\n \"new_methods\": [],\n \"old_code\": \"public class HTMLRenderer extends AbstractRenderer {\\n private String linkPrefix;\\n private String linePrefix;\\n public void render(Writer writer, Report report) throws IOException {\\n writer.write(\\\"PMD\\\" + PMD.EOL);\\n renderBody(writer, report);\\n writer.write(\\\"\\\");\\n }\\n\\n glomIRuleViolations(writer, report);\\n glomProcessingErrors(writer, report);\\n glomSuppressions(writer, report);\\n \\n private void glomIRuleViolations(Writer writer, Report report) throws IOException {\\n boolean colorize = true;\\n int violationCount = 1;\\n StringBuffer buf = new StringBuffer(500);\\n for (Iterator i = report.iterator(); i.hasNext();) {\\n IRuleViolation rv = i.next();\\n if (violationCount > 0) {\\n writer.write(\\\"\\\");\\n }\\n private void glomProcessingErrors(Writer writer, Report report) throws IOException {\\n boolean colorize = true;\\n int violationCount;\\n // errors\\n if (report.errors().hasNext()) {\\n }\\n violationCount = 0;\\n StringBuffer buf = new StringBuffer(500);\\n for (Iterator i = report.errors(); i.hasNext();) {\\n Report.ProcessingError pe = i.next();\\n buf.setLength(0);\\n buf.append(\\\" \\\" + PMD.EOL);\\n buf.append(\\\"\\\" + pe.getFile() + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + pe.getMsg() + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + PMD.EOL);\\n writer.write(buf.toString());\\n violationCount++;\\n }\\n if (violationCount > 0) {\\n private void glomSuppressions(Writer writer, Report report) throws IOException {\\n boolean colorize = true;\\n boolean hasSuppressedViolations = !report.getSuppressedRuleViolations().isEmpty();\\n if (hasSuppressedViolations) {\\n }\\n StringBuffer buf = new StringBuffer(500);\\n for (Report.SuppressedViolation sv: report.getSuppressedRuleViolations()) {\\n buf.setLength(0);\\n buf.append(\\\" \\\" + PMD.EOL);\\n buf.append(\\\"\\\" + sv.getRuleViolation().getFilename() + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + sv.getRuleViolation().getBeginLine() + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + sv.getRuleViolation().getRule().getName() + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + (sv.suppressedByNOPMD() ? \\\"NOPMD\\\" : \\\"Annotation\\\") + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + (sv.getUserMessage() == null ? \\\"\\\" : sv.getUserMessage()) + \\\"\\\" + PMD.EOL);\\n buf.append(\\\"\\\" + PMD.EOL);\\n writer.write(buf.toString());\\n }\\n if (hasSuppressedViolations) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -11,11 +11,15 @@\\n import java.io.IOException;\\n import java.io.Writer;\\n import java.util.Iterator;\\n+import java.util.List;\\n \\n-public class HTMLRenderer extends AbstractRenderer {\\n+public class HTMLRenderer extends OnTheFlyRenderer {\\n \\n- private String linkPrefix;\\n- private String linePrefix;\\n+ private final String linkPrefix;\\n+ private final String linePrefix;\\n+\\n+ private int violationCount = 1;\\n+ boolean colorize = true;\\n \\n public HTMLRenderer(String linkPrefix, String linePrefix) {\\n this.linkPrefix = linkPrefix;\\n@@ -27,29 +31,46 @@ public HTMLRenderer() {\\n this(null, null);\\n }\\n \\n- public void render(Writer writer, Report report) throws IOException {\\n- writer.write(\\\"PMD\\\" + PMD.EOL);\\n- renderBody(writer, report);\\n- writer.write(\\\"\\\");\\n- }\\n-\\n public void renderBody(Writer writer, Report report) throws IOException {\\n- glomIRuleViolations(writer, report);\\n- glomProcessingErrors(writer, report);\\n+ writer.write(\\\"

PMD report

\\\");\\n+ writer.write(\\\"

Problems found

\\\");\\n+ writer.write(\\\"\\\" + PMD.EOL + \\\"\\\" + PMD.EOL);\\n+ setWriter(writer);\\n+ renderFileReport(report);\\n+ writer.write(\\\"
#FileLineProblem
\\\");\\n+ glomProcessingErrors(writer, errors);\\n if (showSuppressedViolations) {\\n- glomSuppressions(writer, report);\\n+ glomSuppressions(writer, suppressed);\\n }\\n }\\n- \\n- private void glomIRuleViolations(Writer writer, Report report) throws IOException {\\n- boolean colorize = true;\\n- int violationCount = 1;\\n- StringBuffer buf = new StringBuffer(500);\\n+\\n+ public void start() throws IOException {\\n+ Writer writer = getWriter();\\n+ writer.write(\\\"PMD\\\" + PMD.EOL);\\n writer.write(\\\"

PMD report

\\\");\\n writer.write(\\\"

Problems found

\\\");\\n writer.write(\\\"\\\" + PMD.EOL + \\\"\\\" + PMD.EOL);\\n- for (Iterator i = report.iterator(); i.hasNext();) {\\n- IRuleViolation rv = i.next();\\n+ }\\n+\\n+ public void renderFileViolations(Iterator violations) throws IOException {\\n+ Writer writer = getWriter();\\n+ glomIRuleViolations(writer, violations);\\n+ }\\n+\\n+ public void end() throws IOException {\\n+ Writer writer = getWriter();\\n+ writer.write(\\\"
#FileLineProblem
\\\");\\n+ glomProcessingErrors(writer, errors);\\n+ if (showSuppressedViolations) {\\n+ glomSuppressions(writer, suppressed);\\n+ }\\n+ writer.write(\\\"\\\");\\n+ }\\n+\\n+ private void glomIRuleViolations(Writer writer, Iterator violations) throws IOException {\\n+ StringBuffer buf = new StringBuffer(500);\\n+ while (violations.hasNext()) {\\n+ IRuleViolation rv = violations.next();\\n buf.setLength(0);\\n buf.append(\\\" 0) {\\n- writer.write(\\\"\\\");\\n- }\\n }\\n \\n- private void glomProcessingErrors(Writer writer, Report report) throws IOException {\\n- boolean colorize = true;\\n- int violationCount;\\n- // errors\\n- if (report.errors().hasNext()) {\\n+ private void glomProcessingErrors(Writer writer, List errors) throws IOException {\\n+ if (!errors.isEmpty()) {\\n writer.write(\\\"
\\\");\\n writer.write(\\\"

Processing errors

\\\");\\n writer.write(\\\"\\\" + PMD.EOL + \\\"\\\" + PMD.EOL);\\n- }\\n- violationCount = 0;\\n- StringBuffer buf = new StringBuffer(500);\\n- for (Iterator i = report.errors(); i.hasNext();) {\\n- Report.ProcessingError pe = i.next();\\n- buf.setLength(0);\\n- buf.append(\\\" \\\" + PMD.EOL);\\n+ buf.append(\\\"\\\" + PMD.EOL);\\n+ buf.append(\\\"\\\" + PMD.EOL);\\n+ buf.append(\\\"\\\" + PMD.EOL);\\n+ writer.write(buf.toString());\\n+ \\n }\\n- colorize = !colorize;\\n- buf.append(\\\"> \\\" + PMD.EOL);\\n- buf.append(\\\"\\\" + PMD.EOL);\\n- buf.append(\\\"\\\" + PMD.EOL);\\n- buf.append(\\\"\\\" + PMD.EOL);\\n- writer.write(buf.toString());\\n- violationCount++;\\n- }\\n- if (violationCount > 0) {\\n writer.write(\\\"
FileProblem
\\\" + pe.getFile() + \\\"\\\" + pe.getMsg() + \\\"
\\\" + pe.getFile() + \\\"\\\" + pe.getMsg() + \\\"
\\\");\\n }\\n }\\n \\n- private void glomSuppressions(Writer writer, Report report) throws IOException {\\n- boolean colorize = true;\\n- boolean hasSuppressedViolations = !report.getSuppressedRuleViolations().isEmpty();\\n- if (hasSuppressedViolations) {\\n+ private void glomSuppressions(Writer writer, List suppressed) throws IOException {\\n+ if (!suppressed.isEmpty()) {\\n writer.write(\\\"
\\\");\\n writer.write(\\\"

Suppressed warnings

\\\");\\n writer.write(\\\"\\\" + PMD.EOL + \\\"\\\" + PMD.EOL);\\n- }\\n- StringBuffer buf = new StringBuffer(500);\\n- for (Report.SuppressedViolation sv: report.getSuppressedRuleViolations()) {\\n- buf.setLength(0);\\n- buf.append(\\\" \\\" + PMD.EOL);\\n+ buf.append(\\\"\\\" + PMD.EOL);\\n+ buf.append(\\\"\\\" + PMD.EOL);\\n+ buf.append(\\\"\\\" + PMD.EOL);\\n+ buf.append(\\\"\\\" + PMD.EOL);\\n+ buf.append(\\\"\\\" + PMD.EOL);\\n+ buf.append(\\\"\\\" + PMD.EOL);\\n+ writer.write(buf.toString());\\n }\\n- colorize = !colorize;\\n- buf.append(\\\"> \\\" + PMD.EOL);\\n- buf.append(\\\"\\\" + PMD.EOL);\\n- buf.append(\\\"\\\" + PMD.EOL);\\n- buf.append(\\\"\\\" + PMD.EOL);\\n- buf.append(\\\"\\\" + PMD.EOL);\\n- buf.append(\\\"\\\" + PMD.EOL);\\n- buf.append(\\\"\\\" + PMD.EOL);\\n- writer.write(buf.toString());\\n- }\\n- if (hasSuppressedViolations) {\\n writer.write(\\\"
FileLineRuleNOPMD or AnnotationReason
\\\" + sv.getRuleViolation().getFilename() + \\\"\\\" + sv.getRuleViolation().getBeginLine() + \\\"\\\" + sv.getRuleViolation().getRule().getName() + \\\"\\\" + (sv.suppressedByNOPMD() ? \\\"NOPMD\\\" : \\\"Annotation\\\") + \\\"\\\" + (sv.getUserMessage() == null ? \\\"\\\" : sv.getUserMessage()) + \\\"
\\\" + sv.getRuleViolation().getFilename() + \\\"\\\" + sv.getRuleViolation().getBeginLine() + \\\"\\\" + sv.getRuleViolation().getRule().getName() + \\\"\\\" + (sv.suppressedByNOPMD() ? \\\"NOPMD\\\" : \\\"Annotation\\\") + \\\"\\\" + (sv.getUserMessage() == null ? \\\"\\\" : sv.getUserMessage()) + \\\"
\\\");\\n }\\n }\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FHTMLRenderer.java\",\n \"sha\": \"6c4f4aefe86e75851320a85bd4b57d4722282ae7\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 15,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FIDEAJRenderer.java\",\n \"changes\": 26,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FIDEAJRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 11,\n \"filename\": \"pmd/src/net/sourceforge/pmd/renderers/IDEAJRenderer.java\",\n \"new_code\": \"public class IDEAJRenderer extends OnTheFlyRenderer {\\n public void start() throws IOException {}\\n\\n public void renderFileViolations(Iterator violations) throws IOException {\\n Writer writer = getWriter();\\n render(writer, violations, sourcePath);\\n render(writer, violations, classAndMethodName, singleFileName);\\n public void end() throws IOException {}\\n\\n private void render(Writer writer, Iterator violations, String sourcePathString) throws IOException {\\n while (violations.hasNext()) {\\n IRuleViolation rv = violations.next();\\n private void render(Writer writer, Iterator violations, String classAndMethod, String file) throws IOException {\\n while (violations.hasNext()) {\\n IRuleViolation rv = violations.next();\",\n \"new_methods\": [],\n \"old_code\": \"import net.sourceforge.pmd.Report;\\npublic class IDEAJRenderer extends AbstractRenderer {\\n public void render(Writer writer, Report report) throws IOException {\\n render(writer, report, sourcePath);\\n render(writer, report, classAndMethodName, singleFileName);\\n private void render(Writer writer, Report report, String sourcePathString) throws IOException {\\n for (Iterator i = report.iterator(); i.hasNext();) {\\n IRuleViolation rv = i.next();\\n private void render(Writer writer, Report report, String classAndMethod, String file) throws IOException {\\n for (Iterator i = report.iterator(); i.hasNext();) {\\n IRuleViolation rv = i.next();\",\n \"old_methods\": [],\n \"patch\": \"@@ -5,7 +5,6 @@\\n \\n import net.sourceforge.pmd.IRuleViolation;\\n import net.sourceforge.pmd.PMD;\\n-import net.sourceforge.pmd.Report;\\n \\n import java.io.IOException;\\n import java.io.Writer;\\n@@ -14,7 +13,7 @@\\n import java.util.Set;\\n import java.util.StringTokenizer;\\n \\n-public class IDEAJRenderer extends AbstractRenderer {\\n+public class IDEAJRenderer extends OnTheFlyRenderer {\\n \\n \\tprivate static final String FILE_SEPARATOR = System.getProperty(\\\"file.separator\\\");\\n \\tprivate static final String PATH_SEPARATOR = System.getProperty(\\\"path.separator\\\");\\n@@ -45,37 +44,42 @@ public IDEAJRenderer(String[] args) {\\n this.args = args;\\n }\\n \\n- public void render(Writer writer, Report report) throws IOException {\\n+ public void start() throws IOException {}\\n+\\n+ public void renderFileViolations(Iterator violations) throws IOException {\\n+ Writer writer = getWriter();\\n if (args[4].equals(\\\".method\\\")) {\\n // working on a directory tree\\n String sourcePath = args[3];\\n- render(writer, report, sourcePath);\\n+ render(writer, violations, sourcePath);\\n return;\\n }\\n // working on one file\\n String classAndMethodName = args[4];\\n String singleFileName = args[5];\\n- render(writer, report, classAndMethodName, singleFileName);\\n+ render(writer, violations, classAndMethodName, singleFileName);\\n }\\n \\n- private void render(Writer writer, Report report, String sourcePathString) throws IOException {\\n+ public void end() throws IOException {}\\n+\\n+ private void render(Writer writer, Iterator violations, String sourcePathString) throws IOException {\\n SourcePath sourcePath = new SourcePath(sourcePathString);\\n StringBuffer buf = new StringBuffer();\\n- for (Iterator i = report.iterator(); i.hasNext();) {\\n+ while (violations.hasNext()) {\\n buf.setLength(0);\\n- IRuleViolation rv = i.next();\\n+ IRuleViolation rv = violations.next();\\n buf.append(rv.getDescription() + PMD.EOL);\\n buf.append(\\\" at \\\").append(getFullyQualifiedClassName(rv.getFilename(), sourcePath)).append(\\\".method(\\\");\\n buf.append(getSimpleFileName(rv.getFilename())).append(':').append(rv.getBeginLine()).append(')').append(PMD.EOL);\\n writer.write(buf.toString());\\n }\\n }\\n \\n- private void render(Writer writer, Report report, String classAndMethod, String file) throws IOException {\\n+ private void render(Writer writer, Iterator violations, String classAndMethod, String file) throws IOException {\\n StringBuffer buf = new StringBuffer();\\n- for (Iterator i = report.iterator(); i.hasNext();) {\\n+ while (violations.hasNext()) {\\n buf.setLength(0);\\n- IRuleViolation rv = i.next();\\n+ IRuleViolation rv = violations.next();\\n buf.append(rv.getDescription()).append(PMD.EOL);\\n buf.append(\\\" at \\\").append(classAndMethod).append('(').append(file).append(':').append(rv.getBeginLine()).append(')').append(PMD.EOL);\\n writer.write(buf.toString());\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FIDEAJRenderer.java\",\n \"sha\": \"229386f4d72cff2092188bf063e40edc24f7ca30\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 16,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FRenderer.java\",\n \"changes\": 16,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 0,\n \"filename\": \"pmd/src/net/sourceforge/pmd/renderers/Renderer.java\",\n \"new_code\": \" /**\\n * \\n * @deprecated This method consumes too much memory.\\n * Use the start, renderFileReport and end methods instead.\\n * \\n */\\n void setWriter(Writer writer);\\n\\n Writer getWriter();\\n\\n void start() throws IOException;\\n\\n void renderFileReport(Report report) throws IOException;\\n\\n void end() throws IOException;\\n\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -20,6 +20,22 @@ public interface Renderer {\\n */\\n String render(Report report);\\n \\n+ /**\\n+ * \\n+ * @deprecated This method consumes too much memory.\\n+ * Use the start, renderFileReport and end methods instead.\\n+ * \\n+ */\\n void render(Writer writer, Report report) throws IOException;\\n \\n+ void setWriter(Writer writer);\\n+\\n+ Writer getWriter();\\n+\\n+ void start() throws IOException;\\n+\\n+ void renderFileReport(Report report) throws IOException;\\n+\\n+ void end() throws IOException;\\n+\\n }\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FRenderer.java\",\n \"sha\": \"40f686536d15a5b5c7e6d1e68acb1975755763ff\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRenderer.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 1,\n \"filename\": \"pmd/src/net/sourceforge/pmd/renderers/SummaryHTMLRenderer.java\",\n \"new_code\": \" writer.write(\\\"\\\" + PMD.EOL);\",\n \"new_methods\": [],\n \"old_code\": \" writer.write(\\\"
\\\" + PMD.EOL + \\\"\\\" + PMD.EOL);\",\n \"old_methods\": [],\n \"patch\": \"@@ -22,7 +22,7 @@ public void render(Writer writer, Report report) throws IOException {\\n writer.write(\\\"PMD\\\" + PMD.EOL);\\n renderSummary(writer, report);\\n writer.write(\\\"

Detail

\\\");\\n- writer.write(\\\"
#FileLineProblem
\\\" + PMD.EOL + \\\"\\\" + PMD.EOL);\\n+ writer.write(\\\"
#FileLineProblem
\\\" + PMD.EOL);\\n new HTMLRenderer(linkPrefix,linePrefix).renderBody(writer, report);\\n writer.write(\\\"
\\\");\\n }\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FSummaryHTMLRenderer.java\",\n \"sha\": \"64009639be56e542df6e5d07d31befa09f5537ff\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 10,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextPadRenderer.java\",\n \"changes\": 21,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextPadRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 11,\n \"filename\": \"pmd/src/net/sourceforge/pmd/renderers/TextPadRenderer.java\",\n \"new_code\": \"public class TextPadRenderer extends OnTheFlyRenderer {\\n\\n public void start() throws IOException {}\\n\\n public void renderFileViolations(Iterator violations) throws IOException {\\n Writer writer = getWriter();\\n while (violations.hasNext()) {\\n IRuleViolation rv = violations.next();\\n\\n public void end() throws IOException {}\",\n \"new_methods\": [],\n \"old_code\": \"import net.sourceforge.pmd.Report;\\npublic class TextPadRenderer extends AbstractRenderer {\\n public void render(Writer writer, Report report) throws IOException {\\n Iterator i;\\n try {\\n i = report.iterator();\\n } catch (NullPointerException npx) {\\n throw new NullPointerException(\\\"ERROR in \\\" + this.getClass().getName() + \\\".render: Parameter report is null.\\\");\\n }\\n while (i.hasNext()) {\\n IRuleViolation rv = i.next();\",\n \"old_methods\": [],\n \"patch\": \"@@ -5,7 +5,6 @@\\n \\n import net.sourceforge.pmd.IRuleViolation;\\n import net.sourceforge.pmd.PMD;\\n-import net.sourceforge.pmd.Report;\\n \\n import java.io.IOException;\\n import java.io.Writer;\\n@@ -26,17 +25,15 @@\\n *\\n * @author Jeff Epstein, based upon EmacsRenderer, Tuesday, September 23, 2003\\n */\\n-public class TextPadRenderer extends AbstractRenderer {\\n- public void render(Writer writer, Report report) throws IOException {\\n+public class TextPadRenderer extends OnTheFlyRenderer {\\n+\\n+ public void start() throws IOException {}\\n+\\n+ public void renderFileViolations(Iterator violations) throws IOException {\\n+ Writer writer = getWriter();\\n StringBuffer buf = new StringBuffer();\\n- Iterator i;\\n- try {\\n- i = report.iterator();\\n- } catch (NullPointerException npx) {\\n- throw new NullPointerException(\\\"ERROR in \\\" + this.getClass().getName() + \\\".render: Parameter report is null.\\\");\\n- }\\n- while (i.hasNext()) {\\n- IRuleViolation rv = i.next();\\n+ while (violations.hasNext()) {\\n+ IRuleViolation rv = violations.next();\\n buf.setLength(0);\\n //Filename\\n buf.append(PMD.EOL).append(rv.getFilename() + \\\"(\\\");\\n@@ -49,4 +46,6 @@ public void render(Writer writer, Report report) throws IOException {\\n writer.write(buf.toString());\\n }\\n }\\n+\\n+ public void end() throws IOException {}\\n }\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextPadRenderer.java\",\n \"sha\": \"bb93ec85206a84e6e799f836e0d21e132fc44c25\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 32,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextRenderer.java\",\n \"changes\": 59,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 27,\n \"filename\": \"pmd/src/net/sourceforge/pmd/renderers/TextRenderer.java\",\n \"new_code\": \"public class TextRenderer extends OnTheFlyRenderer {\\n private boolean empty;\\n\\n public void start() throws IOException {\\n empty = true;\\n }\\n\\n public void renderFileViolations(Iterator violations) throws IOException {\\n Writer writer = getWriter();\\n empty = !violations.hasNext();\\n while (violations.hasNext()) {\\n IRuleViolation rv = violations.next();\\n }\\n public void end() throws IOException {\\n Writer writer = getWriter();\\n StringBuffer buf = new StringBuffer();\\n if (!errors.isEmpty()) {\\n empty = false;\\n for(Report.ProcessingError error: errors) {\\n buf.setLength(0);\\n buf.append(PMD.EOL).append(error.getFile());\\n buf.append(\\\"\\\\t-\\\\t\\\").append(error.getMsg());\\n writer.write(buf.toString());\\n }\\n for(Report.SuppressedViolation excluded: suppressed) {\\n buf.setLength(0);\\n writer.write(buf.toString());\\n }\\n\\n if (empty) {\\n getWriter().write(\\\"No problems found!\\\");\\n\",\n \"new_methods\": [],\n \"old_code\": \"public class TextRenderer extends AbstractRenderer {\\n public void render(Writer writer, Report report) throws IOException {\\n if (report.isEmpty()) {\\n buf.append(\\\"No problems found!\\\");\\n if (showSuppressedViolations) {\\n addSuppressed(report, buf);\\n }\\n writer.write(buf.toString());\\n return;\\n }\\n \\n for (Iterator i = report.iterator(); i.hasNext();) {\\n IRuleViolation rv = i.next();\\n for (Iterator i = report.errors(); i.hasNext();) {\\n buf.setLength(0);\\n Report.ProcessingError error = i.next();\\n buf.append(PMD.EOL).append(error.getFile());\\n buf.append(\\\"\\\\t-\\\\t\\\").append(error.getMsg());\\n writer.write(buf.toString());\\n }\\n if (showSuppressedViolations) {\\n buf.setLength(0);\\n addSuppressed(report, buf);\\n writer.write(buf.toString());\\n }\\n private void addSuppressed(Report report, StringBuffer buf) {\\n for (Report.SuppressedViolation excluded: report.getSuppressedRuleViolations()) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -11,51 +11,56 @@\\n import java.io.Writer;\\n import java.util.Iterator;\\n \\n-public class TextRenderer extends AbstractRenderer {\\n+public class TextRenderer extends OnTheFlyRenderer {\\n \\n- public void render(Writer writer, Report report) throws IOException {\\n+ private boolean empty;\\n+\\n+ public void start() throws IOException {\\n+ empty = true;\\n+ }\\n+\\n+ public void renderFileViolations(Iterator violations) throws IOException {\\n+ Writer writer = getWriter();\\n StringBuffer buf = new StringBuffer();\\n \\n- if (report.isEmpty()) {\\n- buf.append(\\\"No problems found!\\\");\\n- if (showSuppressedViolations) {\\n- addSuppressed(report, buf);\\n- }\\n- writer.write(buf.toString());\\n- return;\\n- }\\n- \\n- for (Iterator i = report.iterator(); i.hasNext();) {\\n+ empty = !violations.hasNext();\\n+ while (violations.hasNext()) {\\n buf.setLength(0);\\n- IRuleViolation rv = i.next();\\n+ IRuleViolation rv = violations.next();\\n buf.append(PMD.EOL).append(rv.getFilename());\\n buf.append(':').append(Integer.toString(rv.getBeginLine()));\\n buf.append('\\\\t').append(rv.getDescription());\\n writer.write(buf.toString());\\n }\\n+ }\\n \\n- for (Iterator i = report.errors(); i.hasNext();) {\\n- buf.setLength(0);\\n- Report.ProcessingError error = i.next();\\n- buf.append(PMD.EOL).append(error.getFile());\\n- buf.append(\\\"\\\\t-\\\\t\\\").append(error.getMsg());\\n- writer.write(buf.toString());\\n- }\\n+ public void end() throws IOException {\\n+ Writer writer = getWriter();\\n+ StringBuffer buf = new StringBuffer();\\n+ if (!errors.isEmpty()) {\\n+ empty = false;\\n \\n- if (showSuppressedViolations) {\\n- buf.setLength(0);\\n- addSuppressed(report, buf);\\n- writer.write(buf.toString());\\n+ for(Report.ProcessingError error: errors) {\\n+ buf.setLength(0);\\n+ buf.append(PMD.EOL).append(error.getFile());\\n+ buf.append(\\\"\\\\t-\\\\t\\\").append(error.getMsg());\\n+ writer.write(buf.toString());\\n+ }\\n }\\n- }\\n \\n- private void addSuppressed(Report report, StringBuffer buf) {\\n- for (Report.SuppressedViolation excluded: report.getSuppressedRuleViolations()) {\\n+ for(Report.SuppressedViolation excluded: suppressed) {\\n+ buf.setLength(0);\\n buf.append(PMD.EOL);\\n buf.append(excluded.getRuleViolation().getRule().getName());\\n buf.append(\\\" rule violation suppressed by \\\");\\n buf.append(excluded.suppressedByNOPMD() ? \\\"//NOPMD\\\" : \\\"Annotation\\\");\\n buf.append(\\\" in \\\").append(excluded.getRuleViolation().getFilename());\\n+ writer.write(buf.toString());\\n+ }\\n+\\n+ if (empty) {\\n+ getWriter().write(\\\"No problems found!\\\");\\n }\\n }\\n+\\n }\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FTextRenderer.java\",\n \"sha\": \"83e7b1865889e1a37d297851059b8a7ab18c16aa\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 21,\n \"blob_url\": \"https://github.com/adangel/pmd/blob/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRenderer.java\",\n \"changes\": 34,\n \"contents_url\": \"https://api.github.com/repos/adangel/pmd/contents/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRenderer.java?ref=14da817cf7cc74de98af1649d9dde7da3b4b6c7d\",\n \"deletions\": 13,\n \"filename\": \"pmd/src/net/sourceforge/pmd/renderers/VBHTMLRenderer.java\",\n \"new_code\": \"public class VBHTMLRenderer extends OnTheFlyRenderer {\\n public void start() throws IOException {\\n getWriter().write(header()); \\n }\\n\\n public void renderFileViolations(Iterator violations) throws IOException {\\n if (!violations.hasNext()) {\\n Writer writer = getWriter();\\n while (violations.hasNext()) {\\n IRuleViolation rv = violations.next();\\n }\\n\\n public void end() throws IOException {\\n Writer writer = getWriter();\\n StringBuffer sb = new StringBuffer();\\n \\n if (!errors.isEmpty()) {\\n boolean colorize = false;\\n for (Report.ProcessingError error: errors) {\\n sb.append(\\\"\\\").append(error).append(\\\"\\\\\\\"\\\");\\n writer.write(footer()); \",\n \"new_methods\": [],\n \"old_code\": \"public class VBHTMLRenderer extends AbstractRenderer {\\n public void render(Writer writer, Report report) throws IOException {\\n if (report.isEmpty()) {\\n\\n writer.write(header());\\n for (Iterator iter = report.iterator(); iter.hasNext();) {\\n IRuleViolation rv = iter.next();\\n Iterator iter = report.errors();\\n if (iter.hasNext()) {\\n colorize = false;\\n while (iter.hasNext()) {\\n sb.append(\\\"\\\").append(iter.next()).append(\\\"\\\\\\\"\\\");\\n writer.write(footer());\",\n \"old_methods\": [],\n \"patch\": \"@@ -15,23 +15,26 @@\\n * @author Vladimir\\n * @version $Revision$ $Date$\\n */\\n-public class VBHTMLRenderer extends AbstractRenderer {\\n+public class VBHTMLRenderer extends OnTheFlyRenderer {\\n \\n- public void render(Writer writer, Report report) throws IOException {\\n- if (report.isEmpty()) {\\n+ public void start() throws IOException {\\n+ getWriter().write(header()); \\n+ }\\n+\\n+ public void renderFileViolations(Iterator violations) throws IOException {\\n+ if (!violations.hasNext()) {\\n return;\\n }\\n \\n+ Writer writer = getWriter();\\n StringBuffer sb = new StringBuffer();\\n String filename = null;\\n String lineSep = PMD.EOL;\\n \\n boolean colorize = false;\\n-\\n- writer.write(header());\\n- for (Iterator iter = report.iterator(); iter.hasNext();) {\\n+ while (violations.hasNext()) {\\n sb.setLength(0);\\n- IRuleViolation rv = iter.next();\\n+ IRuleViolation rv = violations.next();\\n if (!rv.getFilename().equals(filename)) { // New File\\n if (filename != null) {\\n sb.append(\\\"
\\\");\\n@@ -59,29 +62,34 @@ public void render(Writer writer, Report report) throws IOException {\\n if (filename != null) {\\n writer.write(\\\"\\\");\\n }\\n+ }\\n+\\n+ public void end() throws IOException {\\n+ Writer writer = getWriter();\\n+ StringBuffer sb = new StringBuffer();\\n+ \\n writer.write(\\\"
\\\");\\n \\n // output the problems\\n- Iterator iter = report.errors();\\n- if (iter.hasNext()) {\\n+ if (!errors.isEmpty()) {\\n sb.setLength(0);\\n sb.append(\\\"\\\");\\n sb.append(\\\"\\\");\\n- colorize = false;\\n- while (iter.hasNext()) {\\n+ boolean colorize = false;\\n+ for (Report.ProcessingError error: errors) {\\n if (colorize) {\\n sb.append(\\\"\\\");\\n } else {\\n sb.append(\\\"\\\");\\n }\\n colorize = !colorize;\\n- sb.append(\\\"\\\");\\n+ sb.append(\\\"\\\");\\n }\\n sb.append(\\\"
 Problems found
\\\").append(iter.next()).append(\\\"\\\\\\\"
\\\").append(error).append(\\\"\\\\\\\"
\\\");\\n writer.write(sb.toString());\\n }\\n \\n- writer.write(footer());\\n+ writer.write(footer()); \\n }\\n \\n private String header() {\",\n \"raw_url\": \"https://github.com/adangel/pmd/raw/14da817cf7cc74de98af1649d9dde7da3b4b6c7d/pmd%2Fsrc%2Fnet%2Fsourceforge%2Fpmd%2Frenderers%2FVBHTMLRenderer.java\",\n \"sha\": \"d933e75457782e5dfa59fd32d6a838606d69652e\",\n \"status\": \"modified\"\n }\n]"},"file_patch_count":{"kind":"number","value":15,"string":"15"},"enhanced_diffs":{"kind":"list like","value":[{"name":"adangel$pmd","new_args":"","new_implementation":"Report report = new Report();\n ctx.setReport(report);\n\n report.addError(\n report.addError(\n report.addError(\n return report;\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx,\n Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\n List> tasks = new LinkedList>();\n \n Collections.sort(files, new Comparator() {\n public int compare(DataSource d1,DataSource d2) {\n String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\n String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\n return s1.compareTo(s2);","new_return_type":"Report","new_signature":"Report call()","old_args":"","old_implementation":"ctx.getReport().addError(\n ctx.getReport().addError(\n ctx.getReport().addError(\n context.setReport(new Report());\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx, String rulesets,\n boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\n Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\n executor.execute(r);\n try {\n executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);","old_return_type":"void","old_signature":"void run()"}],"string":"[\n {\n \"name\": \"adangel$pmd\",\n \"new_args\": \"\",\n \"new_implementation\": \"Report report = new Report();\\n ctx.setReport(report);\\n\\n report.addError(\\n report.addError(\\n report.addError(\\n return report;\\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx,\\n Renderer renderer, String rulesets, boolean debugEnabled, final boolean shortNamesEnabled, final String inputPath,\\n List> tasks = new LinkedList>();\\n \\n Collections.sort(files, new Comparator() {\\n public int compare(DataSource d1,DataSource d2) {\\n String s1 = d1.getNiceFileName(shortNamesEnabled, inputPath);\\n String s2 = d2.getNiceFileName(shortNamesEnabled, inputPath);\\n return s1.compareTo(s2);\",\n \"new_return_type\": \"Report\",\n \"new_signature\": \"Report call()\",\n \"old_args\": \"\",\n \"old_implementation\": \"ctx.getReport().addError(\\n ctx.getReport().addError(\\n ctx.getReport().addError(\\n context.setReport(new Report());\\n public static void processFiles(int threadCount, RuleSetFactory ruleSetFactory, SourceType sourceType, List files, RuleContext ctx, String rulesets,\\n boolean debugEnabled, boolean shortNamesEnabled, String inputPath,\\n Runnable r = new PmdRunnable(executor, dataSource, niceFileName, sourceType, debugEnabled,\\n executor.execute(r);\\n try {\\n executor.awaitTermination(Long.MAX_VALUE, TimeUnit.NANOSECONDS);\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void run()\"\n }\n]"},"enhanced_diffs_count":{"kind":"number","value":1,"string":"1"},"diff_count":{"kind":"number","value":2,"string":"2"}}},{"rowIdx":12,"cells":{"commit_sha":{"kind":"string","value":"19324b3ed89081bfa2cea984a4708aa3b8c658a8"},"modifications":{"kind":"list like","value":[{"name":"google$truth","new_args":"","new_implementation":"@Test public void testDeclaresField_public() {\n @Test public void testDeclaresField_nullSubject() {\n @Test public void testDeclaresField_private() {\n @Test public void testIsAssignableFrom_same() {","new_return_type":"void","new_signature":"void testDeclaresField_noSuchField()","old_args":"","old_implementation":"@Test public void testDeclaresField_Public() {\n @Test public void testDeclaresField_NullSubject() {\n @Test public void testDeclaresField_Private() {\n @Test public void testIsAssignableFromSame() {","old_return_type":"void","old_signature":"void testDeclaresField_NoSuchField()"},{"name":"google$truth","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testDeclaresField_nullSubject()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testDeclaresField_NullSubject()"},{"name":"google$truth","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testDeclaresField_private()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testDeclaresField_Private()"},{"name":"google$truth","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testDeclaresField_public()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testDeclaresField_Public()"},{"name":"google$truth","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testIsAssignableFrom_parent()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testIsAssignableFromParent()"}],"string":"[\n {\n \"name\": \"google$truth\",\n \"new_args\": \"\",\n \"new_implementation\": \"@Test public void testDeclaresField_public() {\\n @Test public void testDeclaresField_nullSubject() {\\n @Test public void testDeclaresField_private() {\\n @Test public void testIsAssignableFrom_same() {\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testDeclaresField_noSuchField()\",\n \"old_args\": \"\",\n \"old_implementation\": \"@Test public void testDeclaresField_Public() {\\n @Test public void testDeclaresField_NullSubject() {\\n @Test public void testDeclaresField_Private() {\\n @Test public void testIsAssignableFromSame() {\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testDeclaresField_NoSuchField()\"\n },\n {\n \"name\": \"google$truth\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testDeclaresField_nullSubject()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testDeclaresField_NullSubject()\"\n },\n {\n \"name\": \"google$truth\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testDeclaresField_private()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testDeclaresField_Private()\"\n },\n {\n \"name\": \"google$truth\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testDeclaresField_public()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testDeclaresField_Public()\"\n },\n {\n \"name\": \"google$truth\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testIsAssignableFrom_parent()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testIsAssignableFromParent()\"\n }\n]"},"files":{"kind":"list like","value":[{"additions":12,"blob_url":"https://github.com/google/truth/blob/19324b3ed89081bfa2cea984a4708aa3b8c658a8/core%2Fsrc%2Fmain%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassSubject.java","changes":13,"contents_url":"https://api.github.com/repos/google/truth/contents/core%2Fsrc%2Fmain%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassSubject.java?ref=19324b3ed89081bfa2cea984a4708aa3b8c658a8","deletions":1,"filename":"core/src/main/java/com/google/common/truth/ClassSubject.java","new_code":" * Asserts that this class or interface is either the same as, or is a superclass or\n /**\n * Asserts that this class or interface is either the same as, or is a subclass or subinterface\n * of, the given class or interface.\n */\n @GwtIncompatible(\"isAssignableFrom\")\n public void isAssignableTo(Class clazz) {\n if (!clazz.isAssignableFrom(getSubject())) {\n fail(\"is assignable to\", clazz);\n }\n }\n","new_methods":[{"arguments":["Class clazz"],"filename":"core/src/main/java/com/google/common/truth/ClassSubject.java","implementation":"if (!clazz.isAssignableFrom(getSubject())) {\n fail(\"is assignable to\", clazz);","signature":"void isAssignableTo(Class clazz)"}],"old_code":" * Attests that this class or interface is either the same as, or is a superclass or","old_methods":[],"patch":"@@ -23,7 +23,7 @@ public ClassSubject(FailureStrategy failureStrategy, Class o) {\n }\n \n /**\n- * Attests that this class or interface is either the same as, or is a superclass or\n+ * Asserts that this class or interface is either the same as, or is a superclass or\n * superinterface of, the given class or interface.\n */\n @GwtIncompatible(\"isAssignableFrom\")\n@@ -33,6 +33,17 @@ public void isAssignableFrom(Class clazz) {\n }\n }\n \n+ /**\n+ * Asserts that this class or interface is either the same as, or is a subclass or subinterface\n+ * of, the given class or interface.\n+ */\n+ @GwtIncompatible(\"isAssignableFrom\")\n+ public void isAssignableTo(Class clazz) {\n+ if (!clazz.isAssignableFrom(getSubject())) {\n+ fail(\"is assignable to\", clazz);\n+ }\n+ }\n+\n // TODO(user): Create an alternative implementation using JSNI.\n @GwtIncompatible(\"Reflection\")\n public void declaresField(String fieldName) {","raw_url":"https://github.com/google/truth/raw/19324b3ed89081bfa2cea984a4708aa3b8c658a8/core%2Fsrc%2Fmain%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassSubject.java","sha":"573a769e4b37fc4a78d578810436c4816482e67b","status":"modified"},{"additions":38,"blob_url":"https://github.com/google/truth/blob/19324b3ed89081bfa2cea984a4708aa3b8c658a8/core%2Fsrc%2Ftest%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassTest.java","changes":46,"contents_url":"https://api.github.com/repos/google/truth/contents/core%2Fsrc%2Ftest%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassTest.java?ref=19324b3ed89081bfa2cea984a4708aa3b8c658a8","deletions":8,"filename":"core/src/test/java/com/google/common/truth/ClassTest.java","new_code":" @Test public void testDeclaresField_noSuchField() {\n @Test public void testDeclaresField_public() {\n @Test public void testDeclaresField_nullSubject() {\n @Test public void testDeclaresField_private() {\n @Test public void testIsAssignableFrom_same() {\n }\n @Test public void testIsAssignableFrom_parent() {\n @Test public void testIsAssignableTo_same() {\n assertThat(String.class).isAssignableTo(String.class);\n }\n\n @Test public void testIsAssignableTo_parent() {\n assertThat(String.class).isAssignableTo(Object.class);\n assertThat(NullPointerException.class).isAssignableTo(Exception.class);\n }\n\n @Test public void testIsAssignableTo_reversed() {\n try {\n assertThat(Object.class).isAssignableTo(String.class);\n assert_().fail(\"Should have thrown an assertion error.\");\n } catch (AssertionError expected) {\n assertThat(expected.getMessage())\n .isEqualTo(\"Not true that \"\n + \"is assignable to \");\n }\n }\n\n @Test public void testIsAssignableTo_reversedDifferentTypes() {\n try {\n assertThat(String.class).isAssignableTo(Exception.class);\n assert_().fail(\"Should have thrown an assertion error.\");\n } catch (AssertionError expected) {\n assertThat(expected.getMessage())\n .isEqualTo(\"Not true that \"\n + \"is assignable to \");\n }\n }\n","new_methods":[{"arguments":[],"filename":"core/src/test/java/com/google/common/truth/ClassTest.java","implementation":"@Test public void testDeclaresField_public() {\n @Test public void testDeclaresField_nullSubject() {\n @Test public void testDeclaresField_private() {\n @Test public void testIsAssignableFrom_same() {","signature":"void testDeclaresField_noSuchField()"},{"arguments":[],"filename":"core/src/test/java/com/google/common/truth/ClassTest.java","implementation":"@Test public void testIsAssignableTo_same() {\n assertThat(String.class).isAssignableTo(String.class);","signature":"void testIsAssignableFrom_parent()"},{"arguments":[],"filename":"core/src/test/java/com/google/common/truth/ClassTest.java","implementation":"assertThat(String.class).isAssignableTo(Object.class);\n assertThat(NullPointerException.class).isAssignableTo(Exception.class);","signature":"void testIsAssignableTo_parent()"},{"arguments":[],"filename":"core/src/test/java/com/google/common/truth/ClassTest.java","implementation":"try {\n assertThat(Object.class).isAssignableTo(String.class);\n assert_().fail(\"Should have thrown an assertion error.\");","signature":"void testIsAssignableTo_reversed()"},{"arguments":[],"filename":"core/src/test/java/com/google/common/truth/ClassTest.java","implementation":"try {\n assertThat(String.class).isAssignableTo(Exception.class);\n assert_().fail(\"Should have thrown an assertion error.\");","signature":"void testIsAssignableTo_reversedDifferentTypes()"}],"old_code":" @Test public void testDeclaresField_NoSuchField() {\n @Test public void testDeclaresField_Public() {\n @Test public void testDeclaresField_NullSubject() {\n @Test public void testDeclaresField_Private() {\n @Test public void testIsAssignableFromSame() {\n }\n\n @Test public void testIsAssignableFromParent() {","old_methods":[{"arguments":[],"filename":"core/src/test/java/com/google/common/truth/ClassTest.java","implementation":"@Test public void testDeclaresField_Public() {\n @Test public void testDeclaresField_NullSubject() {\n @Test public void testDeclaresField_Private() {\n @Test public void testIsAssignableFromSame() {","signature":"void testDeclaresField_NoSuchField()"}],"patch":"@@ -30,7 +30,7 @@\n @RunWith(JUnit4.class)\n public class ClassTest {\n \n- @Test public void testDeclaresField_NoSuchField() {\n+ @Test public void testDeclaresField_noSuchField() {\n try {\n assertThat(A.class).declaresField(\"noField\");\n assert_().fail(\"Should have thrown an assertion error.\");\n@@ -40,11 +40,11 @@ public class ClassTest {\n }\n }\n \n- @Test public void testDeclaresField_Public() {\n+ @Test public void testDeclaresField_public() {\n assertThat(A.class).declaresField(\"publicField\");\n }\n \n- @Test public void testDeclaresField_NullSubject() {\n+ @Test public void testDeclaresField_nullSubject() {\n Class nullClass = null;\n try {\n assertThat(nullClass).declaresField(\"publicField\");\n@@ -55,19 +55,18 @@ public class ClassTest {\n }\n }\n \n- @Test public void testDeclaresField_Private() {\n+ @Test public void testDeclaresField_private() {\n assertThat(A.class).declaresField(\"privateField\");\n }\n \n- @Test public void testIsAssignableFromSame() {\n+ @Test public void testIsAssignableFrom_same() {\n assertThat(String.class.isAssignableFrom(String.class)).isTrue();\n assertThat(String.class).isAssignableFrom(String.class);\n+ }\n \n+ @Test public void testIsAssignableFrom_parent() {\n assertThat(Object.class.isAssignableFrom(String.class)).isTrue();\n assertThat(Object.class).isAssignableFrom(String.class);\n- }\n-\n- @Test public void testIsAssignableFromParent() {\n assertThat(Exception.class.isAssignableFrom(NullPointerException.class)).isTrue();\n assertThat(Exception.class).isAssignableFrom(NullPointerException.class);\n }\n@@ -96,6 +95,37 @@ public class ClassTest {\n }\n }\n \n+ @Test public void testIsAssignableTo_same() {\n+ assertThat(String.class).isAssignableTo(String.class);\n+ }\n+\n+ @Test public void testIsAssignableTo_parent() {\n+ assertThat(String.class).isAssignableTo(Object.class);\n+ assertThat(NullPointerException.class).isAssignableTo(Exception.class);\n+ }\n+\n+ @Test public void testIsAssignableTo_reversed() {\n+ try {\n+ assertThat(Object.class).isAssignableTo(String.class);\n+ assert_().fail(\"Should have thrown an assertion error.\");\n+ } catch (AssertionError expected) {\n+ assertThat(expected.getMessage())\n+ .isEqualTo(\"Not true that \"\n+ + \"is assignable to \");\n+ }\n+ }\n+\n+ @Test public void testIsAssignableTo_reversedDifferentTypes() {\n+ try {\n+ assertThat(String.class).isAssignableTo(Exception.class);\n+ assert_().fail(\"Should have thrown an assertion error.\");\n+ } catch (AssertionError expected) {\n+ assertThat(expected.getMessage())\n+ .isEqualTo(\"Not true that \"\n+ + \"is assignable to \");\n+ }\n+ }\n+\n public static class A {\n public String publicField = null;\n @SuppressWarnings(\"unused\")","raw_url":"https://github.com/google/truth/raw/19324b3ed89081bfa2cea984a4708aa3b8c658a8/core%2Fsrc%2Ftest%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassTest.java","sha":"227ace6ab6679f106b6c52656242bfb1615d2ac7","status":"modified"}],"string":"[\n {\n \"additions\": 12,\n \"blob_url\": \"https://github.com/google/truth/blob/19324b3ed89081bfa2cea984a4708aa3b8c658a8/core%2Fsrc%2Fmain%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassSubject.java\",\n \"changes\": 13,\n \"contents_url\": \"https://api.github.com/repos/google/truth/contents/core%2Fsrc%2Fmain%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassSubject.java?ref=19324b3ed89081bfa2cea984a4708aa3b8c658a8\",\n \"deletions\": 1,\n \"filename\": \"core/src/main/java/com/google/common/truth/ClassSubject.java\",\n \"new_code\": \" * Asserts that this class or interface is either the same as, or is a superclass or\\n /**\\n * Asserts that this class or interface is either the same as, or is a subclass or subinterface\\n * of, the given class or interface.\\n */\\n @GwtIncompatible(\\\"isAssignableFrom\\\")\\n public void isAssignableTo(Class clazz) {\\n if (!clazz.isAssignableFrom(getSubject())) {\\n fail(\\\"is assignable to\\\", clazz);\\n }\\n }\\n\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"Class clazz\"\n ],\n \"filename\": \"core/src/main/java/com/google/common/truth/ClassSubject.java\",\n \"implementation\": \"if (!clazz.isAssignableFrom(getSubject())) {\\n fail(\\\"is assignable to\\\", clazz);\",\n \"signature\": \"void isAssignableTo(Class clazz)\"\n }\n ],\n \"old_code\": \" * Attests that this class or interface is either the same as, or is a superclass or\",\n \"old_methods\": [],\n \"patch\": \"@@ -23,7 +23,7 @@ public ClassSubject(FailureStrategy failureStrategy, Class o) {\\n }\\n \\n /**\\n- * Attests that this class or interface is either the same as, or is a superclass or\\n+ * Asserts that this class or interface is either the same as, or is a superclass or\\n * superinterface of, the given class or interface.\\n */\\n @GwtIncompatible(\\\"isAssignableFrom\\\")\\n@@ -33,6 +33,17 @@ public void isAssignableFrom(Class clazz) {\\n }\\n }\\n \\n+ /**\\n+ * Asserts that this class or interface is either the same as, or is a subclass or subinterface\\n+ * of, the given class or interface.\\n+ */\\n+ @GwtIncompatible(\\\"isAssignableFrom\\\")\\n+ public void isAssignableTo(Class clazz) {\\n+ if (!clazz.isAssignableFrom(getSubject())) {\\n+ fail(\\\"is assignable to\\\", clazz);\\n+ }\\n+ }\\n+\\n // TODO(user): Create an alternative implementation using JSNI.\\n @GwtIncompatible(\\\"Reflection\\\")\\n public void declaresField(String fieldName) {\",\n \"raw_url\": \"https://github.com/google/truth/raw/19324b3ed89081bfa2cea984a4708aa3b8c658a8/core%2Fsrc%2Fmain%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassSubject.java\",\n \"sha\": \"573a769e4b37fc4a78d578810436c4816482e67b\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 38,\n \"blob_url\": \"https://github.com/google/truth/blob/19324b3ed89081bfa2cea984a4708aa3b8c658a8/core%2Fsrc%2Ftest%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassTest.java\",\n \"changes\": 46,\n \"contents_url\": \"https://api.github.com/repos/google/truth/contents/core%2Fsrc%2Ftest%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassTest.java?ref=19324b3ed89081bfa2cea984a4708aa3b8c658a8\",\n \"deletions\": 8,\n \"filename\": \"core/src/test/java/com/google/common/truth/ClassTest.java\",\n \"new_code\": \" @Test public void testDeclaresField_noSuchField() {\\n @Test public void testDeclaresField_public() {\\n @Test public void testDeclaresField_nullSubject() {\\n @Test public void testDeclaresField_private() {\\n @Test public void testIsAssignableFrom_same() {\\n }\\n @Test public void testIsAssignableFrom_parent() {\\n @Test public void testIsAssignableTo_same() {\\n assertThat(String.class).isAssignableTo(String.class);\\n }\\n\\n @Test public void testIsAssignableTo_parent() {\\n assertThat(String.class).isAssignableTo(Object.class);\\n assertThat(NullPointerException.class).isAssignableTo(Exception.class);\\n }\\n\\n @Test public void testIsAssignableTo_reversed() {\\n try {\\n assertThat(Object.class).isAssignableTo(String.class);\\n assert_().fail(\\\"Should have thrown an assertion error.\\\");\\n } catch (AssertionError expected) {\\n assertThat(expected.getMessage())\\n .isEqualTo(\\\"Not true that \\\"\\n + \\\"is assignable to \\\");\\n }\\n }\\n\\n @Test public void testIsAssignableTo_reversedDifferentTypes() {\\n try {\\n assertThat(String.class).isAssignableTo(Exception.class);\\n assert_().fail(\\\"Should have thrown an assertion error.\\\");\\n } catch (AssertionError expected) {\\n assertThat(expected.getMessage())\\n .isEqualTo(\\\"Not true that \\\"\\n + \\\"is assignable to \\\");\\n }\\n }\\n\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"core/src/test/java/com/google/common/truth/ClassTest.java\",\n \"implementation\": \"@Test public void testDeclaresField_public() {\\n @Test public void testDeclaresField_nullSubject() {\\n @Test public void testDeclaresField_private() {\\n @Test public void testIsAssignableFrom_same() {\",\n \"signature\": \"void testDeclaresField_noSuchField()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"core/src/test/java/com/google/common/truth/ClassTest.java\",\n \"implementation\": \"@Test public void testIsAssignableTo_same() {\\n assertThat(String.class).isAssignableTo(String.class);\",\n \"signature\": \"void testIsAssignableFrom_parent()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"core/src/test/java/com/google/common/truth/ClassTest.java\",\n \"implementation\": \"assertThat(String.class).isAssignableTo(Object.class);\\n assertThat(NullPointerException.class).isAssignableTo(Exception.class);\",\n \"signature\": \"void testIsAssignableTo_parent()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"core/src/test/java/com/google/common/truth/ClassTest.java\",\n \"implementation\": \"try {\\n assertThat(Object.class).isAssignableTo(String.class);\\n assert_().fail(\\\"Should have thrown an assertion error.\\\");\",\n \"signature\": \"void testIsAssignableTo_reversed()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"core/src/test/java/com/google/common/truth/ClassTest.java\",\n \"implementation\": \"try {\\n assertThat(String.class).isAssignableTo(Exception.class);\\n assert_().fail(\\\"Should have thrown an assertion error.\\\");\",\n \"signature\": \"void testIsAssignableTo_reversedDifferentTypes()\"\n }\n ],\n \"old_code\": \" @Test public void testDeclaresField_NoSuchField() {\\n @Test public void testDeclaresField_Public() {\\n @Test public void testDeclaresField_NullSubject() {\\n @Test public void testDeclaresField_Private() {\\n @Test public void testIsAssignableFromSame() {\\n }\\n\\n @Test public void testIsAssignableFromParent() {\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"core/src/test/java/com/google/common/truth/ClassTest.java\",\n \"implementation\": \"@Test public void testDeclaresField_Public() {\\n @Test public void testDeclaresField_NullSubject() {\\n @Test public void testDeclaresField_Private() {\\n @Test public void testIsAssignableFromSame() {\",\n \"signature\": \"void testDeclaresField_NoSuchField()\"\n }\n ],\n \"patch\": \"@@ -30,7 +30,7 @@\\n @RunWith(JUnit4.class)\\n public class ClassTest {\\n \\n- @Test public void testDeclaresField_NoSuchField() {\\n+ @Test public void testDeclaresField_noSuchField() {\\n try {\\n assertThat(A.class).declaresField(\\\"noField\\\");\\n assert_().fail(\\\"Should have thrown an assertion error.\\\");\\n@@ -40,11 +40,11 @@ public class ClassTest {\\n }\\n }\\n \\n- @Test public void testDeclaresField_Public() {\\n+ @Test public void testDeclaresField_public() {\\n assertThat(A.class).declaresField(\\\"publicField\\\");\\n }\\n \\n- @Test public void testDeclaresField_NullSubject() {\\n+ @Test public void testDeclaresField_nullSubject() {\\n Class nullClass = null;\\n try {\\n assertThat(nullClass).declaresField(\\\"publicField\\\");\\n@@ -55,19 +55,18 @@ public class ClassTest {\\n }\\n }\\n \\n- @Test public void testDeclaresField_Private() {\\n+ @Test public void testDeclaresField_private() {\\n assertThat(A.class).declaresField(\\\"privateField\\\");\\n }\\n \\n- @Test public void testIsAssignableFromSame() {\\n+ @Test public void testIsAssignableFrom_same() {\\n assertThat(String.class.isAssignableFrom(String.class)).isTrue();\\n assertThat(String.class).isAssignableFrom(String.class);\\n+ }\\n \\n+ @Test public void testIsAssignableFrom_parent() {\\n assertThat(Object.class.isAssignableFrom(String.class)).isTrue();\\n assertThat(Object.class).isAssignableFrom(String.class);\\n- }\\n-\\n- @Test public void testIsAssignableFromParent() {\\n assertThat(Exception.class.isAssignableFrom(NullPointerException.class)).isTrue();\\n assertThat(Exception.class).isAssignableFrom(NullPointerException.class);\\n }\\n@@ -96,6 +95,37 @@ public class ClassTest {\\n }\\n }\\n \\n+ @Test public void testIsAssignableTo_same() {\\n+ assertThat(String.class).isAssignableTo(String.class);\\n+ }\\n+\\n+ @Test public void testIsAssignableTo_parent() {\\n+ assertThat(String.class).isAssignableTo(Object.class);\\n+ assertThat(NullPointerException.class).isAssignableTo(Exception.class);\\n+ }\\n+\\n+ @Test public void testIsAssignableTo_reversed() {\\n+ try {\\n+ assertThat(Object.class).isAssignableTo(String.class);\\n+ assert_().fail(\\\"Should have thrown an assertion error.\\\");\\n+ } catch (AssertionError expected) {\\n+ assertThat(expected.getMessage())\\n+ .isEqualTo(\\\"Not true that \\\"\\n+ + \\\"is assignable to \\\");\\n+ }\\n+ }\\n+\\n+ @Test public void testIsAssignableTo_reversedDifferentTypes() {\\n+ try {\\n+ assertThat(String.class).isAssignableTo(Exception.class);\\n+ assert_().fail(\\\"Should have thrown an assertion error.\\\");\\n+ } catch (AssertionError expected) {\\n+ assertThat(expected.getMessage())\\n+ .isEqualTo(\\\"Not true that \\\"\\n+ + \\\"is assignable to \\\");\\n+ }\\n+ }\\n+\\n public static class A {\\n public String publicField = null;\\n @SuppressWarnings(\\\"unused\\\")\",\n \"raw_url\": \"https://github.com/google/truth/raw/19324b3ed89081bfa2cea984a4708aa3b8c658a8/core%2Fsrc%2Ftest%2Fjava%2Fcom%2Fgoogle%2Fcommon%2Ftruth%2FClassTest.java\",\n \"sha\": \"227ace6ab6679f106b6c52656242bfb1615d2ac7\",\n \"status\": \"modified\"\n }\n]"},"file_patch_count":{"kind":"number","value":2,"string":"2"},"enhanced_diffs":{"kind":"list like","value":[{"name":"google$truth","new_args":"","new_implementation":"@Test public void testDeclaresField_public() {\n @Test public void testDeclaresField_nullSubject() {\n @Test public void testDeclaresField_private() {\n @Test public void testIsAssignableFrom_same() {","new_return_type":"void","new_signature":"void testDeclaresField_noSuchField()","old_args":"","old_implementation":"@Test public void testDeclaresField_Public() {\n @Test public void testDeclaresField_NullSubject() {\n @Test public void testDeclaresField_Private() {\n @Test public void testIsAssignableFromSame() {","old_return_type":"void","old_signature":"void testDeclaresField_NoSuchField()"}],"string":"[\n {\n \"name\": \"google$truth\",\n \"new_args\": \"\",\n \"new_implementation\": \"@Test public void testDeclaresField_public() {\\n @Test public void testDeclaresField_nullSubject() {\\n @Test public void testDeclaresField_private() {\\n @Test public void testIsAssignableFrom_same() {\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testDeclaresField_noSuchField()\",\n \"old_args\": \"\",\n \"old_implementation\": \"@Test public void testDeclaresField_Public() {\\n @Test public void testDeclaresField_NullSubject() {\\n @Test public void testDeclaresField_Private() {\\n @Test public void testIsAssignableFromSame() {\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testDeclaresField_NoSuchField()\"\n }\n]"},"enhanced_diffs_count":{"kind":"number","value":1,"string":"1"},"diff_count":{"kind":"number","value":5,"string":"5"}}},{"rowIdx":13,"cells":{"commit_sha":{"kind":"string","value":"26132fb65137f90d5223bf5bddc0c7a296577aec"},"modifications":{"kind":"list like","value":[{"name":"spring-projects$greenhouse","new_args":"","new_implementation":null,"new_return_type":"Date","new_signature":"Date getEndDate()","old_args":"","old_implementation":null,"old_return_type":"Date","old_signature":"Date getEndTime()"},{"name":"spring-projects$greenhouse","new_args":"","new_implementation":null,"new_return_type":"Date","new_signature":"Date getStartDate()","old_args":"","old_implementation":null,"old_return_type":"Date","old_signature":"Date getStartTime()"},{"name":"spring-projects$greenhouse","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String getDescription()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String getSummary()"},{"name":"spring-projects$greenhouse","new_args":"Model model","new_implementation":"model.addAttribute(eventRepository.findUpcomingEvents());\n\t\treturn \"events/list\";","new_return_type":"String","new_signature":"String upcomingEventsView(Model model)","old_args":"Model model","old_implementation":"model.addAttribute(eventsService.findEventsAfter(new Date()));\n\t\treturn \"events/list\";\n\t@RequestMapping(value=\"/{eventId","old_return_type":"String","old_signature":"String listEvents(Model model)"},{"name":"spring-projects$greenhouse","new_args":"Date endDate","new_implementation":null,"new_return_type":"void","new_signature":"void setEndDate(Date endDate)","old_args":"Date endTime","old_implementation":null,"old_return_type":"void","old_signature":"void setEndTime(Date endTime)"},{"name":"spring-projects$greenhouse","new_args":"Date startDate","new_implementation":null,"new_return_type":"void","new_signature":"void setStartDate(Date startDate)","old_args":"Date startTime","old_implementation":null,"old_return_type":"void","old_signature":"void setStartTime(Date startTime)"}],"string":"[\n {\n \"name\": \"spring-projects$greenhouse\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Date\",\n \"new_signature\": \"Date getEndDate()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Date\",\n \"old_signature\": \"Date getEndTime()\"\n },\n {\n \"name\": \"spring-projects$greenhouse\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Date\",\n \"new_signature\": \"Date getStartDate()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Date\",\n \"old_signature\": \"Date getStartTime()\"\n },\n {\n \"name\": \"spring-projects$greenhouse\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String getDescription()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String getSummary()\"\n },\n {\n \"name\": \"spring-projects$greenhouse\",\n \"new_args\": \"Model model\",\n \"new_implementation\": \"model.addAttribute(eventRepository.findUpcomingEvents());\\n\\t\\treturn \\\"events/list\\\";\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String upcomingEventsView(Model model)\",\n \"old_args\": \"Model model\",\n \"old_implementation\": \"model.addAttribute(eventsService.findEventsAfter(new Date()));\\n\\t\\treturn \\\"events/list\\\";\\n\\t@RequestMapping(value=\\\"/{eventId\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String listEvents(Model model)\"\n },\n {\n \"name\": \"spring-projects$greenhouse\",\n \"new_args\": \"Date endDate\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setEndDate(Date endDate)\",\n \"old_args\": \"Date endTime\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setEndTime(Date endTime)\"\n },\n {\n \"name\": \"spring-projects$greenhouse\",\n \"new_args\": \"Date startDate\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setStartDate(Date startDate)\",\n \"old_args\": \"Date startTime\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setStartTime(Date startTime)\"\n }\n]"},"files":{"kind":"list like","value":[{"additions":26,"blob_url":"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEvent.java","changes":71,"contents_url":"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEvent.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec","deletions":45,"filename":"src/main/java/com/springsource/greenhouse/events/Event.java","new_code":"\tprivate Long id;\n\tprivate Date startDate;\n\tprivate Date endDate;\n\tprivate String location;\n\tprivate String description;\n\t\n\tpublic Long getId() {\n\t\treturn id;\n\tpublic void setId(Long id) {\n\t\n\tpublic Date getStartDate() {\n\t\treturn startDate;\n\tpublic void setStartDate(Date startDate) {\n\t\tthis.startDate = startDate;\n\tpublic Date getEndDate() {\n\t\treturn endDate;\n\tpublic void setEndDate(Date endDate) {\n\t\tthis.endDate = endDate;\n\tpublic String getDescription() {\n\t\treturn this.description;\n\t}\n\n\tpublic void setDescription(String description) {\n\t\tthis.description = description;\n\t}\n}","new_methods":[{"arguments":[],"filename":"src/main/java/com/springsource/greenhouse/events/Event.java","implementation":"return id;\n\tpublic void setId(Long id) {\n\t\n\tpublic Date getStartDate() {\n\t\treturn startDate;\n\tpublic void setStartDate(Date startDate) {\n\t\tthis.startDate = startDate;\n\tpublic Date getEndDate() {\n\t\treturn endDate;\n\tpublic void setEndDate(Date endDate) {\n\t\tthis.endDate = endDate;\n\tpublic String getDescription() {\n\t\treturn this.description;","signature":"Long getId()"},{"arguments":["String description"],"filename":"src/main/java/com/springsource/greenhouse/events/Event.java","implementation":"this.description = description;","signature":"void setDescription(String description)"}],"old_code":"\tprivate long id;\n\tprivate String friendlyId;\n\t\n\tprivate String location;\n\n\tprivate String description;\n\n\tprivate Date startTime;\n\tprivate Date endTime;\n\tprivate String hashtag;\n\tpublic long getId() {\n\t\treturn this.id;\n\tpublic void setId(long id) {\n\n\tpublic String getDescription() {\n\t\treturn this.description;\n\t}\n\n\tpublic void setDescription(String description) {\n\t\tthis.description = description;\n\t}\n\n\tpublic Date getStartTime() {\n\t\treturn this.startTime;\n\t}\n\n\tpublic void setStartTime(Date startTime) {\n\t\tthis.startTime = startTime;\n\t}\n\n\tpublic Date getEndTime() {\n\t\treturn this.endTime;\n\tpublic void setEndTime(Date endTime) {\n\t\tthis.endTime = endTime;\n\tpublic String getHashtag() {\n\t\treturn this.hashtag;\n\tpublic void setHashtag(String hashtag) {\n\t\tthis.hashtag = hashtag;\n\tpublic void setFriendlyId(String friendlyId) {\n\t this.friendlyId = friendlyId;\n }\n\tpublic String getFriendlyId() {\n\t return friendlyId;\n }\n}","old_methods":[{"arguments":[],"filename":"src/main/java/com/springsource/greenhouse/events/Event.java","implementation":"return this.id;\n\tpublic void setId(long id) {\n\n\tpublic String getDescription() {\n\t\treturn this.description;","signature":"long getId()"},{"arguments":["String description"],"filename":"src/main/java/com/springsource/greenhouse/events/Event.java","implementation":"this.description = description;","signature":"void setDescription(String description)"},{"arguments":[],"filename":"src/main/java/com/springsource/greenhouse/events/Event.java","implementation":"return this.startTime;","signature":"Date getStartTime()"},{"arguments":["Date startTime"],"filename":"src/main/java/com/springsource/greenhouse/events/Event.java","implementation":"this.startTime = startTime;","signature":"void setStartTime(Date startTime)"},{"arguments":[],"filename":"src/main/java/com/springsource/greenhouse/events/Event.java","implementation":"return this.endTime;\n\tpublic void setEndTime(Date endTime) {\n\t\tthis.endTime = endTime;\n\tpublic String getHashtag() {\n\t\treturn this.hashtag;\n\tpublic void setHashtag(String hashtag) {\n\t\tthis.hashtag = hashtag;\n\tpublic void setFriendlyId(String friendlyId) {\n\t this.friendlyId = friendlyId;","signature":"Date getEndTime()"},{"arguments":[],"filename":"src/main/java/com/springsource/greenhouse/events/Event.java","implementation":"return friendlyId;","signature":"String getFriendlyId()"}],"patch":"@@ -4,27 +4,23 @@\n \n public class Event {\n \n-\tprivate long id;\n+\tprivate Long id;\n \n-\tprivate String friendlyId;\n-\t\n \tprivate String title;\n \n-\tprivate String location;\n-\n-\tprivate String description;\n-\n-\tprivate Date startTime;\n+\tprivate Date startDate;\n \n-\tprivate Date endTime;\n+\tprivate Date endDate;\n \n-\tprivate String hashtag;\n+\tprivate String location;\n \n-\tpublic long getId() {\n-\t\treturn this.id;\n+\tprivate String description;\n+\t\n+\tpublic Long getId() {\n+\t\treturn id;\n \t}\n \n-\tpublic void setId(long id) {\n+\tpublic void setId(Long id) {\n \t\tthis.id = id;\n \t}\n \n@@ -35,37 +31,21 @@ public String getTitle() {\n \tpublic void setTitle(String title) {\n \t\tthis.title = title;\n \t}\n-\n-\tpublic String getDescription() {\n-\t\treturn this.description;\n-\t}\n-\n-\tpublic void setDescription(String description) {\n-\t\tthis.description = description;\n-\t}\n-\n-\tpublic Date getStartTime() {\n-\t\treturn this.startTime;\n-\t}\n-\n-\tpublic void setStartTime(Date startTime) {\n-\t\tthis.startTime = startTime;\n-\t}\n-\n-\tpublic Date getEndTime() {\n-\t\treturn this.endTime;\n+\t\n+\tpublic Date getStartDate() {\n+\t\treturn startDate;\n \t}\n \n-\tpublic void setEndTime(Date endTime) {\n-\t\tthis.endTime = endTime;\n+\tpublic void setStartDate(Date startDate) {\n+\t\tthis.startDate = startDate;\n \t}\n \n-\tpublic String getHashtag() {\n-\t\treturn this.hashtag;\n+\tpublic Date getEndDate() {\n+\t\treturn endDate;\n \t}\n \n-\tpublic void setHashtag(String hashtag) {\n-\t\tthis.hashtag = hashtag;\n+\tpublic void setEndDate(Date endDate) {\n+\t\tthis.endDate = endDate;\n \t}\n \n \tpublic void setLocation(String location) {\n@@ -76,11 +56,12 @@ public String getLocation() {\n \t\treturn location;\n \t}\n \n-\tpublic void setFriendlyId(String friendlyId) {\n-\t this.friendlyId = friendlyId;\n- }\n+\tpublic String getDescription() {\n+\t\treturn this.description;\n+\t}\n+\n+\tpublic void setDescription(String description) {\n+\t\tthis.description = description;\n+\t}\n \n-\tpublic String getFriendlyId() {\n-\t return friendlyId;\n- }\n-}\n+}\n\\ No newline at end of file","raw_url":"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEvent.java","sha":"a29c0c77856304cf6c4c74575018c7ca86677cd8","status":"modified"},{"additions":23,"blob_url":"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventSession.java","changes":56,"contents_url":"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventSession.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec","deletions":33,"filename":"src/main/java/com/springsource/greenhouse/events/EventSession.java","new_code":"import java.util.Collections;\nimport java.util.Set;\n\tprivate Short code;\n\tprivate String title;\n\tprivate String description;\n\tprivate Set leaders;\n\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, EventSessionLeader leader) {\n\t\tthis(code, title, startTime, endTime, description, Collections.singleton(leader));\n\t\t\n\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, Set leaders) {\n\t\tthis.code = code;\n\t\tthis.description = description;\n\n\tpublic Short getCode() {\n\t\treturn code;\n\tpublic String getTitle() {\n\t\treturn title;\n\tpublic String getDescription() {\n\t\treturn description;\n\tpublic Set getLeaders() {\n\t\treturn leaders;\n\n}","new_methods":[{"arguments":["Short code"," String title"," Date startTime"," Date endTime"," String description"," EventSessionLeader leader"],"filename":"src/main/java/com/springsource/greenhouse/events/EventSession.java","implementation":"this(code, title, startTime, endTime, description, Collections.singleton(leader));\n\t\t\n\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, Set leaders) {\n\t\tthis.code = code;\n\t\tthis.description = description;\n\n\tpublic Short getCode() {\n\t\treturn code;\n\tpublic String getTitle() {\n\t\treturn title;\n\tpublic String getDescription() {\n\t\treturn description;\n\tpublic Set getLeaders() {\n\t\treturn leaders;","signature":"public EventSession(Short code, String title, Date startTime, Date endTime, String description, EventSessionLeader leader)"}],"old_code":"import java.util.ArrayList;\nimport java.util.List;\n\tprivate String title;\n\tprivate String summary;\n\tprivate List leaders;\n\tprivate String hashtag;\n\tpublic EventSession(String title, String summary, Date startTime,\n\t\t\tDate endTime, SessionLeader leader, String hashtag) {\n\t\tsuper();\n\t\tthis.title = title;\n\t\tthis.summary = summary;\n\t\tthis.startTime = startTime;\n\t\tthis.endTime = endTime;\n\t\t\n\t\tthis.leaders = new ArrayList();\n\t\tthis.leaders.add(leader);\n\t\tthis.hashtag = hashtag;\n\n\tpublic EventSession(String title, String summary, Date startTime,\n\t\t\tDate endTime, List leaders, String hashtag) {\n\t\tsuper();\n\t\tthis.summary = summary;\n\t\tthis.hashtag = hashtag;\n\t\n\tpublic String getTitle() {\n\t\treturn title;\n\tpublic String getSummary() {\n\t\treturn summary;\n\tpublic List getLeaders() {\n\t\treturn leaders;\n\tpublic String getHashtag() {\n\t\treturn hashtag;\n}","old_methods":[{"arguments":["String title"," String summary"," Date startTime","\n\t\t\tDate endTime"," SessionLeader leader"," String hashtag"],"filename":"src/main/java/com/springsource/greenhouse/events/EventSession.java","implementation":"super();\n\t\tthis.title = title;\n\t\tthis.summary = summary;\n\t\tthis.startTime = startTime;\n\t\tthis.endTime = endTime;\n\t\t\n\t\tthis.leaders = new ArrayList();\n\t\tthis.leaders.add(leader);\n\t\tthis.hashtag = hashtag;\n\n\tpublic EventSession(String title, String summary, Date startTime,\n\t\t\tDate endTime, List leaders, String hashtag) {\n\t\tsuper();\n\t\tthis.summary = summary;\n\t\tthis.hashtag = hashtag;\n\t\n\tpublic String getTitle() {\n\t\treturn title;\n\tpublic String getSummary() {\n\t\treturn summary;\n\tpublic List getLeaders() {\n\t\treturn leaders;\n\tpublic String getHashtag() {\n\t\treturn hashtag;","signature":"public EventSession(String title, String summary, Date startTime,\n\t\t\tDate endTime, SessionLeader leader, String hashtag)"}],"patch":"@@ -1,53 +1,42 @@\n package com.springsource.greenhouse.events;\n \n-import java.util.ArrayList;\n+import java.util.Collections;\n import java.util.Date;\n-import java.util.List;\n+import java.util.Set;\n \n public class EventSession {\n \t\n-\tprivate String title;\n+\tprivate Short code;\n \t\n-\tprivate String summary;\n+\tprivate String title;\n \t\n \tprivate Date startTime;\n \t\n \tprivate Date endTime;\n \n-\tprivate List leaders;\n+\tprivate String description;\n \t\n-\tprivate String hashtag;\n+\tprivate Set leaders;\n \n-\tpublic EventSession(String title, String summary, Date startTime,\n-\t\t\tDate endTime, SessionLeader leader, String hashtag) {\n-\t\tsuper();\n-\t\tthis.title = title;\n-\t\tthis.summary = summary;\n-\t\tthis.startTime = startTime;\n-\t\tthis.endTime = endTime;\n-\t\t\n-\t\tthis.leaders = new ArrayList();\n-\t\tthis.leaders.add(leader);\n-\t\tthis.hashtag = hashtag;\n+\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, EventSessionLeader leader) {\n+\t\tthis(code, title, startTime, endTime, description, Collections.singleton(leader));\n \t}\n-\n-\tpublic EventSession(String title, String summary, Date startTime,\n-\t\t\tDate endTime, List leaders, String hashtag) {\n-\t\tsuper();\n+\t\t\n+\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, Set leaders) {\n+\t\tthis.code = code;\n \t\tthis.title = title;\n-\t\tthis.summary = summary;\n \t\tthis.startTime = startTime;\n \t\tthis.endTime = endTime;\n+\t\tthis.description = description;\n \t\tthis.leaders = leaders;\n-\t\tthis.hashtag = hashtag;\n \t}\n-\t\n-\tpublic String getTitle() {\n-\t\treturn title;\n+\n+\tpublic Short getCode() {\n+\t\treturn code;\n \t}\n \n-\tpublic String getSummary() {\n-\t\treturn summary;\n+\tpublic String getTitle() {\n+\t\treturn title;\n \t}\n \n \tpublic Date getStartTime() {\n@@ -58,11 +47,12 @@ public Date getEndTime() {\n \t\treturn endTime;\n \t}\n \n-\tpublic List getLeaders() {\n-\t\treturn leaders;\n+\tpublic String getDescription() {\n+\t\treturn description;\n \t}\n \n-\tpublic String getHashtag() {\n-\t\treturn hashtag;\n+\tpublic Set getLeaders() {\n+\t\treturn leaders;\n \t}\n-}\n+\n+}\n\\ No newline at end of file","raw_url":"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventSession.java","sha":"8ad75fa5655b873084ece0f8f8ccbde036849949","status":"modified"},{"additions":36,"blob_url":"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventsController.java","changes":143,"contents_url":"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventsController.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec","deletions":107,"filename":"src/main/java/com/springsource/greenhouse/events/EventsController.java","new_code":"import org.springframework.security.oauth.extras.OAuthAccessToken;\n\tprivate EventRepository eventRepository;\n\tprivate TwitterOperations twitter;\n\t\t\n\tpublic EventsController(EventRepository eventRepository, TwitterOperations twitter) {\n\t\tthis.eventRepository = eventRepository;\n\t// for web service (JSON) clients\n\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=application/json\") \n\tpublic @ResponseBody List upcomingEvents() {\n\t\treturn eventRepository.findUpcomingEvents();\n\t@RequestMapping(value=\"/{id}/tweets\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n\tpublic @ResponseBody SearchResults tweets(@PathVariable Long id, @RequestParam(defaultValue=\"1\") Integer page, @RequestParam(defaultValue=\"10\") Integer pageSize) {\n\t\treturn twitter.search(eventRepository.getEventSearchString(id), page, pageSize);\n\t@RequestMapping(value=\"/{id}/tweets\", method=RequestMethod.POST)\n\tpublic @ResponseBody void postTweet(Long eventId, @RequestParam String status, @OAuthAccessToken(\"twitter\") OAuthConsumerToken accessToken) {\n\t\ttwitter.updateStatus(accessToken, status);\n\t@RequestMapping(value=\"/{id}/sessions/today\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n\tpublic @ResponseBody List sessionsToday(@PathVariable Long id) {\n\t\treturn eventRepository.findTodaysSessions(id);\n\t}\n\t@RequestMapping(value=\"/{id}/sessions/{code}/tweets\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n\tpublic @ResponseBody SearchResults sessionTweets(@PathVariable Long id, Short code, @RequestParam(defaultValue=\"1\") Integer page, @RequestParam(defaultValue=\"10\") Integer pageSize) {\n\t\treturn twitter.search(eventRepository.getEventSessionSearchString(id, code), page, pageSize);\n\t}\n\t@RequestMapping(value=\"/{id}/sessions/{code}/tweets\", method=RequestMethod.POST)\n\tpublic @ResponseBody void postSessionTweet(Long id, Short code, @RequestParam String status, @OAuthAccessToken(\"twitter\") OAuthConsumerToken accessToken) {\n\t\ttwitter.updateStatus(accessToken, status);\n\t}\n\t// for web browser (HTML) clients\n\t\n\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=text/html\")\n\tpublic String upcomingEventsView(Model model) {\n\t\tmodel.addAttribute(eventRepository.findUpcomingEvents());\n\t\treturn \"events/list\";\n\t\n}","new_methods":[{"arguments":["EventRepository eventRepository"," TwitterOperations twitter"],"filename":"src/main/java/com/springsource/greenhouse/events/EventsController.java","implementation":"this.eventRepository = eventRepository;\n\t// for web service (JSON) clients\n\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=application/json\") \n\tpublic @ResponseBody List upcomingEvents() {\n\t\treturn eventRepository.findUpcomingEvents();\n\t@RequestMapping(value=\"/{id","signature":"public EventsController(EventRepository eventRepository, TwitterOperations twitter)"},{"arguments":["Model model"],"filename":"src/main/java/com/springsource/greenhouse/events/EventsController.java","implementation":"model.addAttribute(eventRepository.findUpcomingEvents());\n\t\treturn \"events/list\";","signature":"String upcomingEventsView(Model model)"}],"old_code":"import java.util.ArrayList;\nimport java.util.Date;\nimport org.joda.time.DateTime;\nimport org.slf4j.Logger;\nimport org.slf4j.LoggerFactory;\n\tprivate EventsService eventsService;\n\tprivate TwitterOperations twitter;\n\tprivate final Logger logger = LoggerFactory.getLogger(getClass());\n\tpublic EventsController(EventsService eventsService, TwitterOperations twitter) {\n\t\tthis.eventsService = eventsService;\n\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=application/json\") \n\tpublic @ResponseBody List eventsData() {\n\t\treturn eventsService.findEventsAfter(new Date());\n\t}\n\t@RequestMapping(method=RequestMethod.GET)\n\tpublic String listEvents(Model model) {\n\t\tmodel.addAttribute(eventsService.findEventsAfter(new Date()));\n\t\treturn \"events/list\";\n\t@RequestMapping(value=\"/{eventId}\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n\tpublic @ResponseBody Event eventData(@PathVariable long eventId) {\n\t\treturn eventsService.findEventById(eventId);\n\t@RequestMapping(value=\"/{eventName}\", method=RequestMethod.GET)\n\tpublic String viewEvent(OAuthConsumerToken accessToken, @PathVariable String eventName, Model model) {\n\t\tEvent event = eventsService.findEventByPublicId(eventName);\n\t\tmodel.addAttribute(event);\n\t\tmodel.addAttribute(twitter.search(accessToken, event.getHashtag(), 1, 10));\n\t\treturn \"events/view\";\n\t\n\t@RequestMapping(value=\"/{eventId}/tweets\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n\tpublic @ResponseBody SearchResults listEventTweets(OAuthConsumerToken accessToken, @PathVariable long eventId, \n\t\t\t@RequestParam(defaultValue=\"1\") int page, @RequestParam(defaultValue=\"10\") int perPage) {\n\t\tEvent event = eventsService.findEventById(eventId);\n\t\treturn twitter.search(accessToken, event.getHashtag(), page, perPage);\n\t}\n\t\n\t// This method is stubbed out to test posting a twitter status\n\t@RequestMapping(value=\"/tweet\", method=RequestMethod.POST)//, headers=\"Accept=application/json\")\n\tpublic @ResponseBody String postTweet(OAuthConsumerToken accessToken, @RequestParam String status) {\n\t\tlogger.info(\"twitter update: \" + status);\n\t\t\n\t\treturn \"hello\";\n\t}\n\t\t\n\t// This method should return all sessions for the current day\n\t@RequestMapping(value=\"/{eventId}/currentsessions\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n\tpublic @ResponseBody List listCurrentSessions(@PathVariable long eventId) {\n\t\t\n\t\t// This is just a bunch of test session data that updates to the current date so \n\t\t// we can always see upcoming and happening now sessions.\n\t\t\n\t\tList sessions = new ArrayList();\n\t\t\n\t\tDate now = new Date();\n\t\tint year = now.getYear() + 1900;\n\t\tint month = now.getMonth() + 1;\n\t\tint date = now.getDate();\n\t\t\n\t\tDate startTime = new DateTime(year, month, date, 8, 30, 0, 0).toDate();\n\t\tDate endTime = new DateTime(year, month, date, 10, 0, 0, 0).toDate();\n\t\t\n\t\tfor (int i = 0; i < 9; i++)\n\t\t{\n\t\t\tsessions.add(new EventSession(\"Test Session A\" + i, \"Description for Test Session A\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-A\" + i));\n\t\t}\n\n\t\tstartTime = new DateTime(year, month, date, 10, 15, 0, 0).toDate();\n\t\tendTime = new DateTime(year, month, date, 11, 45, 0, 0).toDate();\n\t\t\n\t\tfor (int i = 0; i < 9; i++)\n\t\t{\n\t\t\tList leaders = new ArrayList();\n\t\t\tleaders.add(new SessionLeader(\"Roy\", \"Clarkson\"));\n\t\t\tleaders.add(new SessionLeader(\"Jeremy\", \"Grelle\"));\n\t\t\tsessions.add(new EventSession(\"Test Session B\" + i, \"Description for Test Session B\" + i, startTime, endTime, leaders, \"#SpringOne2GX-B\" + i));\n\t\t}\n\n\t\tstartTime = new DateTime(year, month, date, 12, 45, 0, 0).toDate();\n\t\tendTime = new DateTime(year, month, date, 14, 15, 0, 0).toDate();\n\t\t\n\t\tfor (int i = 0; i < 9; i++)\n\t\t{\n\t\t\tsessions.add(new EventSession(\"Test Session C\" + i, \"Description for Test Session C\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-C\" + i));\n\t\t}\n\t\tstartTime = new DateTime(year, month, date, 14, 45, 0, 0).toDate();\n\t\tendTime = new DateTime(year, month, date, 16, 15, 0, 0).toDate();\n\t\tfor (int i = 0; i < 9; i++)\n\t\t{\n\t\t\tsessions.add(new EventSession(\"Test Session D\" + i, \"Description for Test Session D\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-D\" + i));\n\t\t}\n\t\tstartTime = new DateTime(year, month, date, 16, 30, 0, 0).toDate();\n\t\tendTime = new DateTime(year, month, date, 18, 0, 0, 0).toDate();\n\t\tfor (int i = 0; i < 9; i++)\n\t\t{\n\t\t\tsessions.add(new EventSession(\"Test Session E\" + i, \"Description for Test Session E\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-E\" + i));\n\t\t}\n\t\t\t\t\n//\t\tsessions.add(new EventSession(\"What's new in Spring 3\", \"Come see the latest Spring Framework features!\", new DateTime(2010, 10, 20, 8, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new SessionLeader(\"Juergen\", \"Hoeller\")));\n//\t\tsessions.add(new EventSession(\"What's new in Grails 2\", \"Come see the latest Grails features!\", new DateTime(2010, 10, 20, 8, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new SessionLeader(\"Graeme\", \"Rocher\")));\n//\t\tsessions.add(new EventSession(\"Building Social Ready Webapps\", \"Come learn how to do the social stuff!\", new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 10, 0, 0, 0).toDate(), new SessionLeader(\"Craig\", \"Walls\")));\n//\t\t\n//\t\tList mobileLeaders = new ArrayList();\n//\t\tmobileLeaders.add(new SessionLeader(\"Roy\", \"Clarkson\"));\n//\t\tmobileLeaders.add(new SessionLeader(\"Jeremy\", \"Clarkson\"));\n//\t\tsessions.add(new EventSession(\"Choices in Mobile Application Development\", \"Come learn how to do the mobile stuff!\", new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 10, 0, 0, 0).toDate(), mobileLeaders));\n\t\t\n\t\treturn sessions;\n}","old_methods":[{"arguments":["EventsService eventsService"," TwitterOperations twitter"],"filename":"src/main/java/com/springsource/greenhouse/events/EventsController.java","implementation":"this.eventsService = eventsService;\n\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=application/json\") \n\tpublic @ResponseBody List eventsData() {\n\t\treturn eventsService.findEventsAfter(new Date());","signature":"public EventsController(EventsService eventsService, TwitterOperations twitter)"},{"arguments":["Model model"],"filename":"src/main/java/com/springsource/greenhouse/events/EventsController.java","implementation":"model.addAttribute(eventsService.findEventsAfter(new Date()));\n\t\treturn \"events/list\";\n\t@RequestMapping(value=\"/{eventId","signature":"String listEvents(Model model)"},{"arguments":["@PathVariable long eventId"],"filename":"src/main/java/com/springsource/greenhouse/events/EventsController.java","implementation":"return eventsService.findEventById(eventId);\n\t@RequestMapping(value=\"/{eventName","signature":"Event eventData(@PathVariable long eventId)"},{"arguments":["OAuthConsumerToken accessToken"," @PathVariable String eventName"," Model model"],"filename":"src/main/java/com/springsource/greenhouse/events/EventsController.java","implementation":"Event event = eventsService.findEventByPublicId(eventName);\n\t\tmodel.addAttribute(event);\n\t\tmodel.addAttribute(twitter.search(accessToken, event.getHashtag(), 1, 10));\n\t\treturn \"events/view\";\n\t\n\t@RequestMapping(value=\"/{eventId","signature":"String viewEvent(OAuthConsumerToken accessToken, @PathVariable String eventName, Model model)"},{"arguments":["OAuthConsumerToken accessToken"," @RequestParam String status"],"filename":"src/main/java/com/springsource/greenhouse/events/EventsController.java","implementation":"logger.info(\"twitter update: \" + status);\n\t\t\n\t\treturn \"hello\";","signature":"String postTweet(OAuthConsumerToken accessToken, @RequestParam String status)"}],"patch":"@@ -1,15 +1,11 @@\n package com.springsource.greenhouse.events;\n \n-import java.util.ArrayList;\n-import java.util.Date;\n import java.util.List;\n \n import javax.inject.Inject;\n \n-import org.joda.time.DateTime;\n-import org.slf4j.Logger;\n-import org.slf4j.LoggerFactory;\n import org.springframework.security.oauth.consumer.token.OAuthConsumerToken;\n+import org.springframework.security.oauth.extras.OAuthAccessToken;\n import org.springframework.social.twitter.SearchResults;\n import org.springframework.social.twitter.TwitterOperations;\n import org.springframework.stereotype.Controller;\n@@ -24,121 +20,54 @@\n @RequestMapping(\"/events\")\n public class EventsController {\n \t\n-\tprivate EventsService eventsService;\n-\tprivate TwitterOperations twitter;\n-\tprivate final Logger logger = LoggerFactory.getLogger(getClass());\n+\tprivate EventRepository eventRepository;\n \t\n+\tprivate TwitterOperations twitter;\n+\t\t\n \t@Inject\n-\tpublic EventsController(EventsService eventsService, TwitterOperations twitter) {\n-\t\tthis.eventsService = eventsService;\n+\tpublic EventsController(EventRepository eventRepository, TwitterOperations twitter) {\n+\t\tthis.eventRepository = eventRepository;\n \t\tthis.twitter = twitter;\n \t}\n \t\n-\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=application/json\") \n-\tpublic @ResponseBody List eventsData() {\n-\t\treturn eventsService.findEventsAfter(new Date());\n-\t}\n+\t// for web service (JSON) clients\n \t\n-\t@RequestMapping(method=RequestMethod.GET)\n-\tpublic String listEvents(Model model) {\n-\t\tmodel.addAttribute(eventsService.findEventsAfter(new Date()));\n-\t\treturn \"events/list\";\n+\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=application/json\") \n+\tpublic @ResponseBody List upcomingEvents() {\n+\t\treturn eventRepository.findUpcomingEvents();\n \t}\n \n-\t@RequestMapping(value=\"/{eventId}\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n-\tpublic @ResponseBody Event eventData(@PathVariable long eventId) {\n-\t\treturn eventsService.findEventById(eventId);\n+\t@RequestMapping(value=\"/{id}/tweets\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n+\tpublic @ResponseBody SearchResults tweets(@PathVariable Long id, @RequestParam(defaultValue=\"1\") Integer page, @RequestParam(defaultValue=\"10\") Integer pageSize) {\n+\t\treturn twitter.search(eventRepository.getEventSearchString(id), page, pageSize);\n \t}\n \n-\t@RequestMapping(value=\"/{eventName}\", method=RequestMethod.GET)\n-\tpublic String viewEvent(OAuthConsumerToken accessToken, @PathVariable String eventName, Model model) {\n-\t\tEvent event = eventsService.findEventByPublicId(eventName);\n-\t\tmodel.addAttribute(event);\n-\t\tmodel.addAttribute(twitter.search(accessToken, event.getHashtag(), 1, 10));\n-\t\treturn \"events/view\";\n+\t@RequestMapping(value=\"/{id}/tweets\", method=RequestMethod.POST)\n+\tpublic @ResponseBody void postTweet(Long eventId, @RequestParam String status, @OAuthAccessToken(\"twitter\") OAuthConsumerToken accessToken) {\n+\t\ttwitter.updateStatus(accessToken, status);\n \t}\n-\t\n-\t@RequestMapping(value=\"/{eventId}/tweets\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n-\tpublic @ResponseBody SearchResults listEventTweets(OAuthConsumerToken accessToken, @PathVariable long eventId, \n-\t\t\t@RequestParam(defaultValue=\"1\") int page, @RequestParam(defaultValue=\"10\") int perPage) {\n-\t\tEvent event = eventsService.findEventById(eventId);\n-\t\treturn twitter.search(accessToken, event.getHashtag(), page, perPage);\n-\t}\n-\t\n-\t// This method is stubbed out to test posting a twitter status\n-\t@RequestMapping(value=\"/tweet\", method=RequestMethod.POST)//, headers=\"Accept=application/json\")\n-\tpublic @ResponseBody String postTweet(OAuthConsumerToken accessToken, @RequestParam String status) {\n-\t\tlogger.info(\"twitter update: \" + status);\n-\t\t\n-\t\treturn \"hello\";\n-\t}\n-\t\t\n-\t// This method should return all sessions for the current day\n-\t@RequestMapping(value=\"/{eventId}/currentsessions\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n-\tpublic @ResponseBody List listCurrentSessions(@PathVariable long eventId) {\n-\t\t\n-\t\t// This is just a bunch of test session data that updates to the current date so \n-\t\t// we can always see upcoming and happening now sessions.\n-\t\t\n-\t\tList sessions = new ArrayList();\n-\t\t\n-\t\tDate now = new Date();\n-\t\tint year = now.getYear() + 1900;\n-\t\tint month = now.getMonth() + 1;\n-\t\tint date = now.getDate();\n-\t\t\n-\t\tDate startTime = new DateTime(year, month, date, 8, 30, 0, 0).toDate();\n-\t\tDate endTime = new DateTime(year, month, date, 10, 0, 0, 0).toDate();\n-\t\t\n-\t\tfor (int i = 0; i < 9; i++)\n-\t\t{\n-\t\t\tsessions.add(new EventSession(\"Test Session A\" + i, \"Description for Test Session A\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-A\" + i));\n-\t\t}\n-\n-\t\tstartTime = new DateTime(year, month, date, 10, 15, 0, 0).toDate();\n-\t\tendTime = new DateTime(year, month, date, 11, 45, 0, 0).toDate();\n-\t\t\n-\t\tfor (int i = 0; i < 9; i++)\n-\t\t{\n-\t\t\tList leaders = new ArrayList();\n-\t\t\tleaders.add(new SessionLeader(\"Roy\", \"Clarkson\"));\n-\t\t\tleaders.add(new SessionLeader(\"Jeremy\", \"Grelle\"));\n-\t\t\tsessions.add(new EventSession(\"Test Session B\" + i, \"Description for Test Session B\" + i, startTime, endTime, leaders, \"#SpringOne2GX-B\" + i));\n-\t\t}\n-\n-\t\tstartTime = new DateTime(year, month, date, 12, 45, 0, 0).toDate();\n-\t\tendTime = new DateTime(year, month, date, 14, 15, 0, 0).toDate();\n-\t\t\n-\t\tfor (int i = 0; i < 9; i++)\n-\t\t{\n-\t\t\tsessions.add(new EventSession(\"Test Session C\" + i, \"Description for Test Session C\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-C\" + i));\n-\t\t}\n \n-\t\tstartTime = new DateTime(year, month, date, 14, 45, 0, 0).toDate();\n-\t\tendTime = new DateTime(year, month, date, 16, 15, 0, 0).toDate();\n+\t@RequestMapping(value=\"/{id}/sessions/today\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n+\tpublic @ResponseBody List sessionsToday(@PathVariable Long id) {\n+\t\treturn eventRepository.findTodaysSessions(id);\n+\t}\n \n-\t\tfor (int i = 0; i < 9; i++)\n-\t\t{\n-\t\t\tsessions.add(new EventSession(\"Test Session D\" + i, \"Description for Test Session D\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-D\" + i));\n-\t\t}\n+\t@RequestMapping(value=\"/{id}/sessions/{code}/tweets\", method=RequestMethod.GET, headers=\"Accept=application/json\")\n+\tpublic @ResponseBody SearchResults sessionTweets(@PathVariable Long id, Short code, @RequestParam(defaultValue=\"1\") Integer page, @RequestParam(defaultValue=\"10\") Integer pageSize) {\n+\t\treturn twitter.search(eventRepository.getEventSessionSearchString(id, code), page, pageSize);\n+\t}\n \n-\t\tstartTime = new DateTime(year, month, date, 16, 30, 0, 0).toDate();\n-\t\tendTime = new DateTime(year, month, date, 18, 0, 0, 0).toDate();\n+\t@RequestMapping(value=\"/{id}/sessions/{code}/tweets\", method=RequestMethod.POST)\n+\tpublic @ResponseBody void postSessionTweet(Long id, Short code, @RequestParam String status, @OAuthAccessToken(\"twitter\") OAuthConsumerToken accessToken) {\n+\t\ttwitter.updateStatus(accessToken, status);\n+\t}\n \n-\t\tfor (int i = 0; i < 9; i++)\n-\t\t{\n-\t\t\tsessions.add(new EventSession(\"Test Session E\" + i, \"Description for Test Session E\" + i, startTime, endTime, new SessionLeader(\"Johnny\", \"Speaker\"), \"#SpringOne2GX-E\" + i));\n-\t\t}\n-\t\t\t\t\n-//\t\tsessions.add(new EventSession(\"What's new in Spring 3\", \"Come see the latest Spring Framework features!\", new DateTime(2010, 10, 20, 8, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new SessionLeader(\"Juergen\", \"Hoeller\")));\n-//\t\tsessions.add(new EventSession(\"What's new in Grails 2\", \"Come see the latest Grails features!\", new DateTime(2010, 10, 20, 8, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new SessionLeader(\"Graeme\", \"Rocher\")));\n-//\t\tsessions.add(new EventSession(\"Building Social Ready Webapps\", \"Come learn how to do the social stuff!\", new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 10, 0, 0, 0).toDate(), new SessionLeader(\"Craig\", \"Walls\")));\n-//\t\t\n-//\t\tList mobileLeaders = new ArrayList();\n-//\t\tmobileLeaders.add(new SessionLeader(\"Roy\", \"Clarkson\"));\n-//\t\tmobileLeaders.add(new SessionLeader(\"Jeremy\", \"Clarkson\"));\n-//\t\tsessions.add(new EventSession(\"Choices in Mobile Application Development\", \"Come learn how to do the mobile stuff!\", new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 10, 0, 0, 0).toDate(), mobileLeaders));\n-\t\t\n-\t\treturn sessions;\n+\t// for web browser (HTML) clients\n+\t\n+\t@RequestMapping(method=RequestMethod.GET, headers=\"Accept=text/html\")\n+\tpublic String upcomingEventsView(Model model) {\n+\t\tmodel.addAttribute(eventRepository.findUpcomingEvents());\n+\t\treturn \"events/list\";\n \t}\n-}\n+\t\n+}\n\\ No newline at end of file","raw_url":"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventsController.java","sha":"91853c18f521554e3803f165de7c3cd6e37904b3","status":"modified"},{"additions":2,"blob_url":"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersController.java","changes":4,"contents_url":"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersController.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec","deletions":2,"filename":"src/main/java/com/springsource/greenhouse/members/MembersController.java","new_code":"\tprivate MemberRepository membersService;\n\tpublic MembersController(MemberRepository membersService) {","new_methods":[],"old_code":"\tprivate MembersService membersService;\n\tpublic MembersController(MembersService membersService) {","old_methods":[],"patch":"@@ -14,10 +14,10 @@\n @RequestMapping(\"/members/*\")\n public class MembersController {\n \n-\tprivate MembersService membersService;\n+\tprivate MemberRepository membersService;\n \t\n \t@Inject\n-\tpublic MembersController(MembersService membersService) {\n+\tpublic MembersController(MemberRepository membersService) {\n \t\tthis.membersService = membersService;\n \t}\n ","raw_url":"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersController.java","sha":"090a76e9c4bd34b588a1a02e20f57b5dad344a86","status":"modified"},{"additions":7,"blob_url":"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterOperations.java","changes":7,"contents_url":"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterOperations.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec","deletions":0,"filename":"src/main/java/org/springframework/social/twitter/TwitterOperations.java","new_code":"\t\n\t\n\n\tSearchResults search(String query, int page, int pageSize);\n\n\t\n\t","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -7,9 +7,16 @@\n public interface TwitterOperations {\n \n \tString getScreenName(OAuthConsumerToken accessToken);\n+\t\n \tList getFriends(OAuthConsumerToken accessToken, String screenName);\n+\t\n \tvoid updateStatus(OAuthConsumerToken accessToken, String message);\n+\n+\tSearchResults search(String query, int page, int pageSize);\n+\n \tSearchResults search(OAuthConsumerToken accessToken, String query);\n+\t\n \tSearchResults search(OAuthConsumerToken accessToken, String query, int page, int resultsPerPage);\n+\t\n \tSearchResults search(OAuthConsumerToken accessToken, String query, int page, int resultsPerPage, int sinceId, int maxId);\n }\n\\ No newline at end of file","raw_url":"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterOperations.java","sha":"5f2d89b59bde98fd1e4e9db6e0372c1768738f07","status":"modified"},{"additions":4,"blob_url":"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterService.java","changes":4,"contents_url":"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterService.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec","deletions":0,"filename":"src/main/java/org/springframework/social/twitter/TwitterService.java","new_code":"\tpublic SearchResults search(String query, int page, int resultsPerPage) {\n\t\treturn search(null, query, page, resultsPerPage, 0, 0);\n\t}\n\t","new_methods":[{"arguments":["String query"," int page"," int resultsPerPage"],"filename":"src/main/java/org/springframework/social/twitter/TwitterService.java","implementation":"return search(null, query, page, resultsPerPage, 0, 0);","signature":"SearchResults search(String query, int page, int resultsPerPage)"}],"old_code":"","old_methods":[],"patch":"@@ -70,6 +70,10 @@ public SearchResults search(OAuthConsumerToken accessToken, String query) {\n \t\treturn search(accessToken, query, 1, DEFAULT_RESULTS_PER_PAGE, 0, 0);\n \t}\n \n+\tpublic SearchResults search(String query, int page, int resultsPerPage) {\n+\t\treturn search(null, query, page, resultsPerPage, 0, 0);\n+\t}\n+\t\n \tpublic SearchResults search(OAuthConsumerToken accessToken, String query, int page, int resultsPerPage) {\n \t\treturn search(accessToken, query, page, resultsPerPage, 0, 0);\n \t}","raw_url":"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterService.java","sha":"160f20996255494d2a4b11398040e06c8736bf27","status":"modified"},{"additions":27,"blob_url":"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fdata.sql","changes":36,"contents_url":"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fdata.sql?ref=26132fb65137f90d5223bf5bddc0c7a296577aec","deletions":9,"filename":"src/main/webapp/WEB-INF/database/data.sql","new_code":"insert into Member (firstName, lastName, email, password, username) values ('Jeremy', 'Grelle', 'jgrelle@vmware.com', 'churchkeys', 'jgrelle');\ninsert into MemberGroup (name, description, profileKey, searchString, leader) values ('SpringOne2gx', 'The premier event for Spring technologies', 'springone2gx', '#springone2gx', 1);\ninsert into Event (title, startDate, endDate, location, description, memberGroup) values ('SpringOne/2GX', '2010-10-19', '2010-10-22', 'SpringOne 2GX is a one-of-a-kind conference for application developers, solution architects, web operations and IT teams who develop, deploy and manage business applications.', 'Chicago, IL', 1);\ninsert into EventTrack (name, description, chair, event) values ('Essential Spring', 'Spring techniques and technologies applicable to most classes of applications', 2, 1);\ninsert into EventTrack (name, description, chair, event) values ('Web Application Development', 'What you need to know to build rich web applications', 1, 1);\ninsert into EventSession (code, title, startTime, endTime, description, event, track) values (201, \n\t'Mastering MVC 3', '2010-10-20 12:45:00', '2010-10-20 14:15:00',\n\t'A deep-dive into the latest capabilities of Spring MVC, Spring%27s REST-ful web application development platform.', 1, 2);\ninsert into EventSessionLeader (session, leader) values (201, 1);\n\ninsert into EventSession (code, title, startTime, endTime, description, event, track) values (202, \n\t'Inside Web Flow 3 Development', '2010-10-20 14:45:00', '2010-10-20 16:15:00',\n\t'A look inside the development of Spring Web Flow 3, the next-generation version of Spring%27s stateful controller framework for orchestrating multi-step user dialogs.', 1, 2);\ninsert into EventSessionLeader (session, leader) values (202, 1);\n\ninsert into EventSession (code, title, startTime, endTime, description, event, track) values (203, \n\t'Developing Social-Ready Web Applications', '2010-10-21 12:45:00', '2010-10-21 14:15:00',\n\t'Businesses are increasingly recognizing the value of connecting with their customers on a more personal level. Companies can utilize social networking to transition from \"Big Faceless Corporation\" to \"Friend\" by taking their wares to the online communities where their customers are. In this age of social media, those communities are found at social network sites such as Facebook, Twitter, and LinkedIn. In this session, you%27ll learn how to build Spring-based applications that interact with the various social networks. We%27ll talk about new features in the Spring portfolio to support integration with social networks as well as how to start building social features into your own applications.',\n\t1, 2);\ninsert into EventSessionLeader (session, leader) values (203, 2);\n\t\ninsert into EventSession (code, title, startTime, endTime, description, event, track) values (204, \n\t'Choices in Moble Application Development', '2010-10-21 14:45:00', '2010-10-21 16:15:00',\n\t'With the rising prevalence of advanced mobile platforms such as iPhone, Android, and Web OS, the desire for rich mobile clients as another means of accessing enterprise services is becoming something that can no longer be ignored. In this session, we will explore the current mobile development landscape and discuss what you as a Spring developer can do to support this increasingly important paradigm. We will examine the benefits and tradeoffs of native mobile client development vs. web-based mobile client development, and we will explore some of the emerging cross-platform options such as PhoneGap. We will look at the various strategies for utilizing a Spring back-end with these mobile platforms, such as consumption of RESTful services, authentication and authorization via OAuth, and server-push style messaging.',\n\t1, 2);\ninsert into EventSessionLeader (session, leader) values (204, 3);\ninsert into EventSessionLeader (session, leader) values (204, 4);","new_methods":[],"old_code":"insert into MemberGroup (publicId, name, description, hashtag, leader) values ('SpringOne', 'SpringOne', 'The premier Spring Framework event.', '#springone', 1);\ninsert into Event (publicId, title, description, startTime, endTime, location, memberGroup, hashtag) values ('springone_2gx', 'SpringOne/2GX', \n 'SpringOne 2GX is a one-of-a-kind conference for application developers, solution architects, web operations and IT teams who develop, deploy and manage business applications.', \n '2010-10-19', '2010-10-22', 'Chicago, IL', 1, '#springone2gx');\ninsert into EventTrack (name, description, chair, event) values ('Core Spring', 'The low-down on the core Spring Framework', 1, 1);\ninsert into EventSession (code, title, description, startTime, endTime, speaker, event, track, hashtag) values ('CS1', \n\t'Developing Social-Ready Web Applications', \n\t'Businesses are increasingly recognizing the value of connecting with their customers on a more personal level. Companies can utilize social networking to transition from \"Big Faceless Corporation\" to \"Friend\" by taking their wares to the online communities where their customers are. In this age of social media, those communities are found at social network sites such as Facebook, Twitter, and LinkedIn. In this session, you%27ll learn how to build Spring-based applications that interact with the various social networks. We%27ll talk about new features in the Spring portfolio to support integration with social networks as well as how to start building social features into your own applications.', \n\t'2010-10-20', '2010-10-20', 2, 1, 1, '#s12gxcs1');","old_methods":[],"patch":"@@ -1,22 +1,40 @@\n insert into Member (firstName, lastName, email, password, username) values ('Keith' , 'Donald', 'kdonald@vmware.com', 'melbourne', 'kdonald');\n insert into Member (firstName, lastName, email, password, username) values ('Craig' , 'Walls', 'craig@habuma.com', 'plano', 'habuma');\n insert into Member (firstName, lastName, email, password, username) values ('Roy', 'Clarkson', 'rclarkson@vmware.com', 'atlanta', 'rclarkson');\n+insert into Member (firstName, lastName, email, password, username) values ('Jeremy', 'Grelle', 'jgrelle@vmware.com', 'churchkeys', 'jgrelle');\n \n insert into App (consumerKey, name, description, website, callbackUrl, secret, owner) values ('a08318eb478a1ee31f69a55276f3af64', 'Greenhouse for the iPhone', 'Awesome', 'http://www.springsource.com', 'x-com-springsource-greenhouse://oauth-response', '80e7f8f7ba724aae9103f297e5fb9bdf', 2);\n \n insert into Update (text, updateTimestamp, member) values ('Keith Donald signed up', 1278019179970, 1);\n insert into Update (text, updateTimestamp, member) values ('Craig Walls signed up', 1278017173970, 2);\n insert into Update (text, updateTimestamp, member) values ('Roy Clarkson signed up', 1274015177470, 3);\n \n-insert into MemberGroup (publicId, name, description, hashtag, leader) values ('SpringOne', 'SpringOne', 'The premier Spring Framework event.', '#springone', 1);\n+insert into MemberGroup (name, description, profileKey, searchString, leader) values ('SpringOne2gx', 'The premier event for Spring technologies', 'springone2gx', '#springone2gx', 1);\n \n-insert into Event (publicId, title, description, startTime, endTime, location, memberGroup, hashtag) values ('springone_2gx', 'SpringOne/2GX', \n- 'SpringOne 2GX is a one-of-a-kind conference for application developers, solution architects, web operations and IT teams who develop, deploy and manage business applications.', \n- '2010-10-19', '2010-10-22', 'Chicago, IL', 1, '#springone2gx');\n+insert into Event (title, startDate, endDate, location, description, memberGroup) values ('SpringOne/2GX', '2010-10-19', '2010-10-22', 'SpringOne 2GX is a one-of-a-kind conference for application developers, solution architects, web operations and IT teams who develop, deploy and manage business applications.', 'Chicago, IL', 1);\n \n-insert into EventTrack (name, description, chair, event) values ('Core Spring', 'The low-down on the core Spring Framework', 1, 1);\n+insert into EventTrack (name, description, chair, event) values ('Essential Spring', 'Spring techniques and technologies applicable to most classes of applications', 2, 1);\n+insert into EventTrack (name, description, chair, event) values ('Web Application Development', 'What you need to know to build rich web applications', 1, 1);\n \n-insert into EventSession (code, title, description, startTime, endTime, speaker, event, track, hashtag) values ('CS1', \n-\t'Developing Social-Ready Web Applications', \n-\t'Businesses are increasingly recognizing the value of connecting with their customers on a more personal level. Companies can utilize social networking to transition from \"Big Faceless Corporation\" to \"Friend\" by taking their wares to the online communities where their customers are. In this age of social media, those communities are found at social network sites such as Facebook, Twitter, and LinkedIn. In this session, you%27ll learn how to build Spring-based applications that interact with the various social networks. We%27ll talk about new features in the Spring portfolio to support integration with social networks as well as how to start building social features into your own applications.', \n-\t'2010-10-20', '2010-10-20', 2, 1, 1, '#s12gxcs1');\n+insert into EventSession (code, title, startTime, endTime, description, event, track) values (201, \n+\t'Mastering MVC 3', '2010-10-20 12:45:00', '2010-10-20 14:15:00',\n+\t'A deep-dive into the latest capabilities of Spring MVC, Spring%27s REST-ful web application development platform.', 1, 2);\n+insert into EventSessionLeader (session, leader) values (201, 1);\n+\n+insert into EventSession (code, title, startTime, endTime, description, event, track) values (202, \n+\t'Inside Web Flow 3 Development', '2010-10-20 14:45:00', '2010-10-20 16:15:00',\n+\t'A look inside the development of Spring Web Flow 3, the next-generation version of Spring%27s stateful controller framework for orchestrating multi-step user dialogs.', 1, 2);\n+insert into EventSessionLeader (session, leader) values (202, 1);\n+\n+insert into EventSession (code, title, startTime, endTime, description, event, track) values (203, \n+\t'Developing Social-Ready Web Applications', '2010-10-21 12:45:00', '2010-10-21 14:15:00',\n+\t'Businesses are increasingly recognizing the value of connecting with their customers on a more personal level. Companies can utilize social networking to transition from \"Big Faceless Corporation\" to \"Friend\" by taking their wares to the online communities where their customers are. In this age of social media, those communities are found at social network sites such as Facebook, Twitter, and LinkedIn. In this session, you%27ll learn how to build Spring-based applications that interact with the various social networks. We%27ll talk about new features in the Spring portfolio to support integration with social networks as well as how to start building social features into your own applications.',\n+\t1, 2);\n+insert into EventSessionLeader (session, leader) values (203, 2);\n+\t\n+insert into EventSession (code, title, startTime, endTime, description, event, track) values (204, \n+\t'Choices in Moble Application Development', '2010-10-21 14:45:00', '2010-10-21 16:15:00',\n+\t'With the rising prevalence of advanced mobile platforms such as iPhone, Android, and Web OS, the desire for rich mobile clients as another means of accessing enterprise services is becoming something that can no longer be ignored. In this session, we will explore the current mobile development landscape and discuss what you as a Spring developer can do to support this increasingly important paradigm. We will examine the benefits and tradeoffs of native mobile client development vs. web-based mobile client development, and we will explore some of the emerging cross-platform options such as PhoneGap. We will look at the various strategies for utilizing a Spring back-end with these mobile platforms, such as consumption of RESTful services, authentication and authorization via OAuth, and server-push style messaging.',\n+\t1, 2);\n+insert into EventSessionLeader (session, leader) values (204, 3);\n+insert into EventSessionLeader (session, leader) values (204, 4);","raw_url":"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fdata.sql","sha":"2cb87388858bee61bb303668d7c3531465aa47ed","status":"modified"},{"additions":14,"blob_url":"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fschema-event.sql","changes":27,"contents_url":"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fschema-event.sql?ref=26132fb65137f90d5223bf5bddc0c7a296577aec","deletions":13,"filename":"src/main/webapp/WEB-INF/database/schema-event.sql","new_code":"\t\t\t\t\tprofileKey varchar unique,\t\t\t\t\t\n\t\t\t\t\tsearchString varchar,\n\t\t\t\t\tstartDate date,\n\t\t\t\t\tendDate date,\n\t\t\t\t\tdescription varchar,\ncreate table EventSession (code smallint,\n\t\t\t\t\tdescription varchar,\n\t\t\t\t\tforeign key (track) references EventTrack(id));\n\ncreate table EventSessionLeader (session smallint not null,\n\t\t\t\t\tleader bigint not null,\n\t\t\t\t\tprimary key (session, leader),\n\t\t\t\t\tforeign key (session) references EventSession(code),\n\t\t\t\t\tforeign key (leader) references Member(id));\t","new_methods":[],"old_code":"\t\t\t\t\tpublicId varchar not null,\n\t\t\t\t\thashtag varchar,\n\t\t\t\t\tpublicId varchar not null,\n\t\t\t\t\tdescription varchar,\n\t\t\t\t\tstartTime timestamp,\n\t\t\t\t\tendTime timestamp,\n\t\t\t\t\thashtag varchar,\ncreate table EventSession (code varchar,\n\t\t\t\t\tdescription varchar,\n\t\t\t\t\tspeaker bigint not null,\n\t\t\t\t\thashtag varchar,\n\t\t\t\t\tforeign key (speaker) references Member(id),\n\t\t\t\t\tforeign key (track) references EventTrack(id));","old_methods":[],"patch":"@@ -1,21 +1,19 @@\n create table MemberGroup (id identity,\n-\t\t\t\t\tpublicId varchar not null,\n \t\t\t\t\tname varchar not null,\n \t\t\t\t\tdescription varchar,\n-\t\t\t\t\thashtag varchar,\n+\t\t\t\t\tprofileKey varchar unique,\t\t\t\t\t\n+\t\t\t\t\tsearchString varchar,\n \t\t\t\t\tleader bigint not null,\n \t\t\t\t\tprimary key (id),\n \t\t\t\t\tforeign key (leader) references Member(id));\n \t\t\t\t\t\n create table Event (id identity,\n-\t\t\t\t\tpublicId varchar not null,\n \t\t\t\t\ttitle varchar not null,\n-\t\t\t\t\tdescription varchar,\n-\t\t\t\t\tstartTime timestamp,\n-\t\t\t\t\tendTime timestamp,\n+\t\t\t\t\tstartDate date,\n+\t\t\t\t\tendDate date,\n \t\t\t\t\tlocation varchar,\n+\t\t\t\t\tdescription varchar,\n \t\t\t\t\tmemberGroup bigint not null,\n-\t\t\t\t\thashtag varchar,\n \t\t\t\t\tprimary key (id),\n \t\t\t\t\tforeign key (memberGroup) references MemberGroup(id));\n \n@@ -28,16 +26,19 @@ create table EventTrack (id identity,\n \t\t\t\t\tforeign key (chair) references Member(id),\n \t\t\t\t\tforeign key (event) references Event(id));\n \n-create table EventSession (code varchar,\n+create table EventSession (code smallint,\n \t\t\t\t\ttitle varchar not null,\n-\t\t\t\t\tdescription varchar,\n \t\t\t\t\tstartTime timestamp,\n \t\t\t\t\tendTime timestamp,\n-\t\t\t\t\tspeaker bigint not null,\n+\t\t\t\t\tdescription varchar,\n \t\t\t\t\tevent bigint not null,\n \t\t\t\t\ttrack bigint,\n-\t\t\t\t\thashtag varchar,\n \t\t\t\t\tprimary key (code, event),\n-\t\t\t\t\tforeign key (speaker) references Member(id),\n \t\t\t\t\tforeign key (event) references Event(id),\n-\t\t\t\t\tforeign key (track) references EventTrack(id));\n\\ No newline at end of file\n+\t\t\t\t\tforeign key (track) references EventTrack(id));\n+\n+create table EventSessionLeader (session smallint not null,\n+\t\t\t\t\tleader bigint not null,\n+\t\t\t\t\tprimary key (session, leader),\n+\t\t\t\t\tforeign key (session) references EventSession(code),\n+\t\t\t\t\tforeign key (leader) references Member(id));\t\n\\ No newline at end of file","raw_url":"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fschema-event.sql","sha":"db1f05bbf20aad6ceeae5bf29591f916d7c8b2ab","status":"modified"},{"additions":1,"blob_url":"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Ftest%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersControllerTest.java","changes":2,"contents_url":"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Ftest%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersControllerTest.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec","deletions":1,"filename":"src/test/java/com/springsource/greenhouse/members/MembersControllerTest.java","new_code":" \tMemberRepository membersService = new JdbcMemberRepository(jdbcTemplate);","new_methods":[],"old_code":" \tMembersService membersService = new DefaultMembersService(jdbcTemplate);","old_methods":[],"patch":"@@ -27,7 +27,7 @@ public void setup() {\n \t\t\tnew FileSystemResource(\"src/main/webapp/WEB-INF/database/schema-member.sql\"),\n \t\t\tnew ClassPathResource(\"MembersControllerTest.sql\", getClass()));\n \tjdbcTemplate = new JdbcTemplate(db);\n- \tMembersService membersService = new DefaultMembersService(jdbcTemplate);\n+ \tMemberRepository membersService = new JdbcMemberRepository(jdbcTemplate);\n \tcontroller = new MembersController(membersService);\n }\n ","raw_url":"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Ftest%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersControllerTest.java","sha":"3888305c5d402662e0d78753f131c08e90c46f83","status":"modified"}],"string":"[\n {\n \"additions\": 26,\n \"blob_url\": \"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEvent.java\",\n \"changes\": 71,\n \"contents_url\": \"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEvent.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec\",\n \"deletions\": 45,\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/Event.java\",\n \"new_code\": \"\\tprivate Long id;\\n\\tprivate Date startDate;\\n\\tprivate Date endDate;\\n\\tprivate String location;\\n\\tprivate String description;\\n\\t\\n\\tpublic Long getId() {\\n\\t\\treturn id;\\n\\tpublic void setId(Long id) {\\n\\t\\n\\tpublic Date getStartDate() {\\n\\t\\treturn startDate;\\n\\tpublic void setStartDate(Date startDate) {\\n\\t\\tthis.startDate = startDate;\\n\\tpublic Date getEndDate() {\\n\\t\\treturn endDate;\\n\\tpublic void setEndDate(Date endDate) {\\n\\t\\tthis.endDate = endDate;\\n\\tpublic String getDescription() {\\n\\t\\treturn this.description;\\n\\t}\\n\\n\\tpublic void setDescription(String description) {\\n\\t\\tthis.description = description;\\n\\t}\\n}\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/Event.java\",\n \"implementation\": \"return id;\\n\\tpublic void setId(Long id) {\\n\\t\\n\\tpublic Date getStartDate() {\\n\\t\\treturn startDate;\\n\\tpublic void setStartDate(Date startDate) {\\n\\t\\tthis.startDate = startDate;\\n\\tpublic Date getEndDate() {\\n\\t\\treturn endDate;\\n\\tpublic void setEndDate(Date endDate) {\\n\\t\\tthis.endDate = endDate;\\n\\tpublic String getDescription() {\\n\\t\\treturn this.description;\",\n \"signature\": \"Long getId()\"\n },\n {\n \"arguments\": [\n \"String description\"\n ],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/Event.java\",\n \"implementation\": \"this.description = description;\",\n \"signature\": \"void setDescription(String description)\"\n }\n ],\n \"old_code\": \"\\tprivate long id;\\n\\tprivate String friendlyId;\\n\\t\\n\\tprivate String location;\\n\\n\\tprivate String description;\\n\\n\\tprivate Date startTime;\\n\\tprivate Date endTime;\\n\\tprivate String hashtag;\\n\\tpublic long getId() {\\n\\t\\treturn this.id;\\n\\tpublic void setId(long id) {\\n\\n\\tpublic String getDescription() {\\n\\t\\treturn this.description;\\n\\t}\\n\\n\\tpublic void setDescription(String description) {\\n\\t\\tthis.description = description;\\n\\t}\\n\\n\\tpublic Date getStartTime() {\\n\\t\\treturn this.startTime;\\n\\t}\\n\\n\\tpublic void setStartTime(Date startTime) {\\n\\t\\tthis.startTime = startTime;\\n\\t}\\n\\n\\tpublic Date getEndTime() {\\n\\t\\treturn this.endTime;\\n\\tpublic void setEndTime(Date endTime) {\\n\\t\\tthis.endTime = endTime;\\n\\tpublic String getHashtag() {\\n\\t\\treturn this.hashtag;\\n\\tpublic void setHashtag(String hashtag) {\\n\\t\\tthis.hashtag = hashtag;\\n\\tpublic void setFriendlyId(String friendlyId) {\\n\\t this.friendlyId = friendlyId;\\n }\\n\\tpublic String getFriendlyId() {\\n\\t return friendlyId;\\n }\\n}\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/Event.java\",\n \"implementation\": \"return this.id;\\n\\tpublic void setId(long id) {\\n\\n\\tpublic String getDescription() {\\n\\t\\treturn this.description;\",\n \"signature\": \"long getId()\"\n },\n {\n \"arguments\": [\n \"String description\"\n ],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/Event.java\",\n \"implementation\": \"this.description = description;\",\n \"signature\": \"void setDescription(String description)\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/Event.java\",\n \"implementation\": \"return this.startTime;\",\n \"signature\": \"Date getStartTime()\"\n },\n {\n \"arguments\": [\n \"Date startTime\"\n ],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/Event.java\",\n \"implementation\": \"this.startTime = startTime;\",\n \"signature\": \"void setStartTime(Date startTime)\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/Event.java\",\n \"implementation\": \"return this.endTime;\\n\\tpublic void setEndTime(Date endTime) {\\n\\t\\tthis.endTime = endTime;\\n\\tpublic String getHashtag() {\\n\\t\\treturn this.hashtag;\\n\\tpublic void setHashtag(String hashtag) {\\n\\t\\tthis.hashtag = hashtag;\\n\\tpublic void setFriendlyId(String friendlyId) {\\n\\t this.friendlyId = friendlyId;\",\n \"signature\": \"Date getEndTime()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/Event.java\",\n \"implementation\": \"return friendlyId;\",\n \"signature\": \"String getFriendlyId()\"\n }\n ],\n \"patch\": \"@@ -4,27 +4,23 @@\\n \\n public class Event {\\n \\n-\\tprivate long id;\\n+\\tprivate Long id;\\n \\n-\\tprivate String friendlyId;\\n-\\t\\n \\tprivate String title;\\n \\n-\\tprivate String location;\\n-\\n-\\tprivate String description;\\n-\\n-\\tprivate Date startTime;\\n+\\tprivate Date startDate;\\n \\n-\\tprivate Date endTime;\\n+\\tprivate Date endDate;\\n \\n-\\tprivate String hashtag;\\n+\\tprivate String location;\\n \\n-\\tpublic long getId() {\\n-\\t\\treturn this.id;\\n+\\tprivate String description;\\n+\\t\\n+\\tpublic Long getId() {\\n+\\t\\treturn id;\\n \\t}\\n \\n-\\tpublic void setId(long id) {\\n+\\tpublic void setId(Long id) {\\n \\t\\tthis.id = id;\\n \\t}\\n \\n@@ -35,37 +31,21 @@ public String getTitle() {\\n \\tpublic void setTitle(String title) {\\n \\t\\tthis.title = title;\\n \\t}\\n-\\n-\\tpublic String getDescription() {\\n-\\t\\treturn this.description;\\n-\\t}\\n-\\n-\\tpublic void setDescription(String description) {\\n-\\t\\tthis.description = description;\\n-\\t}\\n-\\n-\\tpublic Date getStartTime() {\\n-\\t\\treturn this.startTime;\\n-\\t}\\n-\\n-\\tpublic void setStartTime(Date startTime) {\\n-\\t\\tthis.startTime = startTime;\\n-\\t}\\n-\\n-\\tpublic Date getEndTime() {\\n-\\t\\treturn this.endTime;\\n+\\t\\n+\\tpublic Date getStartDate() {\\n+\\t\\treturn startDate;\\n \\t}\\n \\n-\\tpublic void setEndTime(Date endTime) {\\n-\\t\\tthis.endTime = endTime;\\n+\\tpublic void setStartDate(Date startDate) {\\n+\\t\\tthis.startDate = startDate;\\n \\t}\\n \\n-\\tpublic String getHashtag() {\\n-\\t\\treturn this.hashtag;\\n+\\tpublic Date getEndDate() {\\n+\\t\\treturn endDate;\\n \\t}\\n \\n-\\tpublic void setHashtag(String hashtag) {\\n-\\t\\tthis.hashtag = hashtag;\\n+\\tpublic void setEndDate(Date endDate) {\\n+\\t\\tthis.endDate = endDate;\\n \\t}\\n \\n \\tpublic void setLocation(String location) {\\n@@ -76,11 +56,12 @@ public String getLocation() {\\n \\t\\treturn location;\\n \\t}\\n \\n-\\tpublic void setFriendlyId(String friendlyId) {\\n-\\t this.friendlyId = friendlyId;\\n- }\\n+\\tpublic String getDescription() {\\n+\\t\\treturn this.description;\\n+\\t}\\n+\\n+\\tpublic void setDescription(String description) {\\n+\\t\\tthis.description = description;\\n+\\t}\\n \\n-\\tpublic String getFriendlyId() {\\n-\\t return friendlyId;\\n- }\\n-}\\n+}\\n\\\\ No newline at end of file\",\n \"raw_url\": \"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEvent.java\",\n \"sha\": \"a29c0c77856304cf6c4c74575018c7ca86677cd8\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 23,\n \"blob_url\": \"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventSession.java\",\n \"changes\": 56,\n \"contents_url\": \"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventSession.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec\",\n \"deletions\": 33,\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/EventSession.java\",\n \"new_code\": \"import java.util.Collections;\\nimport java.util.Set;\\n\\tprivate Short code;\\n\\tprivate String title;\\n\\tprivate String description;\\n\\tprivate Set leaders;\\n\\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, EventSessionLeader leader) {\\n\\t\\tthis(code, title, startTime, endTime, description, Collections.singleton(leader));\\n\\t\\t\\n\\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, Set leaders) {\\n\\t\\tthis.code = code;\\n\\t\\tthis.description = description;\\n\\n\\tpublic Short getCode() {\\n\\t\\treturn code;\\n\\tpublic String getTitle() {\\n\\t\\treturn title;\\n\\tpublic String getDescription() {\\n\\t\\treturn description;\\n\\tpublic Set getLeaders() {\\n\\t\\treturn leaders;\\n\\n}\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"Short code\",\n \" String title\",\n \" Date startTime\",\n \" Date endTime\",\n \" String description\",\n \" EventSessionLeader leader\"\n ],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/EventSession.java\",\n \"implementation\": \"this(code, title, startTime, endTime, description, Collections.singleton(leader));\\n\\t\\t\\n\\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, Set leaders) {\\n\\t\\tthis.code = code;\\n\\t\\tthis.description = description;\\n\\n\\tpublic Short getCode() {\\n\\t\\treturn code;\\n\\tpublic String getTitle() {\\n\\t\\treturn title;\\n\\tpublic String getDescription() {\\n\\t\\treturn description;\\n\\tpublic Set getLeaders() {\\n\\t\\treturn leaders;\",\n \"signature\": \"public EventSession(Short code, String title, Date startTime, Date endTime, String description, EventSessionLeader leader)\"\n }\n ],\n \"old_code\": \"import java.util.ArrayList;\\nimport java.util.List;\\n\\tprivate String title;\\n\\tprivate String summary;\\n\\tprivate List leaders;\\n\\tprivate String hashtag;\\n\\tpublic EventSession(String title, String summary, Date startTime,\\n\\t\\t\\tDate endTime, SessionLeader leader, String hashtag) {\\n\\t\\tsuper();\\n\\t\\tthis.title = title;\\n\\t\\tthis.summary = summary;\\n\\t\\tthis.startTime = startTime;\\n\\t\\tthis.endTime = endTime;\\n\\t\\t\\n\\t\\tthis.leaders = new ArrayList();\\n\\t\\tthis.leaders.add(leader);\\n\\t\\tthis.hashtag = hashtag;\\n\\n\\tpublic EventSession(String title, String summary, Date startTime,\\n\\t\\t\\tDate endTime, List leaders, String hashtag) {\\n\\t\\tsuper();\\n\\t\\tthis.summary = summary;\\n\\t\\tthis.hashtag = hashtag;\\n\\t\\n\\tpublic String getTitle() {\\n\\t\\treturn title;\\n\\tpublic String getSummary() {\\n\\t\\treturn summary;\\n\\tpublic List getLeaders() {\\n\\t\\treturn leaders;\\n\\tpublic String getHashtag() {\\n\\t\\treturn hashtag;\\n}\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"String title\",\n \" String summary\",\n \" Date startTime\",\n \"\\n\\t\\t\\tDate endTime\",\n \" SessionLeader leader\",\n \" String hashtag\"\n ],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/EventSession.java\",\n \"implementation\": \"super();\\n\\t\\tthis.title = title;\\n\\t\\tthis.summary = summary;\\n\\t\\tthis.startTime = startTime;\\n\\t\\tthis.endTime = endTime;\\n\\t\\t\\n\\t\\tthis.leaders = new ArrayList();\\n\\t\\tthis.leaders.add(leader);\\n\\t\\tthis.hashtag = hashtag;\\n\\n\\tpublic EventSession(String title, String summary, Date startTime,\\n\\t\\t\\tDate endTime, List leaders, String hashtag) {\\n\\t\\tsuper();\\n\\t\\tthis.summary = summary;\\n\\t\\tthis.hashtag = hashtag;\\n\\t\\n\\tpublic String getTitle() {\\n\\t\\treturn title;\\n\\tpublic String getSummary() {\\n\\t\\treturn summary;\\n\\tpublic List getLeaders() {\\n\\t\\treturn leaders;\\n\\tpublic String getHashtag() {\\n\\t\\treturn hashtag;\",\n \"signature\": \"public EventSession(String title, String summary, Date startTime,\\n\\t\\t\\tDate endTime, SessionLeader leader, String hashtag)\"\n }\n ],\n \"patch\": \"@@ -1,53 +1,42 @@\\n package com.springsource.greenhouse.events;\\n \\n-import java.util.ArrayList;\\n+import java.util.Collections;\\n import java.util.Date;\\n-import java.util.List;\\n+import java.util.Set;\\n \\n public class EventSession {\\n \\t\\n-\\tprivate String title;\\n+\\tprivate Short code;\\n \\t\\n-\\tprivate String summary;\\n+\\tprivate String title;\\n \\t\\n \\tprivate Date startTime;\\n \\t\\n \\tprivate Date endTime;\\n \\n-\\tprivate List leaders;\\n+\\tprivate String description;\\n \\t\\n-\\tprivate String hashtag;\\n+\\tprivate Set leaders;\\n \\n-\\tpublic EventSession(String title, String summary, Date startTime,\\n-\\t\\t\\tDate endTime, SessionLeader leader, String hashtag) {\\n-\\t\\tsuper();\\n-\\t\\tthis.title = title;\\n-\\t\\tthis.summary = summary;\\n-\\t\\tthis.startTime = startTime;\\n-\\t\\tthis.endTime = endTime;\\n-\\t\\t\\n-\\t\\tthis.leaders = new ArrayList();\\n-\\t\\tthis.leaders.add(leader);\\n-\\t\\tthis.hashtag = hashtag;\\n+\\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, EventSessionLeader leader) {\\n+\\t\\tthis(code, title, startTime, endTime, description, Collections.singleton(leader));\\n \\t}\\n-\\n-\\tpublic EventSession(String title, String summary, Date startTime,\\n-\\t\\t\\tDate endTime, List leaders, String hashtag) {\\n-\\t\\tsuper();\\n+\\t\\t\\n+\\tpublic EventSession(Short code, String title, Date startTime, Date endTime, String description, Set leaders) {\\n+\\t\\tthis.code = code;\\n \\t\\tthis.title = title;\\n-\\t\\tthis.summary = summary;\\n \\t\\tthis.startTime = startTime;\\n \\t\\tthis.endTime = endTime;\\n+\\t\\tthis.description = description;\\n \\t\\tthis.leaders = leaders;\\n-\\t\\tthis.hashtag = hashtag;\\n \\t}\\n-\\t\\n-\\tpublic String getTitle() {\\n-\\t\\treturn title;\\n+\\n+\\tpublic Short getCode() {\\n+\\t\\treturn code;\\n \\t}\\n \\n-\\tpublic String getSummary() {\\n-\\t\\treturn summary;\\n+\\tpublic String getTitle() {\\n+\\t\\treturn title;\\n \\t}\\n \\n \\tpublic Date getStartTime() {\\n@@ -58,11 +47,12 @@ public Date getEndTime() {\\n \\t\\treturn endTime;\\n \\t}\\n \\n-\\tpublic List getLeaders() {\\n-\\t\\treturn leaders;\\n+\\tpublic String getDescription() {\\n+\\t\\treturn description;\\n \\t}\\n \\n-\\tpublic String getHashtag() {\\n-\\t\\treturn hashtag;\\n+\\tpublic Set getLeaders() {\\n+\\t\\treturn leaders;\\n \\t}\\n-}\\n+\\n+}\\n\\\\ No newline at end of file\",\n \"raw_url\": \"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventSession.java\",\n \"sha\": \"8ad75fa5655b873084ece0f8f8ccbde036849949\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 36,\n \"blob_url\": \"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventsController.java\",\n \"changes\": 143,\n \"contents_url\": \"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventsController.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec\",\n \"deletions\": 107,\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/EventsController.java\",\n \"new_code\": \"import org.springframework.security.oauth.extras.OAuthAccessToken;\\n\\tprivate EventRepository eventRepository;\\n\\tprivate TwitterOperations twitter;\\n\\t\\t\\n\\tpublic EventsController(EventRepository eventRepository, TwitterOperations twitter) {\\n\\t\\tthis.eventRepository = eventRepository;\\n\\t// for web service (JSON) clients\\n\\t@RequestMapping(method=RequestMethod.GET, headers=\\\"Accept=application/json\\\") \\n\\tpublic @ResponseBody List upcomingEvents() {\\n\\t\\treturn eventRepository.findUpcomingEvents();\\n\\t@RequestMapping(value=\\\"/{id}/tweets\\\", method=RequestMethod.GET, headers=\\\"Accept=application/json\\\")\\n\\tpublic @ResponseBody SearchResults tweets(@PathVariable Long id, @RequestParam(defaultValue=\\\"1\\\") Integer page, @RequestParam(defaultValue=\\\"10\\\") Integer pageSize) {\\n\\t\\treturn twitter.search(eventRepository.getEventSearchString(id), page, pageSize);\\n\\t@RequestMapping(value=\\\"/{id}/tweets\\\", method=RequestMethod.POST)\\n\\tpublic @ResponseBody void postTweet(Long eventId, @RequestParam String status, @OAuthAccessToken(\\\"twitter\\\") OAuthConsumerToken accessToken) {\\n\\t\\ttwitter.updateStatus(accessToken, status);\\n\\t@RequestMapping(value=\\\"/{id}/sessions/today\\\", method=RequestMethod.GET, headers=\\\"Accept=application/json\\\")\\n\\tpublic @ResponseBody List sessionsToday(@PathVariable Long id) {\\n\\t\\treturn eventRepository.findTodaysSessions(id);\\n\\t}\\n\\t@RequestMapping(value=\\\"/{id}/sessions/{code}/tweets\\\", method=RequestMethod.GET, headers=\\\"Accept=application/json\\\")\\n\\tpublic @ResponseBody SearchResults sessionTweets(@PathVariable Long id, Short code, @RequestParam(defaultValue=\\\"1\\\") Integer page, @RequestParam(defaultValue=\\\"10\\\") Integer pageSize) {\\n\\t\\treturn twitter.search(eventRepository.getEventSessionSearchString(id, code), page, pageSize);\\n\\t}\\n\\t@RequestMapping(value=\\\"/{id}/sessions/{code}/tweets\\\", method=RequestMethod.POST)\\n\\tpublic @ResponseBody void postSessionTweet(Long id, Short code, @RequestParam String status, @OAuthAccessToken(\\\"twitter\\\") OAuthConsumerToken accessToken) {\\n\\t\\ttwitter.updateStatus(accessToken, status);\\n\\t}\\n\\t// for web browser (HTML) clients\\n\\t\\n\\t@RequestMapping(method=RequestMethod.GET, headers=\\\"Accept=text/html\\\")\\n\\tpublic String upcomingEventsView(Model model) {\\n\\t\\tmodel.addAttribute(eventRepository.findUpcomingEvents());\\n\\t\\treturn \\\"events/list\\\";\\n\\t\\n}\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"EventRepository eventRepository\",\n \" TwitterOperations twitter\"\n ],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/EventsController.java\",\n \"implementation\": \"this.eventRepository = eventRepository;\\n\\t// for web service (JSON) clients\\n\\t@RequestMapping(method=RequestMethod.GET, headers=\\\"Accept=application/json\\\") \\n\\tpublic @ResponseBody List upcomingEvents() {\\n\\t\\treturn eventRepository.findUpcomingEvents();\\n\\t@RequestMapping(value=\\\"/{id\",\n \"signature\": \"public EventsController(EventRepository eventRepository, TwitterOperations twitter)\"\n },\n {\n \"arguments\": [\n \"Model model\"\n ],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/EventsController.java\",\n \"implementation\": \"model.addAttribute(eventRepository.findUpcomingEvents());\\n\\t\\treturn \\\"events/list\\\";\",\n \"signature\": \"String upcomingEventsView(Model model)\"\n }\n ],\n \"old_code\": \"import java.util.ArrayList;\\nimport java.util.Date;\\nimport org.joda.time.DateTime;\\nimport org.slf4j.Logger;\\nimport org.slf4j.LoggerFactory;\\n\\tprivate EventsService eventsService;\\n\\tprivate TwitterOperations twitter;\\n\\tprivate final Logger logger = LoggerFactory.getLogger(getClass());\\n\\tpublic EventsController(EventsService eventsService, TwitterOperations twitter) {\\n\\t\\tthis.eventsService = eventsService;\\n\\t@RequestMapping(method=RequestMethod.GET, headers=\\\"Accept=application/json\\\") \\n\\tpublic @ResponseBody List eventsData() {\\n\\t\\treturn eventsService.findEventsAfter(new Date());\\n\\t}\\n\\t@RequestMapping(method=RequestMethod.GET)\\n\\tpublic String listEvents(Model model) {\\n\\t\\tmodel.addAttribute(eventsService.findEventsAfter(new Date()));\\n\\t\\treturn \\\"events/list\\\";\\n\\t@RequestMapping(value=\\\"/{eventId}\\\", method=RequestMethod.GET, headers=\\\"Accept=application/json\\\")\\n\\tpublic @ResponseBody Event eventData(@PathVariable long eventId) {\\n\\t\\treturn eventsService.findEventById(eventId);\\n\\t@RequestMapping(value=\\\"/{eventName}\\\", method=RequestMethod.GET)\\n\\tpublic String viewEvent(OAuthConsumerToken accessToken, @PathVariable String eventName, Model model) {\\n\\t\\tEvent event = eventsService.findEventByPublicId(eventName);\\n\\t\\tmodel.addAttribute(event);\\n\\t\\tmodel.addAttribute(twitter.search(accessToken, event.getHashtag(), 1, 10));\\n\\t\\treturn \\\"events/view\\\";\\n\\t\\n\\t@RequestMapping(value=\\\"/{eventId}/tweets\\\", method=RequestMethod.GET, headers=\\\"Accept=application/json\\\")\\n\\tpublic @ResponseBody SearchResults listEventTweets(OAuthConsumerToken accessToken, @PathVariable long eventId, \\n\\t\\t\\t@RequestParam(defaultValue=\\\"1\\\") int page, @RequestParam(defaultValue=\\\"10\\\") int perPage) {\\n\\t\\tEvent event = eventsService.findEventById(eventId);\\n\\t\\treturn twitter.search(accessToken, event.getHashtag(), page, perPage);\\n\\t}\\n\\t\\n\\t// This method is stubbed out to test posting a twitter status\\n\\t@RequestMapping(value=\\\"/tweet\\\", method=RequestMethod.POST)//, headers=\\\"Accept=application/json\\\")\\n\\tpublic @ResponseBody String postTweet(OAuthConsumerToken accessToken, @RequestParam String status) {\\n\\t\\tlogger.info(\\\"twitter update: \\\" + status);\\n\\t\\t\\n\\t\\treturn \\\"hello\\\";\\n\\t}\\n\\t\\t\\n\\t// This method should return all sessions for the current day\\n\\t@RequestMapping(value=\\\"/{eventId}/currentsessions\\\", method=RequestMethod.GET, headers=\\\"Accept=application/json\\\")\\n\\tpublic @ResponseBody List listCurrentSessions(@PathVariable long eventId) {\\n\\t\\t\\n\\t\\t// This is just a bunch of test session data that updates to the current date so \\n\\t\\t// we can always see upcoming and happening now sessions.\\n\\t\\t\\n\\t\\tList sessions = new ArrayList();\\n\\t\\t\\n\\t\\tDate now = new Date();\\n\\t\\tint year = now.getYear() + 1900;\\n\\t\\tint month = now.getMonth() + 1;\\n\\t\\tint date = now.getDate();\\n\\t\\t\\n\\t\\tDate startTime = new DateTime(year, month, date, 8, 30, 0, 0).toDate();\\n\\t\\tDate endTime = new DateTime(year, month, date, 10, 0, 0, 0).toDate();\\n\\t\\t\\n\\t\\tfor (int i = 0; i < 9; i++)\\n\\t\\t{\\n\\t\\t\\tsessions.add(new EventSession(\\\"Test Session A\\\" + i, \\\"Description for Test Session A\\\" + i, startTime, endTime, new SessionLeader(\\\"Johnny\\\", \\\"Speaker\\\"), \\\"#SpringOne2GX-A\\\" + i));\\n\\t\\t}\\n\\n\\t\\tstartTime = new DateTime(year, month, date, 10, 15, 0, 0).toDate();\\n\\t\\tendTime = new DateTime(year, month, date, 11, 45, 0, 0).toDate();\\n\\t\\t\\n\\t\\tfor (int i = 0; i < 9; i++)\\n\\t\\t{\\n\\t\\t\\tList leaders = new ArrayList();\\n\\t\\t\\tleaders.add(new SessionLeader(\\\"Roy\\\", \\\"Clarkson\\\"));\\n\\t\\t\\tleaders.add(new SessionLeader(\\\"Jeremy\\\", \\\"Grelle\\\"));\\n\\t\\t\\tsessions.add(new EventSession(\\\"Test Session B\\\" + i, \\\"Description for Test Session B\\\" + i, startTime, endTime, leaders, \\\"#SpringOne2GX-B\\\" + i));\\n\\t\\t}\\n\\n\\t\\tstartTime = new DateTime(year, month, date, 12, 45, 0, 0).toDate();\\n\\t\\tendTime = new DateTime(year, month, date, 14, 15, 0, 0).toDate();\\n\\t\\t\\n\\t\\tfor (int i = 0; i < 9; i++)\\n\\t\\t{\\n\\t\\t\\tsessions.add(new EventSession(\\\"Test Session C\\\" + i, \\\"Description for Test Session C\\\" + i, startTime, endTime, new SessionLeader(\\\"Johnny\\\", \\\"Speaker\\\"), \\\"#SpringOne2GX-C\\\" + i));\\n\\t\\t}\\n\\t\\tstartTime = new DateTime(year, month, date, 14, 45, 0, 0).toDate();\\n\\t\\tendTime = new DateTime(year, month, date, 16, 15, 0, 0).toDate();\\n\\t\\tfor (int i = 0; i < 9; i++)\\n\\t\\t{\\n\\t\\t\\tsessions.add(new EventSession(\\\"Test Session D\\\" + i, \\\"Description for Test Session D\\\" + i, startTime, endTime, new SessionLeader(\\\"Johnny\\\", \\\"Speaker\\\"), \\\"#SpringOne2GX-D\\\" + i));\\n\\t\\t}\\n\\t\\tstartTime = new DateTime(year, month, date, 16, 30, 0, 0).toDate();\\n\\t\\tendTime = new DateTime(year, month, date, 18, 0, 0, 0).toDate();\\n\\t\\tfor (int i = 0; i < 9; i++)\\n\\t\\t{\\n\\t\\t\\tsessions.add(new EventSession(\\\"Test Session E\\\" + i, \\\"Description for Test Session E\\\" + i, startTime, endTime, new SessionLeader(\\\"Johnny\\\", \\\"Speaker\\\"), \\\"#SpringOne2GX-E\\\" + i));\\n\\t\\t}\\n\\t\\t\\t\\t\\n//\\t\\tsessions.add(new EventSession(\\\"What's new in Spring 3\\\", \\\"Come see the latest Spring Framework features!\\\", new DateTime(2010, 10, 20, 8, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new SessionLeader(\\\"Juergen\\\", \\\"Hoeller\\\")));\\n//\\t\\tsessions.add(new EventSession(\\\"What's new in Grails 2\\\", \\\"Come see the latest Grails features!\\\", new DateTime(2010, 10, 20, 8, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new SessionLeader(\\\"Graeme\\\", \\\"Rocher\\\")));\\n//\\t\\tsessions.add(new EventSession(\\\"Building Social Ready Webapps\\\", \\\"Come learn how to do the social stuff!\\\", new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 10, 0, 0, 0).toDate(), new SessionLeader(\\\"Craig\\\", \\\"Walls\\\")));\\n//\\t\\t\\n//\\t\\tList mobileLeaders = new ArrayList();\\n//\\t\\tmobileLeaders.add(new SessionLeader(\\\"Roy\\\", \\\"Clarkson\\\"));\\n//\\t\\tmobileLeaders.add(new SessionLeader(\\\"Jeremy\\\", \\\"Clarkson\\\"));\\n//\\t\\tsessions.add(new EventSession(\\\"Choices in Mobile Application Development\\\", \\\"Come learn how to do the mobile stuff!\\\", new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 10, 0, 0, 0).toDate(), mobileLeaders));\\n\\t\\t\\n\\t\\treturn sessions;\\n}\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"EventsService eventsService\",\n \" TwitterOperations twitter\"\n ],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/EventsController.java\",\n \"implementation\": \"this.eventsService = eventsService;\\n\\t@RequestMapping(method=RequestMethod.GET, headers=\\\"Accept=application/json\\\") \\n\\tpublic @ResponseBody List eventsData() {\\n\\t\\treturn eventsService.findEventsAfter(new Date());\",\n \"signature\": \"public EventsController(EventsService eventsService, TwitterOperations twitter)\"\n },\n {\n \"arguments\": [\n \"Model model\"\n ],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/EventsController.java\",\n \"implementation\": \"model.addAttribute(eventsService.findEventsAfter(new Date()));\\n\\t\\treturn \\\"events/list\\\";\\n\\t@RequestMapping(value=\\\"/{eventId\",\n \"signature\": \"String listEvents(Model model)\"\n },\n {\n \"arguments\": [\n \"@PathVariable long eventId\"\n ],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/EventsController.java\",\n \"implementation\": \"return eventsService.findEventById(eventId);\\n\\t@RequestMapping(value=\\\"/{eventName\",\n \"signature\": \"Event eventData(@PathVariable long eventId)\"\n },\n {\n \"arguments\": [\n \"OAuthConsumerToken accessToken\",\n \" @PathVariable String eventName\",\n \" Model model\"\n ],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/EventsController.java\",\n \"implementation\": \"Event event = eventsService.findEventByPublicId(eventName);\\n\\t\\tmodel.addAttribute(event);\\n\\t\\tmodel.addAttribute(twitter.search(accessToken, event.getHashtag(), 1, 10));\\n\\t\\treturn \\\"events/view\\\";\\n\\t\\n\\t@RequestMapping(value=\\\"/{eventId\",\n \"signature\": \"String viewEvent(OAuthConsumerToken accessToken, @PathVariable String eventName, Model model)\"\n },\n {\n \"arguments\": [\n \"OAuthConsumerToken accessToken\",\n \" @RequestParam String status\"\n ],\n \"filename\": \"src/main/java/com/springsource/greenhouse/events/EventsController.java\",\n \"implementation\": \"logger.info(\\\"twitter update: \\\" + status);\\n\\t\\t\\n\\t\\treturn \\\"hello\\\";\",\n \"signature\": \"String postTweet(OAuthConsumerToken accessToken, @RequestParam String status)\"\n }\n ],\n \"patch\": \"@@ -1,15 +1,11 @@\\n package com.springsource.greenhouse.events;\\n \\n-import java.util.ArrayList;\\n-import java.util.Date;\\n import java.util.List;\\n \\n import javax.inject.Inject;\\n \\n-import org.joda.time.DateTime;\\n-import org.slf4j.Logger;\\n-import org.slf4j.LoggerFactory;\\n import org.springframework.security.oauth.consumer.token.OAuthConsumerToken;\\n+import org.springframework.security.oauth.extras.OAuthAccessToken;\\n import org.springframework.social.twitter.SearchResults;\\n import org.springframework.social.twitter.TwitterOperations;\\n import org.springframework.stereotype.Controller;\\n@@ -24,121 +20,54 @@\\n @RequestMapping(\\\"/events\\\")\\n public class EventsController {\\n \\t\\n-\\tprivate EventsService eventsService;\\n-\\tprivate TwitterOperations twitter;\\n-\\tprivate final Logger logger = LoggerFactory.getLogger(getClass());\\n+\\tprivate EventRepository eventRepository;\\n \\t\\n+\\tprivate TwitterOperations twitter;\\n+\\t\\t\\n \\t@Inject\\n-\\tpublic EventsController(EventsService eventsService, TwitterOperations twitter) {\\n-\\t\\tthis.eventsService = eventsService;\\n+\\tpublic EventsController(EventRepository eventRepository, TwitterOperations twitter) {\\n+\\t\\tthis.eventRepository = eventRepository;\\n \\t\\tthis.twitter = twitter;\\n \\t}\\n \\t\\n-\\t@RequestMapping(method=RequestMethod.GET, headers=\\\"Accept=application/json\\\") \\n-\\tpublic @ResponseBody List eventsData() {\\n-\\t\\treturn eventsService.findEventsAfter(new Date());\\n-\\t}\\n+\\t// for web service (JSON) clients\\n \\t\\n-\\t@RequestMapping(method=RequestMethod.GET)\\n-\\tpublic String listEvents(Model model) {\\n-\\t\\tmodel.addAttribute(eventsService.findEventsAfter(new Date()));\\n-\\t\\treturn \\\"events/list\\\";\\n+\\t@RequestMapping(method=RequestMethod.GET, headers=\\\"Accept=application/json\\\") \\n+\\tpublic @ResponseBody List upcomingEvents() {\\n+\\t\\treturn eventRepository.findUpcomingEvents();\\n \\t}\\n \\n-\\t@RequestMapping(value=\\\"/{eventId}\\\", method=RequestMethod.GET, headers=\\\"Accept=application/json\\\")\\n-\\tpublic @ResponseBody Event eventData(@PathVariable long eventId) {\\n-\\t\\treturn eventsService.findEventById(eventId);\\n+\\t@RequestMapping(value=\\\"/{id}/tweets\\\", method=RequestMethod.GET, headers=\\\"Accept=application/json\\\")\\n+\\tpublic @ResponseBody SearchResults tweets(@PathVariable Long id, @RequestParam(defaultValue=\\\"1\\\") Integer page, @RequestParam(defaultValue=\\\"10\\\") Integer pageSize) {\\n+\\t\\treturn twitter.search(eventRepository.getEventSearchString(id), page, pageSize);\\n \\t}\\n \\n-\\t@RequestMapping(value=\\\"/{eventName}\\\", method=RequestMethod.GET)\\n-\\tpublic String viewEvent(OAuthConsumerToken accessToken, @PathVariable String eventName, Model model) {\\n-\\t\\tEvent event = eventsService.findEventByPublicId(eventName);\\n-\\t\\tmodel.addAttribute(event);\\n-\\t\\tmodel.addAttribute(twitter.search(accessToken, event.getHashtag(), 1, 10));\\n-\\t\\treturn \\\"events/view\\\";\\n+\\t@RequestMapping(value=\\\"/{id}/tweets\\\", method=RequestMethod.POST)\\n+\\tpublic @ResponseBody void postTweet(Long eventId, @RequestParam String status, @OAuthAccessToken(\\\"twitter\\\") OAuthConsumerToken accessToken) {\\n+\\t\\ttwitter.updateStatus(accessToken, status);\\n \\t}\\n-\\t\\n-\\t@RequestMapping(value=\\\"/{eventId}/tweets\\\", method=RequestMethod.GET, headers=\\\"Accept=application/json\\\")\\n-\\tpublic @ResponseBody SearchResults listEventTweets(OAuthConsumerToken accessToken, @PathVariable long eventId, \\n-\\t\\t\\t@RequestParam(defaultValue=\\\"1\\\") int page, @RequestParam(defaultValue=\\\"10\\\") int perPage) {\\n-\\t\\tEvent event = eventsService.findEventById(eventId);\\n-\\t\\treturn twitter.search(accessToken, event.getHashtag(), page, perPage);\\n-\\t}\\n-\\t\\n-\\t// This method is stubbed out to test posting a twitter status\\n-\\t@RequestMapping(value=\\\"/tweet\\\", method=RequestMethod.POST)//, headers=\\\"Accept=application/json\\\")\\n-\\tpublic @ResponseBody String postTweet(OAuthConsumerToken accessToken, @RequestParam String status) {\\n-\\t\\tlogger.info(\\\"twitter update: \\\" + status);\\n-\\t\\t\\n-\\t\\treturn \\\"hello\\\";\\n-\\t}\\n-\\t\\t\\n-\\t// This method should return all sessions for the current day\\n-\\t@RequestMapping(value=\\\"/{eventId}/currentsessions\\\", method=RequestMethod.GET, headers=\\\"Accept=application/json\\\")\\n-\\tpublic @ResponseBody List listCurrentSessions(@PathVariable long eventId) {\\n-\\t\\t\\n-\\t\\t// This is just a bunch of test session data that updates to the current date so \\n-\\t\\t// we can always see upcoming and happening now sessions.\\n-\\t\\t\\n-\\t\\tList sessions = new ArrayList();\\n-\\t\\t\\n-\\t\\tDate now = new Date();\\n-\\t\\tint year = now.getYear() + 1900;\\n-\\t\\tint month = now.getMonth() + 1;\\n-\\t\\tint date = now.getDate();\\n-\\t\\t\\n-\\t\\tDate startTime = new DateTime(year, month, date, 8, 30, 0, 0).toDate();\\n-\\t\\tDate endTime = new DateTime(year, month, date, 10, 0, 0, 0).toDate();\\n-\\t\\t\\n-\\t\\tfor (int i = 0; i < 9; i++)\\n-\\t\\t{\\n-\\t\\t\\tsessions.add(new EventSession(\\\"Test Session A\\\" + i, \\\"Description for Test Session A\\\" + i, startTime, endTime, new SessionLeader(\\\"Johnny\\\", \\\"Speaker\\\"), \\\"#SpringOne2GX-A\\\" + i));\\n-\\t\\t}\\n-\\n-\\t\\tstartTime = new DateTime(year, month, date, 10, 15, 0, 0).toDate();\\n-\\t\\tendTime = new DateTime(year, month, date, 11, 45, 0, 0).toDate();\\n-\\t\\t\\n-\\t\\tfor (int i = 0; i < 9; i++)\\n-\\t\\t{\\n-\\t\\t\\tList leaders = new ArrayList();\\n-\\t\\t\\tleaders.add(new SessionLeader(\\\"Roy\\\", \\\"Clarkson\\\"));\\n-\\t\\t\\tleaders.add(new SessionLeader(\\\"Jeremy\\\", \\\"Grelle\\\"));\\n-\\t\\t\\tsessions.add(new EventSession(\\\"Test Session B\\\" + i, \\\"Description for Test Session B\\\" + i, startTime, endTime, leaders, \\\"#SpringOne2GX-B\\\" + i));\\n-\\t\\t}\\n-\\n-\\t\\tstartTime = new DateTime(year, month, date, 12, 45, 0, 0).toDate();\\n-\\t\\tendTime = new DateTime(year, month, date, 14, 15, 0, 0).toDate();\\n-\\t\\t\\n-\\t\\tfor (int i = 0; i < 9; i++)\\n-\\t\\t{\\n-\\t\\t\\tsessions.add(new EventSession(\\\"Test Session C\\\" + i, \\\"Description for Test Session C\\\" + i, startTime, endTime, new SessionLeader(\\\"Johnny\\\", \\\"Speaker\\\"), \\\"#SpringOne2GX-C\\\" + i));\\n-\\t\\t}\\n \\n-\\t\\tstartTime = new DateTime(year, month, date, 14, 45, 0, 0).toDate();\\n-\\t\\tendTime = new DateTime(year, month, date, 16, 15, 0, 0).toDate();\\n+\\t@RequestMapping(value=\\\"/{id}/sessions/today\\\", method=RequestMethod.GET, headers=\\\"Accept=application/json\\\")\\n+\\tpublic @ResponseBody List sessionsToday(@PathVariable Long id) {\\n+\\t\\treturn eventRepository.findTodaysSessions(id);\\n+\\t}\\n \\n-\\t\\tfor (int i = 0; i < 9; i++)\\n-\\t\\t{\\n-\\t\\t\\tsessions.add(new EventSession(\\\"Test Session D\\\" + i, \\\"Description for Test Session D\\\" + i, startTime, endTime, new SessionLeader(\\\"Johnny\\\", \\\"Speaker\\\"), \\\"#SpringOne2GX-D\\\" + i));\\n-\\t\\t}\\n+\\t@RequestMapping(value=\\\"/{id}/sessions/{code}/tweets\\\", method=RequestMethod.GET, headers=\\\"Accept=application/json\\\")\\n+\\tpublic @ResponseBody SearchResults sessionTweets(@PathVariable Long id, Short code, @RequestParam(defaultValue=\\\"1\\\") Integer page, @RequestParam(defaultValue=\\\"10\\\") Integer pageSize) {\\n+\\t\\treturn twitter.search(eventRepository.getEventSessionSearchString(id, code), page, pageSize);\\n+\\t}\\n \\n-\\t\\tstartTime = new DateTime(year, month, date, 16, 30, 0, 0).toDate();\\n-\\t\\tendTime = new DateTime(year, month, date, 18, 0, 0, 0).toDate();\\n+\\t@RequestMapping(value=\\\"/{id}/sessions/{code}/tweets\\\", method=RequestMethod.POST)\\n+\\tpublic @ResponseBody void postSessionTweet(Long id, Short code, @RequestParam String status, @OAuthAccessToken(\\\"twitter\\\") OAuthConsumerToken accessToken) {\\n+\\t\\ttwitter.updateStatus(accessToken, status);\\n+\\t}\\n \\n-\\t\\tfor (int i = 0; i < 9; i++)\\n-\\t\\t{\\n-\\t\\t\\tsessions.add(new EventSession(\\\"Test Session E\\\" + i, \\\"Description for Test Session E\\\" + i, startTime, endTime, new SessionLeader(\\\"Johnny\\\", \\\"Speaker\\\"), \\\"#SpringOne2GX-E\\\" + i));\\n-\\t\\t}\\n-\\t\\t\\t\\t\\n-//\\t\\tsessions.add(new EventSession(\\\"What's new in Spring 3\\\", \\\"Come see the latest Spring Framework features!\\\", new DateTime(2010, 10, 20, 8, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new SessionLeader(\\\"Juergen\\\", \\\"Hoeller\\\")));\\n-//\\t\\tsessions.add(new EventSession(\\\"What's new in Grails 2\\\", \\\"Come see the latest Grails features!\\\", new DateTime(2010, 10, 20, 8, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new SessionLeader(\\\"Graeme\\\", \\\"Rocher\\\")));\\n-//\\t\\tsessions.add(new EventSession(\\\"Building Social Ready Webapps\\\", \\\"Come learn how to do the social stuff!\\\", new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 10, 0, 0, 0).toDate(), new SessionLeader(\\\"Craig\\\", \\\"Walls\\\")));\\n-//\\t\\t\\n-//\\t\\tList mobileLeaders = new ArrayList();\\n-//\\t\\tmobileLeaders.add(new SessionLeader(\\\"Roy\\\", \\\"Clarkson\\\"));\\n-//\\t\\tmobileLeaders.add(new SessionLeader(\\\"Jeremy\\\", \\\"Clarkson\\\"));\\n-//\\t\\tsessions.add(new EventSession(\\\"Choices in Mobile Application Development\\\", \\\"Come learn how to do the mobile stuff!\\\", new DateTime(2010, 10, 20, 9, 0, 0, 0).toDate(), new DateTime(2010, 10, 20, 10, 0, 0, 0).toDate(), mobileLeaders));\\n-\\t\\t\\n-\\t\\treturn sessions;\\n+\\t// for web browser (HTML) clients\\n+\\t\\n+\\t@RequestMapping(method=RequestMethod.GET, headers=\\\"Accept=text/html\\\")\\n+\\tpublic String upcomingEventsView(Model model) {\\n+\\t\\tmodel.addAttribute(eventRepository.findUpcomingEvents());\\n+\\t\\treturn \\\"events/list\\\";\\n \\t}\\n-}\\n+\\t\\n+}\\n\\\\ No newline at end of file\",\n \"raw_url\": \"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fevents%2FEventsController.java\",\n \"sha\": \"91853c18f521554e3803f165de7c3cd6e37904b3\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersController.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersController.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/com/springsource/greenhouse/members/MembersController.java\",\n \"new_code\": \"\\tprivate MemberRepository membersService;\\n\\tpublic MembersController(MemberRepository membersService) {\",\n \"new_methods\": [],\n \"old_code\": \"\\tprivate MembersService membersService;\\n\\tpublic MembersController(MembersService membersService) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -14,10 +14,10 @@\\n @RequestMapping(\\\"/members/*\\\")\\n public class MembersController {\\n \\n-\\tprivate MembersService membersService;\\n+\\tprivate MemberRepository membersService;\\n \\t\\n \\t@Inject\\n-\\tpublic MembersController(MembersService membersService) {\\n+\\tpublic MembersController(MemberRepository membersService) {\\n \\t\\tthis.membersService = membersService;\\n \\t}\\n \",\n \"raw_url\": \"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersController.java\",\n \"sha\": \"090a76e9c4bd34b588a1a02e20f57b5dad344a86\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 7,\n \"blob_url\": \"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterOperations.java\",\n \"changes\": 7,\n \"contents_url\": \"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterOperations.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec\",\n \"deletions\": 0,\n \"filename\": \"src/main/java/org/springframework/social/twitter/TwitterOperations.java\",\n \"new_code\": \"\\t\\n\\t\\n\\n\\tSearchResults search(String query, int page, int pageSize);\\n\\n\\t\\n\\t\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -7,9 +7,16 @@\\n public interface TwitterOperations {\\n \\n \\tString getScreenName(OAuthConsumerToken accessToken);\\n+\\t\\n \\tList getFriends(OAuthConsumerToken accessToken, String screenName);\\n+\\t\\n \\tvoid updateStatus(OAuthConsumerToken accessToken, String message);\\n+\\n+\\tSearchResults search(String query, int page, int pageSize);\\n+\\n \\tSearchResults search(OAuthConsumerToken accessToken, String query);\\n+\\t\\n \\tSearchResults search(OAuthConsumerToken accessToken, String query, int page, int resultsPerPage);\\n+\\t\\n \\tSearchResults search(OAuthConsumerToken accessToken, String query, int page, int resultsPerPage, int sinceId, int maxId);\\n }\\n\\\\ No newline at end of file\",\n \"raw_url\": \"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterOperations.java\",\n \"sha\": \"5f2d89b59bde98fd1e4e9db6e0372c1768738f07\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 4,\n \"blob_url\": \"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterService.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterService.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec\",\n \"deletions\": 0,\n \"filename\": \"src/main/java/org/springframework/social/twitter/TwitterService.java\",\n \"new_code\": \"\\tpublic SearchResults search(String query, int page, int resultsPerPage) {\\n\\t\\treturn search(null, query, page, resultsPerPage, 0, 0);\\n\\t}\\n\\t\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"String query\",\n \" int page\",\n \" int resultsPerPage\"\n ],\n \"filename\": \"src/main/java/org/springframework/social/twitter/TwitterService.java\",\n \"implementation\": \"return search(null, query, page, resultsPerPage, 0, 0);\",\n \"signature\": \"SearchResults search(String query, int page, int resultsPerPage)\"\n }\n ],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -70,6 +70,10 @@ public SearchResults search(OAuthConsumerToken accessToken, String query) {\\n \\t\\treturn search(accessToken, query, 1, DEFAULT_RESULTS_PER_PAGE, 0, 0);\\n \\t}\\n \\n+\\tpublic SearchResults search(String query, int page, int resultsPerPage) {\\n+\\t\\treturn search(null, query, page, resultsPerPage, 0, 0);\\n+\\t}\\n+\\t\\n \\tpublic SearchResults search(OAuthConsumerToken accessToken, String query, int page, int resultsPerPage) {\\n \\t\\treturn search(accessToken, query, page, resultsPerPage, 0, 0);\\n \\t}\",\n \"raw_url\": \"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fjava%2Forg%2Fspringframework%2Fsocial%2Ftwitter%2FTwitterService.java\",\n \"sha\": \"160f20996255494d2a4b11398040e06c8736bf27\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 27,\n \"blob_url\": \"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fdata.sql\",\n \"changes\": 36,\n \"contents_url\": \"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fdata.sql?ref=26132fb65137f90d5223bf5bddc0c7a296577aec\",\n \"deletions\": 9,\n \"filename\": \"src/main/webapp/WEB-INF/database/data.sql\",\n \"new_code\": \"insert into Member (firstName, lastName, email, password, username) values ('Jeremy', 'Grelle', 'jgrelle@vmware.com', 'churchkeys', 'jgrelle');\\ninsert into MemberGroup (name, description, profileKey, searchString, leader) values ('SpringOne2gx', 'The premier event for Spring technologies', 'springone2gx', '#springone2gx', 1);\\ninsert into Event (title, startDate, endDate, location, description, memberGroup) values ('SpringOne/2GX', '2010-10-19', '2010-10-22', 'SpringOne 2GX is a one-of-a-kind conference for application developers, solution architects, web operations and IT teams who develop, deploy and manage business applications.', 'Chicago, IL', 1);\\ninsert into EventTrack (name, description, chair, event) values ('Essential Spring', 'Spring techniques and technologies applicable to most classes of applications', 2, 1);\\ninsert into EventTrack (name, description, chair, event) values ('Web Application Development', 'What you need to know to build rich web applications', 1, 1);\\ninsert into EventSession (code, title, startTime, endTime, description, event, track) values (201, \\n\\t'Mastering MVC 3', '2010-10-20 12:45:00', '2010-10-20 14:15:00',\\n\\t'A deep-dive into the latest capabilities of Spring MVC, Spring%27s REST-ful web application development platform.', 1, 2);\\ninsert into EventSessionLeader (session, leader) values (201, 1);\\n\\ninsert into EventSession (code, title, startTime, endTime, description, event, track) values (202, \\n\\t'Inside Web Flow 3 Development', '2010-10-20 14:45:00', '2010-10-20 16:15:00',\\n\\t'A look inside the development of Spring Web Flow 3, the next-generation version of Spring%27s stateful controller framework for orchestrating multi-step user dialogs.', 1, 2);\\ninsert into EventSessionLeader (session, leader) values (202, 1);\\n\\ninsert into EventSession (code, title, startTime, endTime, description, event, track) values (203, \\n\\t'Developing Social-Ready Web Applications', '2010-10-21 12:45:00', '2010-10-21 14:15:00',\\n\\t'Businesses are increasingly recognizing the value of connecting with their customers on a more personal level. Companies can utilize social networking to transition from \\\"Big Faceless Corporation\\\" to \\\"Friend\\\" by taking their wares to the online communities where their customers are. In this age of social media, those communities are found at social network sites such as Facebook, Twitter, and LinkedIn. In this session, you%27ll learn how to build Spring-based applications that interact with the various social networks. We%27ll talk about new features in the Spring portfolio to support integration with social networks as well as how to start building social features into your own applications.',\\n\\t1, 2);\\ninsert into EventSessionLeader (session, leader) values (203, 2);\\n\\t\\ninsert into EventSession (code, title, startTime, endTime, description, event, track) values (204, \\n\\t'Choices in Moble Application Development', '2010-10-21 14:45:00', '2010-10-21 16:15:00',\\n\\t'With the rising prevalence of advanced mobile platforms such as iPhone, Android, and Web OS, the desire for rich mobile clients as another means of accessing enterprise services is becoming something that can no longer be ignored. In this session, we will explore the current mobile development landscape and discuss what you as a Spring developer can do to support this increasingly important paradigm. We will examine the benefits and tradeoffs of native mobile client development vs. web-based mobile client development, and we will explore some of the emerging cross-platform options such as PhoneGap. We will look at the various strategies for utilizing a Spring back-end with these mobile platforms, such as consumption of RESTful services, authentication and authorization via OAuth, and server-push style messaging.',\\n\\t1, 2);\\ninsert into EventSessionLeader (session, leader) values (204, 3);\\ninsert into EventSessionLeader (session, leader) values (204, 4);\",\n \"new_methods\": [],\n \"old_code\": \"insert into MemberGroup (publicId, name, description, hashtag, leader) values ('SpringOne', 'SpringOne', 'The premier Spring Framework event.', '#springone', 1);\\ninsert into Event (publicId, title, description, startTime, endTime, location, memberGroup, hashtag) values ('springone_2gx', 'SpringOne/2GX', \\n 'SpringOne 2GX is a one-of-a-kind conference for application developers, solution architects, web operations and IT teams who develop, deploy and manage business applications.', \\n '2010-10-19', '2010-10-22', 'Chicago, IL', 1, '#springone2gx');\\ninsert into EventTrack (name, description, chair, event) values ('Core Spring', 'The low-down on the core Spring Framework', 1, 1);\\ninsert into EventSession (code, title, description, startTime, endTime, speaker, event, track, hashtag) values ('CS1', \\n\\t'Developing Social-Ready Web Applications', \\n\\t'Businesses are increasingly recognizing the value of connecting with their customers on a more personal level. Companies can utilize social networking to transition from \\\"Big Faceless Corporation\\\" to \\\"Friend\\\" by taking their wares to the online communities where their customers are. In this age of social media, those communities are found at social network sites such as Facebook, Twitter, and LinkedIn. In this session, you%27ll learn how to build Spring-based applications that interact with the various social networks. We%27ll talk about new features in the Spring portfolio to support integration with social networks as well as how to start building social features into your own applications.', \\n\\t'2010-10-20', '2010-10-20', 2, 1, 1, '#s12gxcs1');\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,22 +1,40 @@\\n insert into Member (firstName, lastName, email, password, username) values ('Keith' , 'Donald', 'kdonald@vmware.com', 'melbourne', 'kdonald');\\n insert into Member (firstName, lastName, email, password, username) values ('Craig' , 'Walls', 'craig@habuma.com', 'plano', 'habuma');\\n insert into Member (firstName, lastName, email, password, username) values ('Roy', 'Clarkson', 'rclarkson@vmware.com', 'atlanta', 'rclarkson');\\n+insert into Member (firstName, lastName, email, password, username) values ('Jeremy', 'Grelle', 'jgrelle@vmware.com', 'churchkeys', 'jgrelle');\\n \\n insert into App (consumerKey, name, description, website, callbackUrl, secret, owner) values ('a08318eb478a1ee31f69a55276f3af64', 'Greenhouse for the iPhone', 'Awesome', 'http://www.springsource.com', 'x-com-springsource-greenhouse://oauth-response', '80e7f8f7ba724aae9103f297e5fb9bdf', 2);\\n \\n insert into Update (text, updateTimestamp, member) values ('Keith Donald signed up', 1278019179970, 1);\\n insert into Update (text, updateTimestamp, member) values ('Craig Walls signed up', 1278017173970, 2);\\n insert into Update (text, updateTimestamp, member) values ('Roy Clarkson signed up', 1274015177470, 3);\\n \\n-insert into MemberGroup (publicId, name, description, hashtag, leader) values ('SpringOne', 'SpringOne', 'The premier Spring Framework event.', '#springone', 1);\\n+insert into MemberGroup (name, description, profileKey, searchString, leader) values ('SpringOne2gx', 'The premier event for Spring technologies', 'springone2gx', '#springone2gx', 1);\\n \\n-insert into Event (publicId, title, description, startTime, endTime, location, memberGroup, hashtag) values ('springone_2gx', 'SpringOne/2GX', \\n- 'SpringOne 2GX is a one-of-a-kind conference for application developers, solution architects, web operations and IT teams who develop, deploy and manage business applications.', \\n- '2010-10-19', '2010-10-22', 'Chicago, IL', 1, '#springone2gx');\\n+insert into Event (title, startDate, endDate, location, description, memberGroup) values ('SpringOne/2GX', '2010-10-19', '2010-10-22', 'SpringOne 2GX is a one-of-a-kind conference for application developers, solution architects, web operations and IT teams who develop, deploy and manage business applications.', 'Chicago, IL', 1);\\n \\n-insert into EventTrack (name, description, chair, event) values ('Core Spring', 'The low-down on the core Spring Framework', 1, 1);\\n+insert into EventTrack (name, description, chair, event) values ('Essential Spring', 'Spring techniques and technologies applicable to most classes of applications', 2, 1);\\n+insert into EventTrack (name, description, chair, event) values ('Web Application Development', 'What you need to know to build rich web applications', 1, 1);\\n \\n-insert into EventSession (code, title, description, startTime, endTime, speaker, event, track, hashtag) values ('CS1', \\n-\\t'Developing Social-Ready Web Applications', \\n-\\t'Businesses are increasingly recognizing the value of connecting with their customers on a more personal level. Companies can utilize social networking to transition from \\\"Big Faceless Corporation\\\" to \\\"Friend\\\" by taking their wares to the online communities where their customers are. In this age of social media, those communities are found at social network sites such as Facebook, Twitter, and LinkedIn. In this session, you%27ll learn how to build Spring-based applications that interact with the various social networks. We%27ll talk about new features in the Spring portfolio to support integration with social networks as well as how to start building social features into your own applications.', \\n-\\t'2010-10-20', '2010-10-20', 2, 1, 1, '#s12gxcs1');\\n+insert into EventSession (code, title, startTime, endTime, description, event, track) values (201, \\n+\\t'Mastering MVC 3', '2010-10-20 12:45:00', '2010-10-20 14:15:00',\\n+\\t'A deep-dive into the latest capabilities of Spring MVC, Spring%27s REST-ful web application development platform.', 1, 2);\\n+insert into EventSessionLeader (session, leader) values (201, 1);\\n+\\n+insert into EventSession (code, title, startTime, endTime, description, event, track) values (202, \\n+\\t'Inside Web Flow 3 Development', '2010-10-20 14:45:00', '2010-10-20 16:15:00',\\n+\\t'A look inside the development of Spring Web Flow 3, the next-generation version of Spring%27s stateful controller framework for orchestrating multi-step user dialogs.', 1, 2);\\n+insert into EventSessionLeader (session, leader) values (202, 1);\\n+\\n+insert into EventSession (code, title, startTime, endTime, description, event, track) values (203, \\n+\\t'Developing Social-Ready Web Applications', '2010-10-21 12:45:00', '2010-10-21 14:15:00',\\n+\\t'Businesses are increasingly recognizing the value of connecting with their customers on a more personal level. Companies can utilize social networking to transition from \\\"Big Faceless Corporation\\\" to \\\"Friend\\\" by taking their wares to the online communities where their customers are. In this age of social media, those communities are found at social network sites such as Facebook, Twitter, and LinkedIn. In this session, you%27ll learn how to build Spring-based applications that interact with the various social networks. We%27ll talk about new features in the Spring portfolio to support integration with social networks as well as how to start building social features into your own applications.',\\n+\\t1, 2);\\n+insert into EventSessionLeader (session, leader) values (203, 2);\\n+\\t\\n+insert into EventSession (code, title, startTime, endTime, description, event, track) values (204, \\n+\\t'Choices in Moble Application Development', '2010-10-21 14:45:00', '2010-10-21 16:15:00',\\n+\\t'With the rising prevalence of advanced mobile platforms such as iPhone, Android, and Web OS, the desire for rich mobile clients as another means of accessing enterprise services is becoming something that can no longer be ignored. In this session, we will explore the current mobile development landscape and discuss what you as a Spring developer can do to support this increasingly important paradigm. We will examine the benefits and tradeoffs of native mobile client development vs. web-based mobile client development, and we will explore some of the emerging cross-platform options such as PhoneGap. We will look at the various strategies for utilizing a Spring back-end with these mobile platforms, such as consumption of RESTful services, authentication and authorization via OAuth, and server-push style messaging.',\\n+\\t1, 2);\\n+insert into EventSessionLeader (session, leader) values (204, 3);\\n+insert into EventSessionLeader (session, leader) values (204, 4);\",\n \"raw_url\": \"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fdata.sql\",\n \"sha\": \"2cb87388858bee61bb303668d7c3531465aa47ed\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 14,\n \"blob_url\": \"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fschema-event.sql\",\n \"changes\": 27,\n \"contents_url\": \"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fschema-event.sql?ref=26132fb65137f90d5223bf5bddc0c7a296577aec\",\n \"deletions\": 13,\n \"filename\": \"src/main/webapp/WEB-INF/database/schema-event.sql\",\n \"new_code\": \"\\t\\t\\t\\t\\tprofileKey varchar unique,\\t\\t\\t\\t\\t\\n\\t\\t\\t\\t\\tsearchString varchar,\\n\\t\\t\\t\\t\\tstartDate date,\\n\\t\\t\\t\\t\\tendDate date,\\n\\t\\t\\t\\t\\tdescription varchar,\\ncreate table EventSession (code smallint,\\n\\t\\t\\t\\t\\tdescription varchar,\\n\\t\\t\\t\\t\\tforeign key (track) references EventTrack(id));\\n\\ncreate table EventSessionLeader (session smallint not null,\\n\\t\\t\\t\\t\\tleader bigint not null,\\n\\t\\t\\t\\t\\tprimary key (session, leader),\\n\\t\\t\\t\\t\\tforeign key (session) references EventSession(code),\\n\\t\\t\\t\\t\\tforeign key (leader) references Member(id));\\t\",\n \"new_methods\": [],\n \"old_code\": \"\\t\\t\\t\\t\\tpublicId varchar not null,\\n\\t\\t\\t\\t\\thashtag varchar,\\n\\t\\t\\t\\t\\tpublicId varchar not null,\\n\\t\\t\\t\\t\\tdescription varchar,\\n\\t\\t\\t\\t\\tstartTime timestamp,\\n\\t\\t\\t\\t\\tendTime timestamp,\\n\\t\\t\\t\\t\\thashtag varchar,\\ncreate table EventSession (code varchar,\\n\\t\\t\\t\\t\\tdescription varchar,\\n\\t\\t\\t\\t\\tspeaker bigint not null,\\n\\t\\t\\t\\t\\thashtag varchar,\\n\\t\\t\\t\\t\\tforeign key (speaker) references Member(id),\\n\\t\\t\\t\\t\\tforeign key (track) references EventTrack(id));\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,21 +1,19 @@\\n create table MemberGroup (id identity,\\n-\\t\\t\\t\\t\\tpublicId varchar not null,\\n \\t\\t\\t\\t\\tname varchar not null,\\n \\t\\t\\t\\t\\tdescription varchar,\\n-\\t\\t\\t\\t\\thashtag varchar,\\n+\\t\\t\\t\\t\\tprofileKey varchar unique,\\t\\t\\t\\t\\t\\n+\\t\\t\\t\\t\\tsearchString varchar,\\n \\t\\t\\t\\t\\tleader bigint not null,\\n \\t\\t\\t\\t\\tprimary key (id),\\n \\t\\t\\t\\t\\tforeign key (leader) references Member(id));\\n \\t\\t\\t\\t\\t\\n create table Event (id identity,\\n-\\t\\t\\t\\t\\tpublicId varchar not null,\\n \\t\\t\\t\\t\\ttitle varchar not null,\\n-\\t\\t\\t\\t\\tdescription varchar,\\n-\\t\\t\\t\\t\\tstartTime timestamp,\\n-\\t\\t\\t\\t\\tendTime timestamp,\\n+\\t\\t\\t\\t\\tstartDate date,\\n+\\t\\t\\t\\t\\tendDate date,\\n \\t\\t\\t\\t\\tlocation varchar,\\n+\\t\\t\\t\\t\\tdescription varchar,\\n \\t\\t\\t\\t\\tmemberGroup bigint not null,\\n-\\t\\t\\t\\t\\thashtag varchar,\\n \\t\\t\\t\\t\\tprimary key (id),\\n \\t\\t\\t\\t\\tforeign key (memberGroup) references MemberGroup(id));\\n \\n@@ -28,16 +26,19 @@ create table EventTrack (id identity,\\n \\t\\t\\t\\t\\tforeign key (chair) references Member(id),\\n \\t\\t\\t\\t\\tforeign key (event) references Event(id));\\n \\n-create table EventSession (code varchar,\\n+create table EventSession (code smallint,\\n \\t\\t\\t\\t\\ttitle varchar not null,\\n-\\t\\t\\t\\t\\tdescription varchar,\\n \\t\\t\\t\\t\\tstartTime timestamp,\\n \\t\\t\\t\\t\\tendTime timestamp,\\n-\\t\\t\\t\\t\\tspeaker bigint not null,\\n+\\t\\t\\t\\t\\tdescription varchar,\\n \\t\\t\\t\\t\\tevent bigint not null,\\n \\t\\t\\t\\t\\ttrack bigint,\\n-\\t\\t\\t\\t\\thashtag varchar,\\n \\t\\t\\t\\t\\tprimary key (code, event),\\n-\\t\\t\\t\\t\\tforeign key (speaker) references Member(id),\\n \\t\\t\\t\\t\\tforeign key (event) references Event(id),\\n-\\t\\t\\t\\t\\tforeign key (track) references EventTrack(id));\\n\\\\ No newline at end of file\\n+\\t\\t\\t\\t\\tforeign key (track) references EventTrack(id));\\n+\\n+create table EventSessionLeader (session smallint not null,\\n+\\t\\t\\t\\t\\tleader bigint not null,\\n+\\t\\t\\t\\t\\tprimary key (session, leader),\\n+\\t\\t\\t\\t\\tforeign key (session) references EventSession(code),\\n+\\t\\t\\t\\t\\tforeign key (leader) references Member(id));\\t\\n\\\\ No newline at end of file\",\n \"raw_url\": \"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Fmain%2Fwebapp%2FWEB-INF%2Fdatabase%2Fschema-event.sql\",\n \"sha\": \"db1f05bbf20aad6ceeae5bf29591f916d7c8b2ab\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/spring-attic/greenhouse/blob/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Ftest%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersControllerTest.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/spring-attic/greenhouse/contents/src%2Ftest%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersControllerTest.java?ref=26132fb65137f90d5223bf5bddc0c7a296577aec\",\n \"deletions\": 1,\n \"filename\": \"src/test/java/com/springsource/greenhouse/members/MembersControllerTest.java\",\n \"new_code\": \" \\tMemberRepository membersService = new JdbcMemberRepository(jdbcTemplate);\",\n \"new_methods\": [],\n \"old_code\": \" \\tMembersService membersService = new DefaultMembersService(jdbcTemplate);\",\n \"old_methods\": [],\n \"patch\": \"@@ -27,7 +27,7 @@ public void setup() {\\n \\t\\t\\tnew FileSystemResource(\\\"src/main/webapp/WEB-INF/database/schema-member.sql\\\"),\\n \\t\\t\\tnew ClassPathResource(\\\"MembersControllerTest.sql\\\", getClass()));\\n \\tjdbcTemplate = new JdbcTemplate(db);\\n- \\tMembersService membersService = new DefaultMembersService(jdbcTemplate);\\n+ \\tMemberRepository membersService = new JdbcMemberRepository(jdbcTemplate);\\n \\tcontroller = new MembersController(membersService);\\n }\\n \",\n \"raw_url\": \"https://github.com/spring-attic/greenhouse/raw/26132fb65137f90d5223bf5bddc0c7a296577aec/src%2Ftest%2Fjava%2Fcom%2Fspringsource%2Fgreenhouse%2Fmembers%2FMembersControllerTest.java\",\n \"sha\": \"3888305c5d402662e0d78753f131c08e90c46f83\",\n \"status\": \"modified\"\n }\n]"},"file_patch_count":{"kind":"number","value":9,"string":"9"},"enhanced_diffs":{"kind":"list like","value":[{"name":"spring-projects$greenhouse","new_args":"Model model","new_implementation":"model.addAttribute(eventRepository.findUpcomingEvents());\n\t\treturn \"events/list\";","new_return_type":"String","new_signature":"String upcomingEventsView(Model model)","old_args":"Model model","old_implementation":"model.addAttribute(eventsService.findEventsAfter(new Date()));\n\t\treturn \"events/list\";\n\t@RequestMapping(value=\"/{eventId","old_return_type":"String","old_signature":"String listEvents(Model model)"}],"string":"[\n {\n \"name\": \"spring-projects$greenhouse\",\n \"new_args\": \"Model model\",\n \"new_implementation\": \"model.addAttribute(eventRepository.findUpcomingEvents());\\n\\t\\treturn \\\"events/list\\\";\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String upcomingEventsView(Model model)\",\n \"old_args\": \"Model model\",\n \"old_implementation\": \"model.addAttribute(eventsService.findEventsAfter(new Date()));\\n\\t\\treturn \\\"events/list\\\";\\n\\t@RequestMapping(value=\\\"/{eventId\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String listEvents(Model model)\"\n }\n]"},"enhanced_diffs_count":{"kind":"number","value":1,"string":"1"},"diff_count":{"kind":"number","value":6,"string":"6"}}},{"rowIdx":14,"cells":{"commit_sha":{"kind":"string","value":"27802cfab9eabed1efb72ac10206fa1cc8dfd3e6"},"modifications":{"kind":"list like","value":[{"name":"obeonetwork$informationsystem","new_args":"Object object","new_implementation":null,"new_return_type":"void","new_signature":"void addReferencedTypePropertyDescriptor(Object object)","old_args":"Object object","old_implementation":null,"old_return_type":"void","old_signature":"void addTypePropertyDescriptor(Object object)"},{"name":"obeonetwork$informationsystem","new_args":"Object object","new_implementation":null,"new_return_type":"void","new_signature":"void addMultiplicityPropertyDescriptor(Object object)","old_args":"Object object","old_implementation":null,"old_return_type":"void","old_signature":"void addUpperPropertyDescriptor(Object object)"},{"name":"obeonetwork$informationsystem","new_args":"Composite parent","new_implementation":"createDescription(parent, EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentMessages.ReferencePropertiesEditionPart_ReferencedTypeLabel);\n\t\treferencedType = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND));\n\t\treferencedType.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\treferencedType.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.referencedType, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getReferencedType()));\n\t\tGridData referencedTypeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\treferencedType.setLayoutData(referencedTypeData);\n\t\treferencedType.setID(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createReferencedTypeFlatComboViewer\n\tprotected Composite createIdentifierCheckbox(Composite parent) {\n\t\tidentifier = new Button(parent, SWT.CHECK);\n\t\tidentifier.setText(getDescription(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentMessages.ReferencePropertiesEditionPart_IdentifierLabel));\n\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n\n\t\t\t/**\n\t\t\t * {@inheritDoc","new_return_type":"Composite","new_signature":"Composite createReferencedTypeFlatComboViewer(Composite parent)","old_args":"Composite parent","old_implementation":"createDescription(parent, EnvironmentViewsRepository.Reference.Properties.type, EnvironmentMessages.ReferencePropertiesEditionPart_TypeLabel);\n\t\ttype = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND));\n\t\ttype.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\ttype.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.type, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getType()));\n\t\tGridData typeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\ttype.setLayoutData(typeData);\n\t\ttype.setID(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createTypeFlatComboViewer\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getType()\n\tpublic EObject getType() {\n\t\tif (type.getSelection() instanceof StructuredSelection) {\n\t\t\tObject firstElement = ((StructuredSelection) type.getSelection()).getFirstElement();\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initType(EObjectFlatComboSettings)\n\tpublic void initType(EObjectFlatComboSettings settings) {\n\t\ttype.setInput(settings);\n\t\t\ttype.setSelection(new StructuredSelection(settings.getValue()));\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","old_return_type":"Composite","old_signature":"Composite createTypeFlatComboViewer(Composite parent)"},{"name":"obeonetwork$informationsystem","new_args":"Composite parent,FormToolkit widgetFactory","new_implementation":null,"new_return_type":"Composite","new_signature":"Composite createReferencedTypeFlatComboViewer(Composite parent,FormToolkit widgetFactory)","old_args":"Composite parent,FormToolkit widgetFactory","old_implementation":null,"old_return_type":"Composite","old_signature":"Composite createTypeFlatComboViewer(Composite parent,FormToolkit widgetFactory)"},{"name":"obeonetwork$informationsystem","new_args":"ViewerFilter filter","new_implementation":null,"new_return_type":"void","new_signature":"void addBusinessFilterToReferencedType(ViewerFilter filter)","old_args":"ViewerFilter filter","old_implementation":null,"old_return_type":"void","old_signature":"void addBusinessFilterToType(ViewerFilter filter)"},{"name":"obeonetwork$informationsystem","new_args":"ViewerFilter filter","new_implementation":null,"new_return_type":"void","new_signature":"void addBusinessFilterToReferencedType(ViewerFilter filter)","old_args":"ViewerFilter filter","old_implementation":null,"old_return_type":"void","old_signature":"void addBusinessFilterToType(ViewerFilter filter)"},{"name":"obeonetwork$informationsystem","new_args":"ViewerFilter filter","new_implementation":null,"new_return_type":"void","new_signature":"void addFilterToReferencedType(ViewerFilter filter)","old_args":"ViewerFilter filter","old_implementation":null,"old_return_type":"void","old_signature":"void addFilterToType(ViewerFilter filter)"},{"name":"obeonetwork$informationsystem","new_args":"ViewerFilter filter","new_implementation":null,"new_return_type":"void","new_signature":"void addFilterToReferencedType(ViewerFilter filter)","old_args":"ViewerFilter filter","old_implementation":null,"old_return_type":"void","old_signature":"void addFilterToType(ViewerFilter filter)"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"StructuredType","new_signature":"StructuredType basicGetContainingType()","old_args":"","old_implementation":null,"old_return_type":"DTO","old_signature":"DTO basicGetType()"},{"name":"obeonetwork$informationsystem","new_args":"StructuredType newContainingType,NotificationChain msgs","new_implementation":null,"new_return_type":"NotificationChain","new_signature":"NotificationChain basicSetContainingType(StructuredType newContainingType,NotificationChain msgs)","old_args":"DTO newDto,NotificationChain msgs","old_implementation":null,"old_return_type":"NotificationChain","old_signature":"NotificationChain basicSetDto(DTO newDto,NotificationChain msgs)"},{"name":"obeonetwork$informationsystem","new_args":"StructuredType newContainingType,NotificationChain msgs","new_implementation":null,"new_return_type":"NotificationChain","new_signature":"NotificationChain basicSetContainingType(StructuredType newContainingType,NotificationChain msgs)","old_args":"DTO newDto,NotificationChain msgs","old_implementation":null,"old_return_type":"NotificationChain","old_signature":"NotificationChain basicSetDto(DTO newDto,NotificationChain msgs)"},{"name":"obeonetwork$informationsystem","new_args":"TypesDefinition object","new_implementation":null,"new_return_type":"T","new_signature":"T caseTypesDefinition(TypesDefinition object)","old_args":"Reference object","old_implementation":null,"old_return_type":"T","old_signature":"T caseReference(Reference object)"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"Adapter","new_signature":"Adapter createTypesDefinitionAdapter()","old_args":"","old_implementation":null,"old_return_type":"Adapter","old_signature":"Adapter createReferenceAdapter()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"Adapter","new_signature":"Adapter createTypesDefinitionAdapter()","old_args":"","old_implementation":null,"old_return_type":"Adapter","old_signature":"Adapter createReferenceAdapter()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EReference","new_signature":"EReference getAttribute_ContainingType()","old_args":"","old_implementation":null,"old_return_type":"EReference","old_signature":"EReference getAttribute_Dto()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EReference","new_signature":"EReference getRoot_Namespaces()","old_args":"","old_implementation":null,"old_return_type":"EReference","old_signature":"EReference getBlock_Entities()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String getName()","old_args":"","old_implementation":null,"old_return_type":"EList","old_signature":"EList getBlocks()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EReference","new_signature":"EReference getStructuredType_AssociatedTypes()","old_args":"","old_implementation":null,"old_return_type":"EReference","old_signature":"EReference getDTO_AssociatedTypes()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EReference","new_signature":"EReference getStructuredType_References()","old_args":"","old_implementation":null,"old_return_type":"EReference","old_signature":"EReference getDTO_Attributes()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EReference","new_signature":"EReference getStructuredType_Properties()","old_args":"","old_implementation":null,"old_return_type":"EReference","old_signature":"EReference getDTO_OwnedAttributes()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EReference","new_signature":"EReference getStructuredType_OwnedReferences()","old_args":"","old_implementation":null,"old_return_type":"EReference","old_signature":"EReference getDTO_OwnedReferences()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EReference","new_signature":"EReference getStructuredType_OwnedAttributes()","old_args":"","old_implementation":null,"old_return_type":"EReference","old_signature":"EReference getDTO_Properties()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EReference","new_signature":"EReference getStructuredType_Attributes()","old_args":"","old_implementation":null,"old_return_type":"EReference","old_signature":"EReference getDTO_References()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"MultiplicityKind","new_signature":"MultiplicityKind getMultiplicity()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int getLower()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EList","new_signature":"EList getNamespaces()","old_args":"","old_implementation":null,"old_return_type":"DTORegistry","old_signature":"DTORegistry getOwnedDtoRegistry()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EAttribute","new_signature":"EAttribute getParameter_Multiplicity()","old_args":"","old_implementation":null,"old_return_type":"EAttribute","old_signature":"EAttribute getParameter_Lower()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EReference","new_signature":"EReference getReference_ReferencedType()","old_args":"","old_implementation":null,"old_return_type":"EReference","old_signature":"EReference getReference_Dto()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EReference","new_signature":"EReference getReference_ContainingType()","old_args":"","old_implementation":null,"old_return_type":"EReference","old_signature":"EReference getReference_Type()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EAttribute","new_signature":"EAttribute getRoot_Name()","old_args":"","old_implementation":null,"old_return_type":"EReference","old_signature":"EReference getRoot_Blocks()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EReference","new_signature":"EReference getSystem_Namespaces()","old_args":"","old_implementation":null,"old_return_type":"EReference","old_signature":"EReference getSystem_OwnedDtoRegistry()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"StructuredType","new_signature":"StructuredType getContainingType()","old_args":"","old_implementation":null,"old_return_type":"DTO","old_signature":"DTO getType()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EObject","new_signature":"EObject getReferencedType()","old_args":"","old_implementation":null,"old_return_type":"EObject","old_signature":"EObject getType()"},{"name":"obeonetwork$informationsystem","new_args":"","new_implementation":null,"new_return_type":"EObject","new_signature":"EObject getReferencedType()","old_args":"","old_implementation":null,"old_return_type":"EObject","old_signature":"EObject getType()"},{"name":"obeonetwork$informationsystem","new_args":"EObjectFlatComboSettings settings","new_implementation":null,"new_return_type":"void","new_signature":"void initReferencedType(EObjectFlatComboSettings settings)","old_args":"EObjectFlatComboSettings settings","old_implementation":null,"old_return_type":"void","old_signature":"void initType(EObjectFlatComboSettings settings)"},{"name":"obeonetwork$informationsystem","new_args":"EObjectFlatComboSettings settings","new_implementation":null,"new_return_type":"void","new_signature":"void initReferencedType(EObjectFlatComboSettings settings)","old_args":"EObjectFlatComboSettings settings","old_implementation":null,"old_return_type":"void","old_signature":"void initType(EObjectFlatComboSettings settings)"},{"name":"obeonetwork$informationsystem","new_args":"StructuredType newType","new_implementation":null,"new_return_type":"void","new_signature":"void setReferencedType(StructuredType newType)","old_args":"DTO newType","old_implementation":null,"old_return_type":"void","old_signature":"void setType(DTO newType)"},{"name":"obeonetwork$informationsystem","new_args":"EObject newValue","new_implementation":"referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","new_return_type":"void","new_signature":"void setReferencedType(EObject newValue)","old_args":"EObject newValue","old_implementation":"type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","old_return_type":"void","old_signature":"void setType(EObject newValue)"},{"name":"obeonetwork$informationsystem","new_args":"EObject newValue","new_implementation":"referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","new_return_type":"void","new_signature":"void setReferencedType(EObject newValue)","old_args":"EObject newValue","old_implementation":"type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","old_return_type":"void","old_signature":"void setType(EObject newValue)"},{"name":"obeonetwork$informationsystem","new_args":"ButtonsModeEnum newValue","new_implementation":null,"new_return_type":"void","new_signature":"void setReferencedTypeButtonMode(ButtonsModeEnum newValue)","old_args":"ButtonsModeEnum newValue","old_implementation":null,"old_return_type":"void","old_signature":"void setTypeButtonMode(ButtonsModeEnum newValue)"},{"name":"obeonetwork$informationsystem","new_args":"ButtonsModeEnum newValue","new_implementation":null,"new_return_type":"void","new_signature":"void setReferencedTypeButtonMode(ButtonsModeEnum newValue)","old_args":"ButtonsModeEnum newValue","old_implementation":null,"old_return_type":"void","old_signature":"void setTypeButtonMode(ButtonsModeEnum newValue)"},{"name":"obeonetwork$informationsystem","new_args":"Enumerator newValue","new_implementation":null,"new_return_type":"void","new_signature":"void setMultiplicity(Enumerator newValue)","old_args":"String newValue","old_implementation":null,"old_return_type":"void","old_signature":"void setUpper(String newValue)"},{"name":"obeonetwork$informationsystem","new_args":"Enumerator newValue","new_implementation":null,"new_return_type":"void","new_signature":"void setMultiplicity(Enumerator newValue)","old_args":"String newValue","old_implementation":null,"old_return_type":"void","old_signature":"void setUpper(String newValue)"}],"string":"[\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"Object object\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void addReferencedTypePropertyDescriptor(Object object)\",\n \"old_args\": \"Object object\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void addTypePropertyDescriptor(Object object)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"Object object\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void addMultiplicityPropertyDescriptor(Object object)\",\n \"old_args\": \"Object object\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void addUpperPropertyDescriptor(Object object)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"Composite parent\",\n \"new_implementation\": \"createDescription(parent, EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentMessages.ReferencePropertiesEditionPart_ReferencedTypeLabel);\\n\\t\\treferencedType = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND));\\n\\t\\treferencedType.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\\n\\t\\treferencedType.addSelectionChangedListener(new ISelectionChangedListener() {\\n\\t\\t\\t\\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.referencedType, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getReferencedType()));\\n\\t\\tGridData referencedTypeData = new GridData(GridData.FILL_HORIZONTAL);\\n\\t\\treferencedType.setLayoutData(referencedTypeData);\\n\\t\\treferencedType.setID(EnvironmentViewsRepository.Reference.Properties.referencedType);\\n\\t\\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\\n\\t\\t// Start of user code for createReferencedTypeFlatComboViewer\\n\\tprotected Composite createIdentifierCheckbox(Composite parent) {\\n\\t\\tidentifier = new Button(parent, SWT.CHECK);\\n\\t\\tidentifier.setText(getDescription(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentMessages.ReferencePropertiesEditionPart_IdentifierLabel));\\n\\t\\tidentifier.addSelectionListener(new SelectionAdapter() {\\n\\n\\t\\t\\t/**\\n\\t\\t\\t * {@inheritDoc\",\n \"new_return_type\": \"Composite\",\n \"new_signature\": \"Composite createReferencedTypeFlatComboViewer(Composite parent)\",\n \"old_args\": \"Composite parent\",\n \"old_implementation\": \"createDescription(parent, EnvironmentViewsRepository.Reference.Properties.type, EnvironmentMessages.ReferencePropertiesEditionPart_TypeLabel);\\n\\t\\ttype = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND));\\n\\t\\ttype.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\\n\\t\\ttype.addSelectionChangedListener(new ISelectionChangedListener() {\\n\\t\\t\\t\\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.type, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getType()));\\n\\t\\tGridData typeData = new GridData(GridData.FILL_HORIZONTAL);\\n\\t\\ttype.setLayoutData(typeData);\\n\\t\\ttype.setID(EnvironmentViewsRepository.Reference.Properties.type);\\n\\t\\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\\n\\t\\t// Start of user code for createTypeFlatComboViewer\\n\\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getType()\\n\\tpublic EObject getType() {\\n\\t\\tif (type.getSelection() instanceof StructuredSelection) {\\n\\t\\t\\tObject firstElement = ((StructuredSelection) type.getSelection()).getFirstElement();\\n\\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initType(EObjectFlatComboSettings)\\n\\tpublic void initType(EObjectFlatComboSettings settings) {\\n\\t\\ttype.setInput(settings);\\n\\t\\t\\ttype.setSelection(new StructuredSelection(settings.getValue()));\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\\n\\t\\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\\n\\t\\t\\ttype.setEnabled(false);\\n\\t\\t\\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"old_return_type\": \"Composite\",\n \"old_signature\": \"Composite createTypeFlatComboViewer(Composite parent)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"Composite parent,FormToolkit widgetFactory\",\n \"new_implementation\": null,\n \"new_return_type\": \"Composite\",\n \"new_signature\": \"Composite createReferencedTypeFlatComboViewer(Composite parent,FormToolkit widgetFactory)\",\n \"old_args\": \"Composite parent,FormToolkit widgetFactory\",\n \"old_implementation\": null,\n \"old_return_type\": \"Composite\",\n \"old_signature\": \"Composite createTypeFlatComboViewer(Composite parent,FormToolkit widgetFactory)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"ViewerFilter filter\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void addBusinessFilterToReferencedType(ViewerFilter filter)\",\n \"old_args\": \"ViewerFilter filter\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void addBusinessFilterToType(ViewerFilter filter)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"ViewerFilter filter\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void addBusinessFilterToReferencedType(ViewerFilter filter)\",\n \"old_args\": \"ViewerFilter filter\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void addBusinessFilterToType(ViewerFilter filter)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"ViewerFilter filter\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void addFilterToReferencedType(ViewerFilter filter)\",\n \"old_args\": \"ViewerFilter filter\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void addFilterToType(ViewerFilter filter)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"ViewerFilter filter\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void addFilterToReferencedType(ViewerFilter filter)\",\n \"old_args\": \"ViewerFilter filter\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void addFilterToType(ViewerFilter filter)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"StructuredType\",\n \"new_signature\": \"StructuredType basicGetContainingType()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"DTO\",\n \"old_signature\": \"DTO basicGetType()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"StructuredType newContainingType,NotificationChain msgs\",\n \"new_implementation\": null,\n \"new_return_type\": \"NotificationChain\",\n \"new_signature\": \"NotificationChain basicSetContainingType(StructuredType newContainingType,NotificationChain msgs)\",\n \"old_args\": \"DTO newDto,NotificationChain msgs\",\n \"old_implementation\": null,\n \"old_return_type\": \"NotificationChain\",\n \"old_signature\": \"NotificationChain basicSetDto(DTO newDto,NotificationChain msgs)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"StructuredType newContainingType,NotificationChain msgs\",\n \"new_implementation\": null,\n \"new_return_type\": \"NotificationChain\",\n \"new_signature\": \"NotificationChain basicSetContainingType(StructuredType newContainingType,NotificationChain msgs)\",\n \"old_args\": \"DTO newDto,NotificationChain msgs\",\n \"old_implementation\": null,\n \"old_return_type\": \"NotificationChain\",\n \"old_signature\": \"NotificationChain basicSetDto(DTO newDto,NotificationChain msgs)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"TypesDefinition object\",\n \"new_implementation\": null,\n \"new_return_type\": \"T\",\n \"new_signature\": \"T caseTypesDefinition(TypesDefinition object)\",\n \"old_args\": \"Reference object\",\n \"old_implementation\": null,\n \"old_return_type\": \"T\",\n \"old_signature\": \"T caseReference(Reference object)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Adapter\",\n \"new_signature\": \"Adapter createTypesDefinitionAdapter()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Adapter\",\n \"old_signature\": \"Adapter createReferenceAdapter()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Adapter\",\n \"new_signature\": \"Adapter createTypesDefinitionAdapter()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Adapter\",\n \"old_signature\": \"Adapter createReferenceAdapter()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EReference\",\n \"new_signature\": \"EReference getAttribute_ContainingType()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EReference\",\n \"old_signature\": \"EReference getAttribute_Dto()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EReference\",\n \"new_signature\": \"EReference getRoot_Namespaces()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EReference\",\n \"old_signature\": \"EReference getBlock_Entities()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String getName()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EList\",\n \"old_signature\": \"EList getBlocks()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EReference\",\n \"new_signature\": \"EReference getStructuredType_AssociatedTypes()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EReference\",\n \"old_signature\": \"EReference getDTO_AssociatedTypes()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EReference\",\n \"new_signature\": \"EReference getStructuredType_References()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EReference\",\n \"old_signature\": \"EReference getDTO_Attributes()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EReference\",\n \"new_signature\": \"EReference getStructuredType_Properties()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EReference\",\n \"old_signature\": \"EReference getDTO_OwnedAttributes()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EReference\",\n \"new_signature\": \"EReference getStructuredType_OwnedReferences()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EReference\",\n \"old_signature\": \"EReference getDTO_OwnedReferences()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EReference\",\n \"new_signature\": \"EReference getStructuredType_OwnedAttributes()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EReference\",\n \"old_signature\": \"EReference getDTO_Properties()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EReference\",\n \"new_signature\": \"EReference getStructuredType_Attributes()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EReference\",\n \"old_signature\": \"EReference getDTO_References()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"MultiplicityKind\",\n \"new_signature\": \"MultiplicityKind getMultiplicity()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int getLower()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EList\",\n \"new_signature\": \"EList getNamespaces()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"DTORegistry\",\n \"old_signature\": \"DTORegistry getOwnedDtoRegistry()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EAttribute\",\n \"new_signature\": \"EAttribute getParameter_Multiplicity()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EAttribute\",\n \"old_signature\": \"EAttribute getParameter_Lower()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EReference\",\n \"new_signature\": \"EReference getReference_ReferencedType()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EReference\",\n \"old_signature\": \"EReference getReference_Dto()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EReference\",\n \"new_signature\": \"EReference getReference_ContainingType()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EReference\",\n \"old_signature\": \"EReference getReference_Type()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EAttribute\",\n \"new_signature\": \"EAttribute getRoot_Name()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EReference\",\n \"old_signature\": \"EReference getRoot_Blocks()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EReference\",\n \"new_signature\": \"EReference getSystem_Namespaces()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EReference\",\n \"old_signature\": \"EReference getSystem_OwnedDtoRegistry()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"StructuredType\",\n \"new_signature\": \"StructuredType getContainingType()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"DTO\",\n \"old_signature\": \"DTO getType()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EObject\",\n \"new_signature\": \"EObject getReferencedType()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EObject\",\n \"old_signature\": \"EObject getType()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EObject\",\n \"new_signature\": \"EObject getReferencedType()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EObject\",\n \"old_signature\": \"EObject getType()\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"EObjectFlatComboSettings settings\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void initReferencedType(EObjectFlatComboSettings settings)\",\n \"old_args\": \"EObjectFlatComboSettings settings\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void initType(EObjectFlatComboSettings settings)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"EObjectFlatComboSettings settings\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void initReferencedType(EObjectFlatComboSettings settings)\",\n \"old_args\": \"EObjectFlatComboSettings settings\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void initType(EObjectFlatComboSettings settings)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"StructuredType newType\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setReferencedType(StructuredType newType)\",\n \"old_args\": \"DTO newType\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setType(DTO newType)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"EObject newValue\",\n \"new_implementation\": \"referencedType.setSelection(new StructuredSelection(newValue));\\n\\t\\t\\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\\n\\t\\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\\n\\t\\t\\treferencedType.setEnabled(false);\\n\\t\\t\\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setReferencedType(EObject newValue)\",\n \"old_args\": \"EObject newValue\",\n \"old_implementation\": \"type.setSelection(new StructuredSelection(newValue));\\n\\t\\t\\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\\n\\t\\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\\n\\t\\t\\ttype.setEnabled(false);\\n\\t\\t\\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setType(EObject newValue)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"EObject newValue\",\n \"new_implementation\": \"referencedType.setSelection(new StructuredSelection(newValue));\\n\\t\\t\\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\\n\\t\\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\\n\\t\\t\\treferencedType.setEnabled(false);\\n\\t\\t\\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setReferencedType(EObject newValue)\",\n \"old_args\": \"EObject newValue\",\n \"old_implementation\": \"type.setSelection(new StructuredSelection(newValue));\\n\\t\\t\\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\\n\\t\\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\\n\\t\\t\\ttype.setEnabled(false);\\n\\t\\t\\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setType(EObject newValue)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"ButtonsModeEnum newValue\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setReferencedTypeButtonMode(ButtonsModeEnum newValue)\",\n \"old_args\": \"ButtonsModeEnum newValue\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setTypeButtonMode(ButtonsModeEnum newValue)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"ButtonsModeEnum newValue\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setReferencedTypeButtonMode(ButtonsModeEnum newValue)\",\n \"old_args\": \"ButtonsModeEnum newValue\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setTypeButtonMode(ButtonsModeEnum newValue)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"Enumerator newValue\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setMultiplicity(Enumerator newValue)\",\n \"old_args\": \"String newValue\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setUpper(String newValue)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"Enumerator newValue\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setMultiplicity(Enumerator newValue)\",\n \"old_args\": \"String newValue\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setUpper(String newValue)\"\n }\n]"},"files":{"kind":"list like","value":[{"additions":2,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/designs%2Fcinematic%2Fplugins%2Forg.obeonetwork.dsl.cinematic.design%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fcinematic%2Fdesign%2Fservices%2FCinematicBindingServices.java","changes":4,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/designs%2Fcinematic%2Fplugins%2Forg.obeonetwork.dsl.cinematic.design%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fcinematic%2Fdesign%2Fservices%2FCinematicBindingServices.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":2,"filename":"designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/src/org/obeonetwork/dsl/cinematic/design/services/CinematicBindingServices.java","new_code":"\t\t\treturn attribute.getContainingType().getName() + \".\" + attribute.getName() + \" (DTO Attribute)\";\n\t\t\treturn reference.getContainingType().getName() + \".\" + reference.getName() + \" (DTO Reference)\";","new_methods":[],"old_code":"\t\t\treturn attribute.getDto().getName() + \".\" + attribute.getName() + \" (DTO Attribute)\";\n\t\t\treturn reference.getDto().getName() + \".\" + reference.getName() + \" (DTO Reference)\";","old_methods":[],"patch":"@@ -46,10 +46,10 @@ public String getCinematicBindingInfoLabel(BindingInfo bindingInfo) {\n \t\t\treturn ((DTO) element).getName() + \" (DTO)\";\n \t\t} else if (element instanceof Attribute) {\n \t\t\tAttribute attribute = (Attribute) element;\n-\t\t\treturn attribute.getDto().getName() + \".\" + attribute.getName() + \" (DTO Attribute)\";\n+\t\t\treturn attribute.getContainingType().getName() + \".\" + attribute.getName() + \" (DTO Attribute)\";\n \t\t} else if (element instanceof Reference) {\n \t\t\tReference reference = (Reference) element;\n-\t\t\treturn reference.getDto().getName() + \".\" + reference.getName() + \" (DTO Reference)\";\n+\t\t\treturn reference.getContainingType().getName() + \".\" + reference.getName() + \" (DTO Reference)\";\n \t\t} else if (element.eClass().getEPackage().getNsURI().startsWith(\"http://www.obeonetwork.org/dsl/entity/\")) {\n \t\t\tif (\"Entity\".equals(element.eClass().getName())) {\n \t\t\t\treturn getNameByReflection(element) + \" (Entity)\";","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/designs%2Fcinematic%2Fplugins%2Forg.obeonetwork.dsl.cinematic.design%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fcinematic%2Fdesign%2Fservices%2FCinematicBindingServices.java","sha":"ed51d06c83432305143753f751d3f8509bc621b4","status":"modified"},{"additions":2,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2FMETA-INF%2FMANIFEST.MF","changes":3,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":1,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/META-INF/MANIFEST.MF","new_code":"Bundle-SymbolicName: org.obeonetwork.dsl.entity.edit;singleton:=true\n org.obeonetwork.dsl.environment;visibility:=reexport,","new_methods":[],"old_code":"Bundle-SymbolicName: org.obeonetwork.dsl.entity.edit; singleton:=true","old_methods":[],"patch":"@@ -1,7 +1,7 @@\n Manifest-Version: 1.0\n Bundle-ManifestVersion: 2\n Bundle-Name: %pluginName\n-Bundle-SymbolicName: org.obeonetwork.dsl.entity.edit; singleton:=true\n+Bundle-SymbolicName: org.obeonetwork.dsl.entity.edit;singleton:=true\n Bundle-Version: 2.4.0.qualifier\n Bundle-ClassPath: .\n Bundle-Activator: org.obeonetwork.dsl.entity.provider.EntityEditPlugin$Implementation\n@@ -11,6 +11,7 @@ Export-Package: org.obeonetwork.dsl.entity.extensionUtilities.provider,\n org.obeonetwork.dsl.entity.provider\n Require-Bundle: org.eclipse.core.runtime,\n org.eclipse.emf.edit;visibility:=reexport,\n+ org.obeonetwork.dsl.environment;visibility:=reexport,\n org.obeonetwork.dsl.environment.edit,\n org.obeonetwork.dsl.entity;visibility:=reexport,\n org.eclipse.emf.eef.runtime","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2FMETA-INF%2FMANIFEST.MF","sha":"429297f9e6afdc41c20a48bda9e3acc81483f593","status":"modified"},{"additions":3,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fmodels%2Fentity.components","changes":129,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fmodels%2Fentity.components?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":126,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/models/entity.components","new_code":" \n \n ","new_methods":[],"old_code":" \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n ","old_methods":[],"patch":"@@ -4,7 +4,7 @@\n \n \n \n- \n+ \n \n \n \n@@ -14,24 +14,12 @@\n \n \n \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n \n \n \n \n \n- \n+ \n \n \n \n@@ -53,63 +41,12 @@\n \n \n \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n \n \n \n \n \n- \n+ \n \n \n \n@@ -164,17 +101,6 @@\n \n \n \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n \n \n \n@@ -201,55 +127,6 @@\n \n \n \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n \n \n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fmodels%2Fentity.components","sha":"273abc205279c952d528547cdda9f37623565d15","status":"modified"},{"additions":2,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.properties","changes":2,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/plugin.properties","new_code":"_UI_Root_namespaces_feature = Namespaces\n_UI_Root_name_feature = Name","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -112,3 +112,5 @@ _UI_InheritanceKind_TABLE_PER_SUBCLASS_literal = TABLE_PER_SUBCLASS\n _UI_InheritanceKind_TABLE_PER_CLASS_HIERARCHY_literal = TABLE_PER_CLASS_HIERARCHY\n _UI_Property_isPrimaryKey_feature = Is Primary Key\n _UI_Finder_multiplicity_feature = Multiplicity\n+_UI_Root_namespaces_feature = Namespaces\n+_UI_Root_name_feature = Name","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.properties","sha":"1ddac1ae70392d80687f0bc5cdd81b69b1850462","status":"modified"},{"additions":13,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.xml","changes":13,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/plugin.xml","new_code":"\n \n \n \n ","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -21,6 +21,19 @@\n org.eclipse.emf.edit.provider.IItemLabelProvider\n org.eclipse.emf.edit.provider.IItemPropertySource\" />\n \n+\n+ \n+ \n+ \n+ \n \n \n \n\n \n \n\n \n \n\n \n \n \n \n \n \n \n \n \n \n \n ","old_methods":[],"patch":"@@ -6,7 +6,7 @@\n \n \n \n \n@@ -51,30 +51,12 @@\n afterTab=\"Root\">\n \n \n- \n- \n-\n \n \n \n- \n- \n-\n- \n- \n-\n \n \n- \n- \n- \n- \n \n \n- \n- \n- \n- \n- \n- \n- \n- \n J�r�me Benois\n\t\t\treturn EntityPackage.eINSTANCE.getRoot_Name();\n\t\t\tif (EntityPackage.eINSTANCE.getRoot_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && rootPart != null && isAccessible(EntityViewsRepository.Root.Properties.name)) {\n\t\t\tEntityPackage.eINSTANCE.getRoot_Name(),\n\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EntityPackage.eINSTANCE.getRoot_Name().getEAttributeType(), (String)newValue);\n\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EntityPackage.eINSTANCE.getRoot_Name().getEAttributeType(), newValue);","new_methods":[],"old_code":" * @author J�r�me Benois\n\t\t\treturn EnvironmentPackage.eINSTANCE.getNamespace_Name();\n\t\t\tif (EnvironmentPackage.eINSTANCE.getNamespace_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && rootPart != null && isAccessible(EntityViewsRepository.Root.Properties.name)) {\n\t\t\tEnvironmentPackage.eINSTANCE.getNamespace_Name(),\n\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EnvironmentPackage.eINSTANCE.getNamespace_Name().getEAttributeType(), (String)newValue);\n\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EnvironmentPackage.eINSTANCE.getNamespace_Name().getEAttributeType(), newValue);","old_methods":[],"patch":"@@ -27,6 +27,7 @@\n import org.eclipse.emf.eef.runtime.context.PropertiesEditingContext;\n import org.eclipse.emf.eef.runtime.impl.components.SinglePartPropertiesEditingComponent;\n import org.eclipse.emf.eef.runtime.impl.utils.EEFConverterUtil;\n+import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.Root;\n import org.obeonetwork.dsl.entity.parts.EntityViewsRepository;\n import org.obeonetwork.dsl.entity.parts.RootPropertiesEditionPart;\n@@ -36,7 +37,7 @@\n // End of user code\n \n /**\n- * @author J�r�me Benois\n+ * @author J�r�me Benois\n * \n */\n public class RootRootPropertiesEditionComponent extends SinglePartPropertiesEditingComponent {\n@@ -98,7 +99,7 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource)\n \t */\n \tpublic EStructuralFeature associatedFeature(Object editorKey) {\n \t\tif (editorKey == EntityViewsRepository.Root.Properties.name) {\n-\t\t\treturn EnvironmentPackage.eINSTANCE.getNamespace_Name();\n+\t\t\treturn EntityPackage.eINSTANCE.getRoot_Name();\n \t\t}\n \t\tif (editorKey == EntityViewsRepository.Root.Properties.description) {\n \t\t\treturn EnvironmentPackage.eINSTANCE.getObeoDSMObject_Description();\n@@ -129,7 +130,7 @@ public void updatePart(Notification msg) {\n \t\tsuper.updatePart(msg);\n \t\tif (editingPart.isVisible()) {\n \t\t\tRootPropertiesEditionPart rootPart = (RootPropertiesEditionPart)editingPart;\n-\t\t\tif (EnvironmentPackage.eINSTANCE.getNamespace_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && rootPart != null && isAccessible(EntityViewsRepository.Root.Properties.name)) {\n+\t\t\tif (EntityPackage.eINSTANCE.getRoot_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && rootPart != null && isAccessible(EntityViewsRepository.Root.Properties.name)) {\n \t\t\t\tif (msg.getNewValue() != null) {\n \t\t\t\t\trootPart.setName(EcoreUtil.convertToString(EcorePackage.Literals.ESTRING, msg.getNewValue()));\n \t\t\t\t} else {\n@@ -155,7 +156,7 @@ public void updatePart(Notification msg) {\n \t@Override\n \tprotected NotificationFilter[] getNotificationFilters() {\n \t\tNotificationFilter filter = new EStructuralFeatureNotificationFilter(\n-\t\t\tEnvironmentPackage.eINSTANCE.getNamespace_Name(),\n+\t\t\tEntityPackage.eINSTANCE.getRoot_Name(),\n \t\t\tEnvironmentPackage.eINSTANCE.getObeoDSMObject_Description()\t\t);\n \t\treturn new NotificationFilter[] {filter,};\n \t}\n@@ -174,9 +175,9 @@ public Diagnostic validateValue(IPropertiesEditionEvent event) {\n \t\t\t\tif (EntityViewsRepository.Root.Properties.name == event.getAffectedEditor()) {\n \t\t\t\t\tObject newValue = event.getNewValue();\n \t\t\t\t\tif (newValue instanceof String) {\n-\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EnvironmentPackage.eINSTANCE.getNamespace_Name().getEAttributeType(), (String)newValue);\n+\t\t\t\t\t\tnewValue = EEFConverterUtil.createFromString(EntityPackage.eINSTANCE.getRoot_Name().getEAttributeType(), (String)newValue);\n \t\t\t\t\t}\n-\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EnvironmentPackage.eINSTANCE.getNamespace_Name().getEAttributeType(), newValue);\n+\t\t\t\t\tret = Diagnostician.INSTANCE.validate(EntityPackage.eINSTANCE.getRoot_Name().getEAttributeType(), newValue);\n \t\t\t\t}\n \t\t\t\tif (EntityViewsRepository.Root.Properties.description == event.getAffectedEditor()) {\n \t\t\t\t\tObject newValue = event.getNewValue();","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FRootRootPropertiesEditionComponent.java","sha":"a7291f6c66f42aa01c29370a88881fabeaeb2d9f","status":"modified"},{"additions":0,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fparts%2FEntityViewsRepository.java","changes":81,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fparts%2FEntityViewsRepository.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":81,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/parts/EntityViewsRepository.java","new_code":"","new_methods":[],"old_code":"\t/**\n\t * Block view descriptor\n\t * \n\t */\n\tpublic static class Block {\n\t\tpublic static class Properties {\n\t\n\t\t\t\n\t\t\tpublic static String name = \"entity::Block::properties::name\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String description = \"entity::Block::properties::description\";\n\t\t\t\n\t\n\t\t}\n\t\n\t}\n\n\t/**\n\t * Attribute view descriptor\n\t * \n\t */\n\tpublic static class Attribute {\n\t\tpublic static class Properties {\n\t\n\t\t\t\n\t\t\tpublic static String name = \"entity::Attribute::properties::name\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String type = \"entity::Attribute::properties::type\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String multiplicity = \"entity::Attribute::properties::multiplicity\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String isPrimaryKey = \"entity::Attribute::properties::isPrimaryKey\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String description = \"entity::Attribute::properties::description\";\n\t\t\t\n\t\n\t\t}\n\t\n\t}\n\n\t/**\n\t * Reference view descriptor\n\t * \n\t */\n\tpublic static class Reference {\n\t\tpublic static class Properties {\n\t\n\t\t\t\n\t\t\tpublic static String name = \"entity::Reference::properties::name\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String type = \"entity::Reference::properties::type\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String multiplicity = \"entity::Reference::properties::multiplicity\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String isPrimaryKey = \"entity::Reference::properties::isPrimaryKey\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String isComposite = \"entity::Reference::properties::isComposite\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String navigable = \"entity::Reference::properties::navigable\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String oppositeOf = \"entity::Reference::properties::oppositeOf\";\n\t\t\t\n\t\t\t\n\t\t\tpublic static String description = \"entity::Reference::properties::description\";\n\t\t\t\n\t\n\t\t}\n\t\n\t}\n","old_methods":[],"patch":"@@ -39,24 +39,6 @@ public static class Properties {\n \t\n \t}\n \n-\t/**\n-\t * Block view descriptor\n-\t * \n-\t */\n-\tpublic static class Block {\n-\t\tpublic static class Properties {\n-\t\n-\t\t\t\n-\t\t\tpublic static String name = \"entity::Block::properties::name\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String description = \"entity::Block::properties::description\";\n-\t\t\t\n-\t\n-\t\t}\n-\t\n-\t}\n-\n \t/**\n \t * Entity view descriptor\n \t * \n@@ -90,69 +72,6 @@ public static class Properties {\n \t\n \t}\n \n-\t/**\n-\t * Attribute view descriptor\n-\t * \n-\t */\n-\tpublic static class Attribute {\n-\t\tpublic static class Properties {\n-\t\n-\t\t\t\n-\t\t\tpublic static String name = \"entity::Attribute::properties::name\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String type = \"entity::Attribute::properties::type\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String multiplicity = \"entity::Attribute::properties::multiplicity\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String isPrimaryKey = \"entity::Attribute::properties::isPrimaryKey\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String description = \"entity::Attribute::properties::description\";\n-\t\t\t\n-\t\n-\t\t}\n-\t\n-\t}\n-\n-\t/**\n-\t * Reference view descriptor\n-\t * \n-\t */\n-\tpublic static class Reference {\n-\t\tpublic static class Properties {\n-\t\n-\t\t\t\n-\t\t\tpublic static String name = \"entity::Reference::properties::name\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String type = \"entity::Reference::properties::type\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String multiplicity = \"entity::Reference::properties::multiplicity\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String isPrimaryKey = \"entity::Reference::properties::isPrimaryKey\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String isComposite = \"entity::Reference::properties::isComposite\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String navigable = \"entity::Reference::properties::navigable\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String oppositeOf = \"entity::Reference::properties::oppositeOf\";\n-\t\t\t\n-\t\t\t\n-\t\t\tpublic static String description = \"entity::Reference::properties::description\";\n-\t\t\t\n-\t\n-\t\t}\n-\t\n-\t}\n-\n \t/**\n \t * Finder view descriptor\n \t * ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fparts%2FEntityViewsRepository.java","sha":"c8221c3ac9d2796b1e3ea938864e4713003e5ed2","status":"modified"},{"additions":4,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityEEFAdapterFactory.java","changes":38,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityEEFAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":34,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java","new_code":"import org.obeonetwork.dsl.environment.providers.TypesDefinitionPropertiesEditionProvider;\n\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createTypesDefinitionAdapter()\n\tpublic Adapter createTypesDefinitionAdapter() {\n\t\treturn new TypesDefinitionPropertiesEditionProvider(providers);","new_methods":[],"old_code":"import org.obeonetwork.dsl.environment.providers.NamespacePropertiesEditionProvider;\n\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createNamespaceAdapter()\n\tpublic Adapter createNamespaceAdapter() {\n\t\treturn new NamespacePropertiesEditionProvider(providers);\n\t/**\n\t * {@inheritDoc}\n\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createBlockAdapter()\n\t * \n\t */\n\tpublic Adapter createBlockAdapter() {\n\t\tList providers = new ArrayList(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new BlockPropertiesEditionProvider(providers);\n\t}\n\t/**\n\t * {@inheritDoc}\n\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createAttributeAdapter()\n\t * \n\t */\n\tpublic Adapter createAttributeAdapter() {\n\t\tList providers = new ArrayList(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new AttributePropertiesEditionProvider(providers);\n\t}\n\t/**\n\t * {@inheritDoc}\n\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createReferenceAdapter()\n\t * \n\t */\n\tpublic Adapter createReferenceAdapter() {\n\t\tList providers = new ArrayList(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new ReferencePropertiesEditionProvider(providers);\n\t}","old_methods":[{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java","implementation":"return new NamespacePropertiesEditionProvider(providers);\n\t/**\n\t * {@inheritDoc","signature":"Adapter createNamespaceAdapter()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java","implementation":"List providers = new ArrayList(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new BlockPropertiesEditionProvider(providers);","signature":"Adapter createBlockAdapter()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java","implementation":"List providers = new ArrayList(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new AttributePropertiesEditionProvider(providers);","signature":"Adapter createAttributeAdapter()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java","implementation":"List providers = new ArrayList(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new ReferencePropertiesEditionProvider(providers);","signature":"Adapter createReferenceAdapter()"}],"patch":"@@ -20,7 +20,7 @@\n import org.obeonetwork.dsl.entity.util.EntityAdapterFactory;\n \n import org.obeonetwork.dsl.environment.providers.MetadataCptPropertiesEditionProvider;\n-import org.obeonetwork.dsl.environment.providers.NamespacePropertiesEditionProvider;\n+import org.obeonetwork.dsl.environment.providers.TypesDefinitionPropertiesEditionProvider;\n \n /**\n * @author J�r�me Benois\n@@ -38,13 +38,13 @@ public Adapter createObeoDSMObjectAdapter() {\n \t}\n \t/**\n \t * {@inheritDoc}\n-\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createNamespaceAdapter()\n+\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createTypesDefinitionAdapter()\n \t * \n \t */\n-\tpublic Adapter createNamespaceAdapter() {\n+\tpublic Adapter createTypesDefinitionAdapter() {\n \t\tList providers = new ArrayList(1);\n \t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n-\t\treturn new NamespacePropertiesEditionProvider(providers);\n+\t\treturn new TypesDefinitionPropertiesEditionProvider(providers);\n \t}\n \t/**\n \t * {@inheritDoc}\n@@ -56,16 +56,6 @@ public Adapter createRootAdapter() {\n \t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n \t\treturn new RootPropertiesEditionProvider(providers);\n \t}\n-\t/**\n-\t * {@inheritDoc}\n-\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createBlockAdapter()\n-\t * \n-\t */\n-\tpublic Adapter createBlockAdapter() {\n-\t\tList providers = new ArrayList(1);\n-\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n-\t\treturn new BlockPropertiesEditionProvider(providers);\n-\t}\n \t/**\n \t * {@inheritDoc}\n \t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createEntityAdapter()\n@@ -76,26 +66,6 @@ public Adapter createEntityAdapter() {\n \t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n \t\treturn new EntityPropertiesEditionProvider(providers);\n \t}\n-\t/**\n-\t * {@inheritDoc}\n-\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createAttributeAdapter()\n-\t * \n-\t */\n-\tpublic Adapter createAttributeAdapter() {\n-\t\tList providers = new ArrayList(1);\n-\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n-\t\treturn new AttributePropertiesEditionProvider(providers);\n-\t}\n-\t/**\n-\t * {@inheritDoc}\n-\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createReferenceAdapter()\n-\t * \n-\t */\n-\tpublic Adapter createReferenceAdapter() {\n-\t\tList providers = new ArrayList(1);\n-\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n-\t\treturn new ReferencePropertiesEditionProvider(providers);\n-\t}\n \t/**\n \t * {@inheritDoc}\n \t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createFinderAdapter()","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityEEFAdapterFactory.java","sha":"d416f42f72465ced8bd8f084166ece0fa9246bab","status":"modified"},{"additions":0,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityMessages.java","changes":72,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityMessages.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":72,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityMessages.java","new_code":"","new_methods":[],"old_code":"\tpublic static String BlockPropertiesEditionPart_PropertiesGroupLabel;\n\n\t\n\tpublic static String AttributePropertiesEditionPart_PropertiesGroupLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_PropertiesGroupLabel;\n\n\t\n\tpublic static String Block_ReadOnly;\n\n\t\n\tpublic static String Block_Part_Title;\n\n\t\n\tpublic static String Attribute_ReadOnly;\n\n\t\n\tpublic static String Attribute_Part_Title;\n\n\t\n\tpublic static String Reference_ReadOnly;\n\n\t\n\tpublic static String Reference_Part_Title;\n\n\t\n\tpublic static String BlockPropertiesEditionPart_NameLabel;\n\n\t\n\tpublic static String BlockPropertiesEditionPart_DescriptionLabel;\n\n\t\n\tpublic static String AttributePropertiesEditionPart_NameLabel;\n\n\t\n\tpublic static String AttributePropertiesEditionPart_TypeLabel;\n\n\t\n\tpublic static String AttributePropertiesEditionPart_MultiplicityLabel;\n\n\t\n\tpublic static String AttributePropertiesEditionPart_IsPrimaryKeyLabel;\n\n\t\n\tpublic static String AttributePropertiesEditionPart_DescriptionLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_NameLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_TypeLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_MultiplicityLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_IsPrimaryKeyLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_IsCompositeLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_NavigableLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_OppositeOfLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_DescriptionLabel;\n\n\t","old_methods":[],"patch":"@@ -24,18 +24,9 @@ public class EntityMessages extends NLS {\n \tpublic static String RootPropertiesEditionPart_PropertiesGroupLabel;\n \n \t\n-\tpublic static String BlockPropertiesEditionPart_PropertiesGroupLabel;\n-\n-\t\n \tpublic static String EntityPropertiesEditionPart_PropertiesGroupLabel;\n \n \t\n-\tpublic static String AttributePropertiesEditionPart_PropertiesGroupLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_PropertiesGroupLabel;\n-\n-\t\n \tpublic static String FinderPropertiesEditionPart_PropertiesGroupLabel;\n \n \t\n@@ -52,30 +43,12 @@ public class EntityMessages extends NLS {\n \tpublic static String Root_Part_Title;\n \n \t\n-\tpublic static String Block_ReadOnly;\n-\n-\t\n-\tpublic static String Block_Part_Title;\n-\n-\t\n \tpublic static String Entity_ReadOnly;\n \n \t\n \tpublic static String Entity_Part_Title;\n \n \t\n-\tpublic static String Attribute_ReadOnly;\n-\n-\t\n-\tpublic static String Attribute_Part_Title;\n-\n-\t\n-\tpublic static String Reference_ReadOnly;\n-\n-\t\n-\tpublic static String Reference_Part_Title;\n-\n-\t\n \tpublic static String Finder_ReadOnly;\n \n \t\n@@ -101,12 +74,6 @@ public class EntityMessages extends NLS {\n \tpublic static String RootPropertiesEditionPart_DescriptionLabel;\n \n \t\n-\tpublic static String BlockPropertiesEditionPart_NameLabel;\n-\n-\t\n-\tpublic static String BlockPropertiesEditionPart_DescriptionLabel;\n-\n-\t\n \tpublic static String EntityPropertiesEditionPart_NameLabel;\n \n \t\n@@ -128,45 +95,6 @@ public class EntityMessages extends NLS {\n \tpublic static String EntityPropertiesEditionPart_DescriptionLabel;\n \n \t\n-\tpublic static String AttributePropertiesEditionPart_NameLabel;\n-\n-\t\n-\tpublic static String AttributePropertiesEditionPart_TypeLabel;\n-\n-\t\n-\tpublic static String AttributePropertiesEditionPart_MultiplicityLabel;\n-\n-\t\n-\tpublic static String AttributePropertiesEditionPart_IsPrimaryKeyLabel;\n-\n-\t\n-\tpublic static String AttributePropertiesEditionPart_DescriptionLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_NameLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_TypeLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_MultiplicityLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_IsPrimaryKeyLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_IsCompositeLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_NavigableLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_OppositeOfLabel;\n-\n-\t\n-\tpublic static String ReferencePropertiesEditionPart_DescriptionLabel;\n-\n-\t\n \tpublic static String FinderPropertiesEditionPart_CustomizedNameLabel;\n \n \t","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityMessages.java","sha":"c32f38c4747367108f3fc7967b3a8ebd9ea22b09","status":"modified"},{"additions":0,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityPropertiesEditionPartProvider.java","changes":24,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityPropertiesEditionPartProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":24,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityPropertiesEditionPartProvider.java","new_code":"","new_methods":[],"old_code":"import org.obeonetwork.dsl.entity.parts.forms.AttributePropertiesEditionPartForm;\nimport org.obeonetwork.dsl.entity.parts.forms.BlockPropertiesEditionPartForm;\nimport org.obeonetwork.dsl.entity.parts.forms.ReferencePropertiesEditionPartForm;\nimport org.obeonetwork.dsl.entity.parts.impl.AttributePropertiesEditionPartImpl;\nimport org.obeonetwork.dsl.entity.parts.impl.BlockPropertiesEditionPartImpl;\nimport org.obeonetwork.dsl.entity.parts.impl.ReferencePropertiesEditionPartImpl;\n\t\tif (key == EntityViewsRepository.Block.class) {\n\t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n\t\t\t\treturn new BlockPropertiesEditionPartImpl(component);\n\t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n\t\t\t\treturn new BlockPropertiesEditionPartForm(component);\n\t\t}\n\t\tif (key == EntityViewsRepository.Attribute.class) {\n\t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n\t\t\t\treturn new AttributePropertiesEditionPartImpl(component);\n\t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n\t\t\t\treturn new AttributePropertiesEditionPartForm(component);\n\t\t}\n\t\tif (key == EntityViewsRepository.Reference.class) {\n\t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n\t\t\t\treturn new ReferencePropertiesEditionPartImpl(component);\n\t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n\t\t\t\treturn new ReferencePropertiesEditionPartForm(component);\n\t\t}","old_methods":[],"patch":"@@ -18,22 +18,16 @@\n \n import org.obeonetwork.dsl.entity.parts.EntityViewsRepository;\n \n-import org.obeonetwork.dsl.entity.parts.forms.AttributePropertiesEditionPartForm;\n-import org.obeonetwork.dsl.entity.parts.forms.BlockPropertiesEditionPartForm;\n import org.obeonetwork.dsl.entity.parts.forms.EntityPropertiesEditionPartForm;\n import org.obeonetwork.dsl.entity.parts.forms.ExternalCriterionPropertiesEditionPartForm;\n import org.obeonetwork.dsl.entity.parts.forms.FinderPropertiesEditionPartForm;\n import org.obeonetwork.dsl.entity.parts.forms.InternalCriterionPropertiesEditionPartForm;\n-import org.obeonetwork.dsl.entity.parts.forms.ReferencePropertiesEditionPartForm;\n import org.obeonetwork.dsl.entity.parts.forms.RootPropertiesEditionPartForm;\n \n-import org.obeonetwork.dsl.entity.parts.impl.AttributePropertiesEditionPartImpl;\n-import org.obeonetwork.dsl.entity.parts.impl.BlockPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.entity.parts.impl.EntityPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.entity.parts.impl.ExternalCriterionPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.entity.parts.impl.FinderPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.entity.parts.impl.InternalCriterionPropertiesEditionPartImpl;\n-import org.obeonetwork.dsl.entity.parts.impl.ReferencePropertiesEditionPartImpl;\n import org.obeonetwork.dsl.entity.parts.impl.RootPropertiesEditionPartImpl;\n \n /**\n@@ -63,30 +57,12 @@ public IPropertiesEditionPart getPropertiesEditionPart(Object key, int kind, IPr\n \t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n \t\t\t\treturn new RootPropertiesEditionPartForm(component);\n \t\t}\n-\t\tif (key == EntityViewsRepository.Block.class) {\n-\t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n-\t\t\t\treturn new BlockPropertiesEditionPartImpl(component);\n-\t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n-\t\t\t\treturn new BlockPropertiesEditionPartForm(component);\n-\t\t}\n \t\tif (key == EntityViewsRepository.Entity_.class) {\n \t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n \t\t\t\treturn new EntityPropertiesEditionPartImpl(component);\n \t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n \t\t\t\treturn new EntityPropertiesEditionPartForm(component);\n \t\t}\n-\t\tif (key == EntityViewsRepository.Attribute.class) {\n-\t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n-\t\t\t\treturn new AttributePropertiesEditionPartImpl(component);\n-\t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n-\t\t\t\treturn new AttributePropertiesEditionPartForm(component);\n-\t\t}\n-\t\tif (key == EntityViewsRepository.Reference.class) {\n-\t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n-\t\t\t\treturn new ReferencePropertiesEditionPartImpl(component);\n-\t\t\tif (kind == EntityViewsRepository.FORM_KIND)\n-\t\t\t\treturn new ReferencePropertiesEditionPartForm(component);\n-\t\t}\n \t\tif (key == EntityViewsRepository.Finder.class) {\n \t\t\tif (kind == EntityViewsRepository.SWT_KIND)\n \t\t\t\treturn new FinderPropertiesEditionPartImpl(component);","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityPropertiesEditionPartProvider.java","sha":"6d0f7dddd0d63e8f22cc2e57f0aafc277fc74f12","status":"modified"},{"additions":0,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages.properties","changes":24,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":24,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/entityMessages.properties","new_code":"","new_methods":[],"old_code":"BlockPropertiesEditionPart_PropertiesGroupLabel=Properties\nAttributePropertiesEditionPart_PropertiesGroupLabel=Properties\nReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\nBlock_ReadOnly=This property is read only\nBlock_Part_Title=Block\nAttribute_ReadOnly=This property is read only\nAttribute_Part_Title=Attribute\nReference_ReadOnly=This property is read only\nReference_Part_Title=Reference\nBlockPropertiesEditionPart_NameLabel=Name : \nBlockPropertiesEditionPart_DescriptionLabel=Description : \nAttributePropertiesEditionPart_NameLabel=Name : \nAttributePropertiesEditionPart_TypeLabel=Type : \nAttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \nAttributePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\nAttributePropertiesEditionPart_DescriptionLabel=Description : \nReferencePropertiesEditionPart_NameLabel=Name : \nReferencePropertiesEditionPart_TypeLabel=Type : \nReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \nReferencePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\nReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\nReferencePropertiesEditionPart_NavigableLabel=Navigable\nReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \nReferencePropertiesEditionPart_DescriptionLabel=Description : ","old_methods":[],"patch":"@@ -15,23 +15,14 @@\n \n # default values ...\n RootPropertiesEditionPart_PropertiesGroupLabel=Properties\n-BlockPropertiesEditionPart_PropertiesGroupLabel=Properties\n EntityPropertiesEditionPart_PropertiesGroupLabel=Properties\n-AttributePropertiesEditionPart_PropertiesGroupLabel=Properties\n-ReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\n FinderPropertiesEditionPart_PropertiesGroupLabel=Properties\n InternalCriterionPropertiesEditionPart_PropertiesGroupLabel=Properties\n ExternalCriterionPropertiesEditionPart_PropertiesGroupLabel=Properties\n Root_ReadOnly=This property is read only\n Root_Part_Title=Root\n-Block_ReadOnly=This property is read only\n-Block_Part_Title=Block\n Entity_ReadOnly=This property is read only\n Entity_Part_Title=Entity\n-Attribute_ReadOnly=This property is read only\n-Attribute_Part_Title=Attribute\n-Reference_ReadOnly=This property is read only\n-Reference_Part_Title=Reference\n Finder_ReadOnly=This property is read only\n Finder_Part_Title=Finder\n InternalCriterion_ReadOnly=This property is read only\n@@ -40,28 +31,13 @@ ExternalCriterion_ReadOnly=This property is read only\n ExternalCriterion_Part_Title=ExternalCriterion\n RootPropertiesEditionPart_NameLabel=Name : \n RootPropertiesEditionPart_DescriptionLabel=Description : \n-BlockPropertiesEditionPart_NameLabel=Name : \n-BlockPropertiesEditionPart_DescriptionLabel=Description : \n EntityPropertiesEditionPart_NameLabel=Name : \n EntityPropertiesEditionPart_SuperTypeLabel=SuperType : \n EntityPropertiesEditionPart_EstimatedVolumetryLabel=EstimatedVolumetry : \n EntityPropertiesEditionPart_EstimatedAccessLabel=EstimatedAccess : \n EntityPropertiesEditionPart_HistorizedLabel=Historized\n EntityPropertiesEditionPart_InheritanceKindLabel=InheritanceKind : \n EntityPropertiesEditionPart_DescriptionLabel=Description : \n-AttributePropertiesEditionPart_NameLabel=Name : \n-AttributePropertiesEditionPart_TypeLabel=Type : \n-AttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n-AttributePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\n-AttributePropertiesEditionPart_DescriptionLabel=Description : \n-ReferencePropertiesEditionPart_NameLabel=Name : \n-ReferencePropertiesEditionPart_TypeLabel=Type : \n-ReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n-ReferencePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\n-ReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\n-ReferencePropertiesEditionPart_NavigableLabel=Navigable\n-ReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \n-ReferencePropertiesEditionPart_DescriptionLabel=Description : \n FinderPropertiesEditionPart_CustomizedNameLabel=CustomizedName : \n FinderPropertiesEditionPart_MultiplicityLabel=Multiplicity : \n FinderPropertiesEditionPart_DescriptionLabel=Description : ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages.properties","sha":"e551490d3772a5bcf82734c6159364943ef6b8c0","status":"modified"},{"additions":0,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages_fr.properties","changes":24,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages_fr.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":24,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/entityMessages_fr.properties","new_code":"","new_methods":[],"old_code":"BlockPropertiesEditionPart_PropertiesGroupLabel=Properties\nAttributePropertiesEditionPart_PropertiesGroupLabel=Properties\nReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\nBlock_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\nBlock_Part_Title=Block\nAttribute_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\nAttribute_Part_Title=Attribute\nReference_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\nReference_Part_Title=Reference\nBlockPropertiesEditionPart_NameLabel=Name : \nBlockPropertiesEditionPart_DescriptionLabel=Description : \nAttributePropertiesEditionPart_NameLabel=Name : \nAttributePropertiesEditionPart_TypeLabel=Type : \nAttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \nAttributePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\nAttributePropertiesEditionPart_DescriptionLabel=Description : \nReferencePropertiesEditionPart_NameLabel=Name : \nReferencePropertiesEditionPart_TypeLabel=Type : \nReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \nReferencePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\nReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\nReferencePropertiesEditionPart_NavigableLabel=Navigable\nReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \nReferencePropertiesEditionPart_DescriptionLabel=Description : ","old_methods":[],"patch":"@@ -15,23 +15,14 @@\n \n # default values ...\n RootPropertiesEditionPart_PropertiesGroupLabel=Properties\n-BlockPropertiesEditionPart_PropertiesGroupLabel=Properties\n EntityPropertiesEditionPart_PropertiesGroupLabel=Properties\n-AttributePropertiesEditionPart_PropertiesGroupLabel=Properties\n-ReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\n FinderPropertiesEditionPart_PropertiesGroupLabel=Properties\n InternalCriterionPropertiesEditionPart_PropertiesGroupLabel=Properties\n ExternalCriterionPropertiesEditionPart_PropertiesGroupLabel=Properties\n Root_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n Root_Part_Title=Root\n-Block_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n-Block_Part_Title=Block\n Entity_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n Entity_Part_Title=Entity\n-Attribute_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n-Attribute_Part_Title=Attribute\n-Reference_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n-Reference_Part_Title=Reference\n Finder_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n Finder_Part_Title=Finder\n InternalCriterion_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n@@ -40,28 +31,13 @@ ExternalCriterion_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n ExternalCriterion_Part_Title=ExternalCriterion\n RootPropertiesEditionPart_NameLabel=Name : \n RootPropertiesEditionPart_DescriptionLabel=Description : \n-BlockPropertiesEditionPart_NameLabel=Name : \n-BlockPropertiesEditionPart_DescriptionLabel=Description : \n EntityPropertiesEditionPart_NameLabel=Name : \n EntityPropertiesEditionPart_SuperTypeLabel=SuperType : \n EntityPropertiesEditionPart_EstimatedVolumetryLabel=EstimatedVolumetry : \n EntityPropertiesEditionPart_EstimatedAccessLabel=EstimatedAccess : \n EntityPropertiesEditionPart_HistorizedLabel=Historized\n EntityPropertiesEditionPart_InheritanceKindLabel=InheritanceKind : \n EntityPropertiesEditionPart_DescriptionLabel=Description : \n-AttributePropertiesEditionPart_NameLabel=Name : \n-AttributePropertiesEditionPart_TypeLabel=Type : \n-AttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n-AttributePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\n-AttributePropertiesEditionPart_DescriptionLabel=Description : \n-ReferencePropertiesEditionPart_NameLabel=Name : \n-ReferencePropertiesEditionPart_TypeLabel=Type : \n-ReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n-ReferencePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\n-ReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\n-ReferencePropertiesEditionPart_NavigableLabel=Navigable\n-ReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \n-ReferencePropertiesEditionPart_DescriptionLabel=Description : \n FinderPropertiesEditionPart_CustomizedNameLabel=CustomizedName : \n FinderPropertiesEditionPart_MultiplicityLabel=Multiplicity : \n FinderPropertiesEditionPart_DescriptionLabel=Description : ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages_fr.properties","sha":"309a89bb42c5deb41a6a477e221bedff09378680","status":"modified"},{"additions":0,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProvider.java","changes":37,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":37,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProvider.java","new_code":"","new_methods":[],"old_code":"\t\t\taddSupertypePropertyDescriptor(object);\n\t/**\n\t * This adds a property descriptor for the Supertype feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addSupertypePropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add\n\t\t\t(createItemPropertyDescriptor\n\t\t\t\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\n\t\t\t\t getResourceLocator(),\n\t\t\t\t getString(\"_UI_Entity_supertype_feature\"),\n\t\t\t\t getString(\"_UI_PropertyDescriptor_description\", \"_UI_Entity_supertype_feature\", \"_UI_Entity_type\"),\n\t\t\t\t EntityPackage.Literals.ENTITY__SUPERTYPE,\n\t\t\t\t true,\n\t\t\t\t false,\n\t\t\t\t true,\n\t\t\t\t null,\n\t\t\t\t null,\n\t\t\t\t null));\n\t}\n\n\t\t\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES);\n\t\t\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_REFERENCES);\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\tnewChildDescriptors.add\n\t\t\t(createChildParameter\n\t\t\t\t(EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES,\n\t\t\t\t EntityFactory.eINSTANCE.createAttribute()));\n\n\t\tnewChildDescriptors.add\n\t\t\t(createChildParameter\n\t\t\t\t(EntityPackage.Literals.ENTITY__OWNED_REFERENCES,\n\t\t\t\t EntityFactory.eINSTANCE.createReference()));\n","old_methods":[{"arguments":["Object object"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProvider.java","implementation":"itemPropertyDescriptors.add\n\t\t\t(createItemPropertyDescriptor\n\t\t\t\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\n\t\t\t\t getResourceLocator(),\n\t\t\t\t getString(\"_UI_Entity_supertype_feature\"),\n\t\t\t\t getString(\"_UI_PropertyDescriptor_description\", \"_UI_Entity_supertype_feature\", \"_UI_Entity_type\"),\n\t\t\t\t EntityPackage.Literals.ENTITY__SUPERTYPE,\n\t\t\t\t true,\n\t\t\t\t false,\n\t\t\t\t true,\n\t\t\t\t null,\n\t\t\t\t null,\n\t\t\t\t null));","signature":"void addSupertypePropertyDescriptor(Object object)"}],"patch":"@@ -76,7 +76,6 @@ public List getPropertyDescriptors(Object object) {\n \t\tif (itemPropertyDescriptors == null) {\n \t\t\tsuper.getPropertyDescriptors(object);\n \n-\t\t\taddSupertypePropertyDescriptor(object);\n \t\t\taddEstimatedVolumetryPropertyDescriptor(object);\n \t\t\taddEstimatedAccessPropertyDescriptor(object);\n \t\t\taddHistorizedPropertyDescriptor(object);\n@@ -85,28 +84,6 @@ public List getPropertyDescriptors(Object object) {\n \t\treturn itemPropertyDescriptors;\n \t}\n \n-\t/**\n-\t * This adds a property descriptor for the Supertype feature.\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\tprotected void addSupertypePropertyDescriptor(Object object) {\n-\t\titemPropertyDescriptors.add\n-\t\t\t(createItemPropertyDescriptor\n-\t\t\t\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\n-\t\t\t\t getResourceLocator(),\n-\t\t\t\t getString(\"_UI_Entity_supertype_feature\"),\n-\t\t\t\t getString(\"_UI_PropertyDescriptor_description\", \"_UI_Entity_supertype_feature\", \"_UI_Entity_type\"),\n-\t\t\t\t EntityPackage.Literals.ENTITY__SUPERTYPE,\n-\t\t\t\t true,\n-\t\t\t\t false,\n-\t\t\t\t true,\n-\t\t\t\t null,\n-\t\t\t\t null,\n-\t\t\t\t null));\n-\t}\n-\n \t/**\n \t * This adds a property descriptor for the Estimated Volumetry feature.\n \t * \n@@ -207,8 +184,6 @@ protected void addInheritanceKindPropertyDescriptor(Object object) {\n \tpublic Collection getChildrenFeatures(Object object) {\n \t\tif (childrenFeatures == null) {\n \t\t\tsuper.getChildrenFeatures(object);\n-\t\t\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES);\n-\t\t\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_REFERENCES);\n \t\t\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_FINDERS);\n \t\t}\n \t\treturn childrenFeatures;\n@@ -280,8 +255,6 @@ public void notifyChanged(Notification notification) {\n \t\t\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\n \t\t\t\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));\n \t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n \t\t\tcase EntityPackage.ENTITY__OWNED_FINDERS:\n \t\t\t\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));\n \t\t\t\treturn;\n@@ -300,16 +273,6 @@ public void notifyChanged(Notification notification) {\n \tprotected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {\n \t\tsuper.collectNewChildDescriptors(newChildDescriptors, object);\n \n-\t\tnewChildDescriptors.add\n-\t\t\t(createChildParameter\n-\t\t\t\t(EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES,\n-\t\t\t\t EntityFactory.eINSTANCE.createAttribute()));\n-\n-\t\tnewChildDescriptors.add\n-\t\t\t(createChildParameter\n-\t\t\t\t(EntityPackage.Literals.ENTITY__OWNED_REFERENCES,\n-\t\t\t\t EntityFactory.eINSTANCE.createReference()));\n-\n \t\tnewChildDescriptors.add\n \t\t\t(createChildParameter\n \t\t\t\t(EntityPackage.Literals.ENTITY__OWNED_FINDERS,","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProvider.java","sha":"f30aa0a7834b87444800447803f17309525950c7","status":"modified"},{"additions":0,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProviderAdapterFactory.java","changes":72,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProviderAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":72,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProviderAdapterFactory.java","new_code":"","new_methods":[],"old_code":"\t/**\n\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Block} instances.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected BlockItemProvider blockItemProvider;\n\n\t/**\n\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Block}.\n\t * \n\t * \n\t * @generated\n\t */\n\t@Override\n\tpublic Adapter createBlockAdapter() {\n\t\tif (blockItemProvider == null) {\n\t\t\tblockItemProvider = new BlockItemProvider(this);\n\t\t}\n\n\t\treturn blockItemProvider;\n\t}\n\n\t/**\n\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Attribute} instances.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected AttributeItemProvider attributeItemProvider;\n\n\t/**\n\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Attribute}.\n\t * \n\t * \n\t * @generated\n\t */\n\t@Override\n\tpublic Adapter createAttributeAdapter() {\n\t\tif (attributeItemProvider == null) {\n\t\t\tattributeItemProvider = new AttributeItemProvider(this);\n\t\t}\n\n\t\treturn attributeItemProvider;\n\t}\n\n\t/**\n\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Reference} instances.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected ReferenceItemProvider referenceItemProvider;\n\n\t/**\n\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Reference}.\n\t * \n\t * \n\t * @generated\n\t */\n\t@Override\n\tpublic Adapter createReferenceAdapter() {\n\t\tif (referenceItemProvider == null) {\n\t\t\treferenceItemProvider = new ReferenceItemProvider(this);\n\t\t}\n\n\t\treturn referenceItemProvider;\n\t}\n\n\t\tif (blockItemProvider != null) blockItemProvider.dispose();\n\t\tif (attributeItemProvider != null) attributeItemProvider.dispose();\n\t\tif (referenceItemProvider != null) referenceItemProvider.dispose();","old_methods":[{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProviderAdapterFactory.java","implementation":"if (blockItemProvider == null) {\n\t\t\tblockItemProvider = new BlockItemProvider(this);","signature":"Adapter createBlockAdapter()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProviderAdapterFactory.java","implementation":"if (attributeItemProvider == null) {\n\t\t\tattributeItemProvider = new AttributeItemProvider(this);","signature":"Adapter createAttributeAdapter()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProviderAdapterFactory.java","implementation":"if (referenceItemProvider == null) {\n\t\t\treferenceItemProvider = new ReferenceItemProvider(this);","signature":"Adapter createReferenceAdapter()"}],"patch":"@@ -109,29 +109,6 @@ public Adapter createRootAdapter() {\n \t\treturn rootItemProvider;\n \t}\n \n-\t/**\n-\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Block} instances.\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\tprotected BlockItemProvider blockItemProvider;\n-\n-\t/**\n-\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Block}.\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\t@Override\n-\tpublic Adapter createBlockAdapter() {\n-\t\tif (blockItemProvider == null) {\n-\t\t\tblockItemProvider = new BlockItemProvider(this);\n-\t\t}\n-\n-\t\treturn blockItemProvider;\n-\t}\n-\n \t/**\n \t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Entity} instances.\n \t * \n@@ -155,52 +132,6 @@ public Adapter createEntityAdapter() {\n \t\treturn entityItemProvider;\n \t}\n \n-\t/**\n-\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Attribute} instances.\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\tprotected AttributeItemProvider attributeItemProvider;\n-\n-\t/**\n-\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Attribute}.\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\t@Override\n-\tpublic Adapter createAttributeAdapter() {\n-\t\tif (attributeItemProvider == null) {\n-\t\t\tattributeItemProvider = new AttributeItemProvider(this);\n-\t\t}\n-\n-\t\treturn attributeItemProvider;\n-\t}\n-\n-\t/**\n-\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Reference} instances.\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\tprotected ReferenceItemProvider referenceItemProvider;\n-\n-\t/**\n-\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Reference}.\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\t@Override\n-\tpublic Adapter createReferenceAdapter() {\n-\t\tif (referenceItemProvider == null) {\n-\t\t\treferenceItemProvider = new ReferenceItemProvider(this);\n-\t\t}\n-\n-\t\treturn referenceItemProvider;\n-\t}\n-\n \t/**\n \t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Finder} instances.\n \t * \n@@ -370,10 +301,7 @@ public void fireNotifyChanged(Notification notification) {\n \t */\n \tpublic void dispose() {\n \t\tif (rootItemProvider != null) rootItemProvider.dispose();\n-\t\tif (blockItemProvider != null) blockItemProvider.dispose();\n \t\tif (entityItemProvider != null) entityItemProvider.dispose();\n-\t\tif (attributeItemProvider != null) attributeItemProvider.dispose();\n-\t\tif (referenceItemProvider != null) referenceItemProvider.dispose();\n \t\tif (finderItemProvider != null) finderItemProvider.dispose();\n \t\tif (internalCriterionItemProvider != null) internalCriterionItemProvider.dispose();\n \t\tif (externalCriterionItemProvider != null) externalCriterionItemProvider.dispose();","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProviderAdapterFactory.java","sha":"badda280b3ed642ab47843aa7b92a10dfdfddf53","status":"modified"},{"additions":42,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FRootItemProvider.java","changes":50,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FRootItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":8,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/RootItemProvider.java","new_code":"import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;\nimport org.eclipse.emf.edit.provider.ItemPropertyDescriptor;\nimport org.obeonetwork.dsl.environment.EnvironmentFactory;\nimport org.obeonetwork.dsl.environment.provider.TypesDefinitionItemProvider;\n\textends TypesDefinitionItemProvider\n\t\t\taddNamePropertyDescriptor(object);\n\t/**\n\t * This adds a property descriptor for the Name feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addNamePropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add\n\t\t\t(createItemPropertyDescriptor\n\t\t\t\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\n\t\t\t\t getResourceLocator(),\n\t\t\t\t getString(\"_UI_Root_name_feature\"),\n\t\t\t\t getString(\"_UI_PropertyDescriptor_description\", \"_UI_Root_name_feature\", \"_UI_Root_type\"),\n\t\t\t\t EntityPackage.Literals.ROOT__NAME,\n\t\t\t\t true,\n\t\t\t\t false,\n\t\t\t\t false,\n\t\t\t\t ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,\n\t\t\t\t null,\n\t\t\t\t null));\n\t}\n\n\t\t\tchildrenFeatures.add(EntityPackage.Literals.ROOT__NAMESPACES);\n\t\tString label = ((Root)object).getName();\n\t\tif (label != null) {\n\t\t\treturn label;\n\t\t}\n\t\treturn \"Entities\";\n\t\t\tcase EntityPackage.ROOT__NAME:\n\t\t\t\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n\t\t\t\t(EnvironmentPackage.Literals.TYPES_DEFINITION__TYPES,\n\t\t\t\t EntityFactory.eINSTANCE.createEntity()));\n\t\t\t\t(EntityPackage.Literals.ROOT__NAMESPACES,\n\t\t\t\t EnvironmentFactory.eINSTANCE.createNamespace()));","new_methods":[{"arguments":["Object object"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/RootItemProvider.java","implementation":"itemPropertyDescriptors.add\n\t\t\t(createItemPropertyDescriptor\n\t\t\t\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\n\t\t\t\t getResourceLocator(),\n\t\t\t\t getString(\"_UI_Root_name_feature\"),\n\t\t\t\t getString(\"_UI_PropertyDescriptor_description\", \"_UI_Root_name_feature\", \"_UI_Root_type\"),\n\t\t\t\t EntityPackage.Literals.ROOT__NAME,\n\t\t\t\t true,\n\t\t\t\t false,\n\t\t\t\t false,\n\t\t\t\t ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,\n\t\t\t\t null,\n\t\t\t\t null));","signature":"void addNamePropertyDescriptor(Object object)"}],"old_code":"\textends NamespaceItemProvider\n\t\t\tchildrenFeatures.add(EntityPackage.Literals.ROOT__BLOCKS);\n\t\treturn \"Blocks\";\n\t\t\tcase EntityPackage.ROOT__BLOCKS:\n\t\t\t\t(EnvironmentPackage.Literals.NAMESPACE__OWNED_NAMESPACES,\n\t\t\t\t EntityFactory.eINSTANCE.createRoot()));\n\t\t\t\t(EntityPackage.Literals.ROOT__BLOCKS,\n\t\t\t\t EntityFactory.eINSTANCE.createBlock()));","old_methods":[],"patch":"@@ -20,18 +20,22 @@\n import org.eclipse.emf.common.notify.Notification;\n import org.eclipse.emf.common.util.ResourceLocator;\n import org.eclipse.emf.ecore.EStructuralFeature;\n+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;\n import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;\n import org.eclipse.emf.edit.provider.IItemLabelProvider;\n import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;\n import org.eclipse.emf.edit.provider.IItemPropertySource;\n import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;\n import org.eclipse.emf.edit.provider.ITreeItemContentProvider;\n+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;\n import org.eclipse.emf.edit.provider.ViewerNotification;\n import org.obeonetwork.dsl.entity.EntityFactory;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.Root;\n+import org.obeonetwork.dsl.environment.EnvironmentFactory;\n import org.obeonetwork.dsl.environment.EnvironmentPackage;\n import org.obeonetwork.dsl.environment.provider.NamespaceItemProvider;\n+import org.obeonetwork.dsl.environment.provider.TypesDefinitionItemProvider;\n \n /**\n * This is the item provider adapter for a {@link org.obeonetwork.dsl.entity.Root} object.\n@@ -40,7 +44,7 @@\n * @generated\n */\n public class RootItemProvider\n-\textends NamespaceItemProvider\n+\textends TypesDefinitionItemProvider\n \timplements\t\n \t\tIEditingDomainItemProvider,\t\n \t\tIStructuredItemContentProvider,\t\n@@ -75,10 +79,33 @@ public List getPropertyDescriptors(Object object) {\n \t\tif (itemPropertyDescriptors == null) {\n \t\t\tsuper.getPropertyDescriptors(object);\n \n+\t\t\taddNamePropertyDescriptor(object);\n \t\t}\n \t\treturn itemPropertyDescriptors;\n \t}\n \n+\t/**\n+\t * This adds a property descriptor for the Name feature.\n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\tprotected void addNamePropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add\n+\t\t\t(createItemPropertyDescriptor\n+\t\t\t\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\n+\t\t\t\t getResourceLocator(),\n+\t\t\t\t getString(\"_UI_Root_name_feature\"),\n+\t\t\t\t getString(\"_UI_PropertyDescriptor_description\", \"_UI_Root_name_feature\", \"_UI_Root_type\"),\n+\t\t\t\t EntityPackage.Literals.ROOT__NAME,\n+\t\t\t\t true,\n+\t\t\t\t false,\n+\t\t\t\t false,\n+\t\t\t\t ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,\n+\t\t\t\t null,\n+\t\t\t\t null));\n+\t}\n+\n \t/**\n \t * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an\n \t * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or\n@@ -91,7 +118,7 @@ public List getPropertyDescriptors(Object object) {\n \tpublic Collection getChildrenFeatures(Object object) {\n \t\tif (childrenFeatures == null) {\n \t\t\tsuper.getChildrenFeatures(object);\n-\t\t\tchildrenFeatures.add(EntityPackage.Literals.ROOT__BLOCKS);\n+\t\t\tchildrenFeatures.add(EntityPackage.Literals.ROOT__NAMESPACES);\n \t\t}\n \t\treturn childrenFeatures;\n \t}\n@@ -138,7 +165,11 @@ protected boolean shouldComposeCreationImage() {\n \t */\n \t@Override\n \tpublic String getText(Object object) {\n-\t\treturn \"Blocks\";\n+\t\tString label = ((Root)object).getName();\n+\t\tif (label != null) {\n+\t\t\treturn label;\n+\t\t}\n+\t\treturn \"Entities\";\n \t}\n \n \t/**\n@@ -153,7 +184,10 @@ public void notifyChanged(Notification notification) {\n \t\tupdateChildren(notification);\n \n \t\tswitch (notification.getFeatureID(Root.class)) {\n-\t\t\tcase EntityPackage.ROOT__BLOCKS:\n+\t\t\tcase EntityPackage.ROOT__NAME:\n+\t\t\t\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));\n+\t\t\t\treturn;\n+\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n \t\t\t\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));\n \t\t\t\treturn;\n \t\t}\n@@ -173,13 +207,13 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors\n \n \t\tnewChildDescriptors.add\n \t\t\t(createChildParameter\n-\t\t\t\t(EnvironmentPackage.Literals.NAMESPACE__OWNED_NAMESPACES,\n-\t\t\t\t EntityFactory.eINSTANCE.createRoot()));\n+\t\t\t\t(EnvironmentPackage.Literals.TYPES_DEFINITION__TYPES,\n+\t\t\t\t EntityFactory.eINSTANCE.createEntity()));\n \n \t\tnewChildDescriptors.add\n \t\t\t(createChildParameter\n-\t\t\t\t(EntityPackage.Literals.ROOT__BLOCKS,\n-\t\t\t\t EntityFactory.eINSTANCE.createBlock()));\n+\t\t\t\t(EntityPackage.Literals.ROOT__NAMESPACES,\n+\t\t\t\t EnvironmentFactory.eINSTANCE.createNamespace()));\n \t}\n \n \t/**","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FRootItemProvider.java","sha":"3fecd259c422a24d95ee0d0169890c68118b678f","status":"modified"},{"additions":4,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2FMETA-INF%2FMANIFEST.MF","changes":6,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":2,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.editor/META-INF/MANIFEST.MF","new_code":"Bundle-SymbolicName: org.obeonetwork.dsl.entity.editor;singleton:=true\nExport-Package: org.obeonetwork.dsl.entity.extensionUtilities.presentation,\n org.obeonetwork.dsl.entity.presentation\n org.obeonetwork.dsl.environment.edit;visibility:=reexport,","new_methods":[],"old_code":"Bundle-SymbolicName: org.obeonetwork.dsl.entity.editor; singleton:=true\nExport-Package: org.obeonetwork.dsl.entity.presentation","old_methods":[],"patch":"@@ -1,19 +1,21 @@\n Manifest-Version: 1.0\n Bundle-ManifestVersion: 2\n Bundle-Name: %pluginName\n-Bundle-SymbolicName: org.obeonetwork.dsl.entity.editor; singleton:=true\n+Bundle-SymbolicName: org.obeonetwork.dsl.entity.editor;singleton:=true\n Bundle-Version: 2.4.0.qualifier\n Bundle-ClassPath: .\n Bundle-Activator: org.obeonetwork.dsl.entity.presentation.EntityEditorPlugin$Implementation\n Bundle-Vendor: %providerName\n Bundle-Localization: plugin\n-Export-Package: org.obeonetwork.dsl.entity.presentation\n+Export-Package: org.obeonetwork.dsl.entity.extensionUtilities.presentation,\n+ org.obeonetwork.dsl.entity.presentation\n Require-Bundle: org.eclipse.core.runtime,\n org.eclipse.core.resources;visibility:=reexport,\n org.obeonetwork.dsl.entity.edit;visibility:=reexport,\n org.eclipse.emf.ecore.xmi;visibility:=reexport,\n org.eclipse.emf.edit.ui;visibility:=reexport,\n org.eclipse.ui.ide;visibility:=reexport,\n+ org.obeonetwork.dsl.environment.edit;visibility:=reexport,\n org.obeonetwork.dsl.environment.editor,\n org.eclipse.emf.eef.runtime\n Bundle-ActivationPolicy: lazy","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2FMETA-INF%2FMANIFEST.MF","sha":"226851ae9f7bd49dc7760eeee731203ed48c8415","status":"modified"},{"additions":56,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fplugin.xml","changes":57,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fplugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":1,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.editor/plugin.xml","new_code":" \n \n \n \n %_UI_EntityModelWizard_description\n \n \n \n\n \n \n \n \n \n \n \n \n \n \n\n \n \n \n \n %_UI_ExtensionUtilitiesModelWizard_description\n \n \n \n\nnull","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -40,4 +40,59 @@\n contributorClass=\"org.obeonetwork.dsl.entity.presentation.EntityActionBarContributor\" >\n \n \n-\n+ \n+ \n+ \n+ \n+ %_UI_EntityModelWizard_description\n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ %_UI_ExtensionUtilitiesModelWizard_description\n+ \n+ \n+ \n+\n+null","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fplugin.xml","sha":"cbf5ef13dc1987b81aea2befdee5b03786a9cf77","status":"modified"},{"additions":40,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fpresentation%2FExtensionUtilitiesEditor.java","changes":76,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fpresentation%2FExtensionUtilitiesEditor.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":36,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java","new_code":"\tprotected List propertySheetPages = new ArrayList();\n\t\t\t\t\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {\n\t\t\t\tresourceToDiagnosticMap.remove(target);\n\t\t\t\tif (updateProblemIndication) {\n\t\t\t\t\tgetSite().getShell().getDisplay().asyncExec\n\t\t\t\t\t\t(new Runnable() {\n\t\t\t\t\t\t\t public void run() {\n\t\t\t\t\t\t\t\t updateProblemIndication();\n\t\t\t\t\t\t\t }\n\t\t\t\t\t\t });\n\t\t\t\t}\n\t\t\t\t\t\t\t\treturn false;\n\t\t\t\t\t\t\t\t for (Iterator i = propertySheetPages.iterator(); i.hasNext(); ) {\n\t\t\t\t\t\t\t\t\t PropertySheetPage propertySheetPage = i.next();\n\t\t\t\t\t\t\t\t\t if (propertySheetPage.getControl().isDisposed()) {\n\t\t\t\t\t\t\t\t\t\t i.remove();\n\t\t\t\t\t\t\t\t\t }\n\t\t\t\t\t\t\t\t\t else {\n\t\t\t\t\t\t\t\t\t\t propertySheetPage.refresh();\n\t\t\t\t\t\t\t\t\t }\n\t\tPropertySheetPage propertySheetPage =\n\t\t\tnew ExtendedPropertySheetPage(editingDomain) {\n\t\t\t\t@Override\n\t\t\t\tpublic void setSelectionToViewer(List selection) {\n\t\t\t\t\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\n\t\t\t\t\tExtensionUtilitiesEditor.this.setFocus();\n\t\t\t\t}\n\t\t\t\t@Override\n\t\t\t\tpublic void setActionBars(IActionBars actionBars) {\n\t\t\t\t\tsuper.setActionBars(actionBars);\n\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);\n\t\t\t\t}\n\t\t\t};\n\t\tpropertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));\n\t\tpropertySheetPages.add(propertySheetPage);\n\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\n\t\tList targetObjects = markerHelper.getTargetObjects(editingDomain, marker);\n\t\tif (!targetObjects.isEmpty()) {\n\t\t\tsetSelectionToViewer(targetObjects);\n\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {","new_methods":[{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java","implementation":"public void run() {\n\t\t\t\t\t\t\t\t updateProblemIndication();","signature":"new Runnable()"},{"arguments":["editingDomain"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java","implementation":"@Override\n\t\t\t\tpublic void setSelectionToViewer(List selection) {\n\t\t\t\t\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\n\t\t\t\t\tExtensionUtilitiesEditor.this.setFocus();","signature":"new ExtendedPropertySheetPage(editingDomain)"},{"arguments":["IActionBars actionBars"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java","implementation":"super.setActionBars(actionBars);\n\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);","signature":"void setActionBars(IActionBars actionBars)"}],"old_code":"\tprotected PropertySheetPage propertySheetPage;\n\t\t\t\t\tif (((PropertySheet)p).getCurrentPage() == propertySheetPage) {\n\t\t\t\t\t\t\t\t if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {\n\t\t\t\t\t\t\t\t\t propertySheetPage.refresh();\n\t\tif (propertySheetPage == null) {\n\t\t\tpropertySheetPage =\n\t\t\t\tnew ExtendedPropertySheetPage(editingDomain) {\n\t\t\t\t\t@Override\n\t\t\t\t\tpublic void setSelectionToViewer(List selection) {\n\t\t\t\t\t\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\n\t\t\t\t\t\tExtensionUtilitiesEditor.this.setFocus();\n\t\t\t\t\t}\n\t\t\t\t\t@Override\n\t\t\t\t\tpublic void setActionBars(IActionBars actionBars) {\n\t\t\t\t\t\tsuper.setActionBars(actionBars);\n\t\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);\n\t\t\t\t\t}\n\t\t\t\t};\n\t\t\tpropertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));\n\t\t}\n\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \n\t\ttry {\n\t\t\tif (marker.getType().equals(EValidator.MARKER)) {\n\t\t\t\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);\n\t\t\t\tif (uriAttribute != null) {\n\t\t\t\t\tURI uri = URI.createURI(uriAttribute);\n\t\t\t\t\tEObject eObject = editingDomain.getResourceSet().getEObject(uri, true);\n\t\t\t\t\tif (eObject != null) {\n\t\t\t\t\t setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tcatch (CoreException exception) {\n\t\t\tEntityEditorPlugin.INSTANCE.log(exception);\n\t\tif (propertySheetPage != null) {","old_methods":[{"arguments":["editingDomain"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java","implementation":"@Override\n\t\t\t\t\tpublic void setSelectionToViewer(List selection) {\n\t\t\t\t\t\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\n\t\t\t\t\t\tExtensionUtilitiesEditor.this.setFocus();","signature":"new ExtendedPropertySheetPage(editingDomain)"},{"arguments":["IActionBars actionBars"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java","implementation":"super.setActionBars(actionBars);\n\t\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);","signature":"void setActionBars(IActionBars actionBars)"}],"patch":"@@ -195,7 +195,7 @@ public class ExtensionUtilitiesEditor\n \t * \n \t * @generated\n \t */\n-\tprotected PropertySheetPage propertySheetPage;\n+\tprotected List propertySheetPages = new ArrayList();\n \n \t/**\n \t * This is the viewer that shadows the selection in the content outline.\n@@ -314,7 +314,7 @@ public void partActivated(IWorkbenchPart p) {\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t\telse if (p instanceof PropertySheet) {\n-\t\t\t\t\tif (((PropertySheet)p).getCurrentPage() == propertySheetPage) {\n+\t\t\t\t\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {\n \t\t\t\t\t\tgetActionBarContributor().setActiveEditor(ExtensionUtilitiesEditor.this);\n \t\t\t\t\t\thandleActivate();\n \t\t\t\t\t}\n@@ -426,6 +426,15 @@ protected void setTarget(Resource target) {\n \t\t\t@Override\n \t\t\tprotected void unsetTarget(Resource target) {\n \t\t\t\tbasicUnsetTarget(target);\n+\t\t\t\tresourceToDiagnosticMap.remove(target);\n+\t\t\t\tif (updateProblemIndication) {\n+\t\t\t\t\tgetSite().getShell().getDisplay().asyncExec\n+\t\t\t\t\t\t(new Runnable() {\n+\t\t\t\t\t\t\t public void run() {\n+\t\t\t\t\t\t\t\t updateProblemIndication();\n+\t\t\t\t\t\t\t }\n+\t\t\t\t\t\t });\n+\t\t\t\t}\n \t\t\t}\n \t\t};\n \n@@ -459,6 +468,7 @@ else if (!savedResources.remove(resource)) {\n \t\t\t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t\t}\n+\t\t\t\t\t\t\t\treturn false;\n \t\t\t\t\t\t\t}\n \n \t\t\t\t\t\t\treturn true;\n@@ -697,8 +707,14 @@ public void run() {\n \t\t\t\t\t\t\t\t if (mostRecentCommand != null) {\n \t\t\t\t\t\t\t\t\t setSelectionToViewer(mostRecentCommand.getAffectedObjects());\n \t\t\t\t\t\t\t\t }\n-\t\t\t\t\t\t\t\t if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {\n-\t\t\t\t\t\t\t\t\t propertySheetPage.refresh();\n+\t\t\t\t\t\t\t\t for (Iterator i = propertySheetPages.iterator(); i.hasNext(); ) {\n+\t\t\t\t\t\t\t\t\t PropertySheetPage propertySheetPage = i.next();\n+\t\t\t\t\t\t\t\t\t if (propertySheetPage.getControl().isDisposed()) {\n+\t\t\t\t\t\t\t\t\t\t i.remove();\n+\t\t\t\t\t\t\t\t\t }\n+\t\t\t\t\t\t\t\t\t else {\n+\t\t\t\t\t\t\t\t\t\t propertySheetPage.refresh();\n+\t\t\t\t\t\t\t\t\t }\n \t\t\t\t\t\t\t\t }\n \t\t\t\t\t\t\t }\n \t\t\t\t\t\t });\n@@ -1333,23 +1349,22 @@ public void selectionChanged(SelectionChangedEvent event) {\n \t * @generated\n \t */\n \tpublic IPropertySheetPage getPropertySheetPage() {\n-\t\tif (propertySheetPage == null) {\n-\t\t\tpropertySheetPage =\n-\t\t\t\tnew ExtendedPropertySheetPage(editingDomain) {\n-\t\t\t\t\t@Override\n-\t\t\t\t\tpublic void setSelectionToViewer(List selection) {\n-\t\t\t\t\t\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\n-\t\t\t\t\t\tExtensionUtilitiesEditor.this.setFocus();\n-\t\t\t\t\t}\n+\t\tPropertySheetPage propertySheetPage =\n+\t\t\tnew ExtendedPropertySheetPage(editingDomain) {\n+\t\t\t\t@Override\n+\t\t\t\tpublic void setSelectionToViewer(List selection) {\n+\t\t\t\t\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\n+\t\t\t\t\tExtensionUtilitiesEditor.this.setFocus();\n+\t\t\t\t}\n \n-\t\t\t\t\t@Override\n-\t\t\t\t\tpublic void setActionBars(IActionBars actionBars) {\n-\t\t\t\t\t\tsuper.setActionBars(actionBars);\n-\t\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);\n-\t\t\t\t\t}\n-\t\t\t\t};\n-\t\t\tpropertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));\n-\t\t}\n+\t\t\t\t@Override\n+\t\t\t\tpublic void setActionBars(IActionBars actionBars) {\n+\t\t\t\t\tsuper.setActionBars(actionBars);\n+\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);\n+\t\t\t\t}\n+\t\t\t};\n+\t\tpropertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));\n+\t\tpropertySheetPages.add(propertySheetPage);\n \n \t\treturn propertySheetPage;\n \t}\n@@ -1468,7 +1483,7 @@ public void execute(IProgressMonitor monitor) {\n \n \t/**\n \t * This returns whether something has been persisted to the URI of the specified resource.\n-\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \n+\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\n \t * \n \t * \n \t * @generated\n@@ -1540,20 +1555,9 @@ protected void doSaveAs(URI uri, IEditorInput editorInput) {\n \t * @generated\n \t */\n \tpublic void gotoMarker(IMarker marker) {\n-\t\ttry {\n-\t\t\tif (marker.getType().equals(EValidator.MARKER)) {\n-\t\t\t\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);\n-\t\t\t\tif (uriAttribute != null) {\n-\t\t\t\t\tURI uri = URI.createURI(uriAttribute);\n-\t\t\t\t\tEObject eObject = editingDomain.getResourceSet().getEObject(uri, true);\n-\t\t\t\t\tif (eObject != null) {\n-\t\t\t\t\t setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t\tcatch (CoreException exception) {\n-\t\t\tEntityEditorPlugin.INSTANCE.log(exception);\n+\t\tList targetObjects = markerHelper.getTargetObjects(editingDomain, marker);\n+\t\tif (!targetObjects.isEmpty()) {\n+\t\t\tsetSelectionToViewer(targetObjects);\n \t\t}\n \t}\n \n@@ -1744,7 +1748,7 @@ public void dispose() {\n \t\t\tgetActionBarContributor().setActiveEditor(null);\n \t\t}\n \n-\t\tif (propertySheetPage != null) {\n+\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {\n \t\t\tpropertySheetPage.dispose();\n \t\t}\n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fpresentation%2FExtensionUtilitiesEditor.java","sha":"4b71ce963c48df0e446b6edc73fa5be0f40d66b2","status":"modified"},{"additions":27,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fpresentation%2FEntityEditor.java","changes":44,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fpresentation%2FEntityEditor.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":17,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/presentation/EntityEditor.java","new_code":"import java.util.List;\nimport org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;\nimport org.eclipse.ui.views.properties.PropertySheetPage;\n\t/**\n\t * This is the property sheet page.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected List propertySheetPages = new ArrayList();\n\n\t\t\t\t\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {\n\t\t\t\tresourceToDiagnosticMap.remove(target);\n\t\t\t\tif (updateProblemIndication) {\n\t\t\t\t\tgetSite().getShell().getDisplay().asyncExec\n\t\t\t\t\t\t(new Runnable() {\n\t\t\t\t\t\t\t public void run() {\n\t\t\t\t\t\t\t\t updateProblemIndication();\n\t\t\t\t\t\t\t }\n\t\t\t\t\t\t });\n\t\t\t\t}\n\t\t\t\t\t\t\t\treturn false;\n\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\n\t\tList targetObjects = markerHelper.getTargetObjects(editingDomain, marker);\n\t\tif (!targetObjects.isEmpty()) {\n\t\t\tsetSelectionToViewer(targetObjects);\n\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {","new_methods":[{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/presentation/EntityEditor.java","implementation":"public void run() {\n\t\t\t\t\t\t\t\t updateProblemIndication();","signature":"new Runnable()"}],"old_code":"\t\t\t\t\tif (((PropertySheet)p).getCurrentPage() == propertySheetPage) {\n\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \n\t\ttry {\n\t\t\tif (marker.getType().equals(EValidator.MARKER)) {\n\t\t\t\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);\n\t\t\t\tif (uriAttribute != null) {\n\t\t\t\t\tURI uri = URI.createURI(uriAttribute);\n\t\t\t\t\tEObject eObject = editingDomain.getResourceSet().getEObject(uri, true);\n\t\t\t\t\tif (eObject != null) {\n\t\t\t\t\t setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t\tcatch (CoreException exception) {\n\t\t\tEntityEditorPlugin.INSTANCE.log(exception);\n\t\tif (propertySheetPage != null) {","old_methods":[],"patch":"@@ -21,6 +21,7 @@\n import java.util.HashMap;\n import java.util.Iterator;\n import java.util.LinkedHashMap;\n+import java.util.List;\n import java.util.Map;\n \n import org.eclipse.core.resources.IFile;\n@@ -71,6 +72,7 @@\n import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;\n import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;\n import org.eclipse.emf.edit.ui.util.EditUIUtil;\n+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;\n import org.eclipse.emf.eef.runtime.ui.notify.OpenWizardOnDoubleClick;\n import org.eclipse.jface.action.IMenuListener;\n import org.eclipse.jface.action.IMenuManager;\n@@ -124,6 +126,7 @@\n import org.eclipse.ui.views.contentoutline.IContentOutlinePage;\n import org.eclipse.ui.views.properties.IPropertySheetPage;\n import org.eclipse.ui.views.properties.PropertySheet;\n+import org.eclipse.ui.views.properties.PropertySheetPage;\n import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;\n import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;\n import org.obeonetwork.dsl.entity.extensionUtilities.provider.ExtensionUtilitiesItemProviderAdapterFactory;\n@@ -188,6 +191,14 @@ public class EntityEditor extends MultiPageEditorPart implements\n \t */\n \tprotected TreeViewer contentOutlineViewer;\n \n+\t/**\n+\t * This is the property sheet page.\n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\tprotected List propertySheetPages = new ArrayList();\n+\n \t/**\n \t * This is the property sheet page. \n@@ -309,7 +320,7 @@ public void partActivated(IWorkbenchPart p) {\n \t\t\t\t\t}\n \t\t\t\t}\n \t\t\t\telse if (p instanceof PropertySheet) {\n-\t\t\t\t\tif (((PropertySheet)p).getCurrentPage() == propertySheetPage) {\n+\t\t\t\t\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {\n \t\t\t\t\t\tgetActionBarContributor().setActiveEditor(EntityEditor.this);\n \t\t\t\t\t\thandleActivate();\n \t\t\t\t\t}\n@@ -419,6 +430,15 @@ protected void setTarget(Resource target) {\n \t\t\t@Override\n \t\t\tprotected void unsetTarget(Resource target) {\n \t\t\t\tbasicUnsetTarget(target);\n+\t\t\t\tresourceToDiagnosticMap.remove(target);\n+\t\t\t\tif (updateProblemIndication) {\n+\t\t\t\t\tgetSite().getShell().getDisplay().asyncExec\n+\t\t\t\t\t\t(new Runnable() {\n+\t\t\t\t\t\t\t public void run() {\n+\t\t\t\t\t\t\t\t updateProblemIndication();\n+\t\t\t\t\t\t\t }\n+\t\t\t\t\t\t });\n+\t\t\t\t}\n \t\t\t}\n \t\t};\n \n@@ -451,6 +471,7 @@ else if (!savedResources.remove(resource)) {\n \t\t\t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t\t}\n+\t\t\t\t\t\t\t\treturn false;\n \t\t\t\t\t\t\t}\n \n \t\t\t\t\t\t\treturn true;\n@@ -1449,7 +1470,7 @@ public void execute(IProgressMonitor monitor) {\n \n \t/**\n \t * This returns whether something has been persisted to the URI of the specified resource.\n-\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \n+\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\n \t * \n \t * @generated\n@@ -1519,20 +1540,9 @@ protected void doSaveAs(URI uri, IEditorInput editorInput) {\n \t * @generated\n \t */\n \tpublic void gotoMarker(IMarker marker) {\n-\t\ttry {\n-\t\t\tif (marker.getType().equals(EValidator.MARKER)) {\n-\t\t\t\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);\n-\t\t\t\tif (uriAttribute != null) {\n-\t\t\t\t\tURI uri = URI.createURI(uriAttribute);\n-\t\t\t\t\tEObject eObject = editingDomain.getResourceSet().getEObject(uri, true);\n-\t\t\t\t\tif (eObject != null) {\n-\t\t\t\t\t setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t}\n-\t\tcatch (CoreException exception) {\n-\t\t\tEntityEditorPlugin.INSTANCE.log(exception);\n+\t\tList targetObjects = markerHelper.getTargetObjects(editingDomain, marker);\n+\t\tif (!targetObjects.isEmpty()) {\n+\t\t\tsetSelectionToViewer(targetObjects);\n \t\t}\n \t}\n \n@@ -1721,7 +1731,7 @@ public void dispose() {\n \t\t\tgetActionBarContributor().setActiveEditor(null);\n \t\t}\n \n-\t\tif (propertySheetPage != null) {\n+\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {\n \t\t\tpropertySheetPage.dispose();\n \t\t}\n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fpresentation%2FEntityEditor.java","sha":"3cabf29196558b7f86423c465af74e1fd09af3d9","status":"modified"},{"additions":1,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2FMETA-INF%2FMANIFEST.MF","changes":1,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/META-INF/MANIFEST.MF","new_code":" org.eclipse.emf.cdo;visibility:=reexport,","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -15,6 +15,7 @@ Export-Package: org.obeonetwork.dsl.entity,\n org.obeonetwork.dsl.entity.util\n Require-Bundle: org.eclipse.core.runtime,\n org.eclipse.emf.ecore;visibility:=reexport,\n+ org.eclipse.emf.cdo;visibility:=reexport,\n org.eclipse.emf.ecore.xmi;visibility:=reexport,\n org.obeonetwork.dsl.environment;visibility:=reexport\n Bundle-ActivationPolicy: lazy","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2FMETA-INF%2FMANIFEST.MF","sha":"b6669f5cc9f2cbcbf62f971931614879dd45d41b","status":"modified"},{"additions":1,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.ecore","changes":1,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.ecore?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/model/entity.ecore","new_code":" ","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -3,6 +3,7 @@\n xmlns:ecore=\"http://www.eclipse.org/emf/2002/Ecore\" name=\"entity\" nsURI=\"http://www.obeonetwork.org/dsl/entity/3.0.0\"\n nsPrefix=\"oent\">\n \n+ \n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.ecore","sha":"09e13314f4c0a117418d7ab00f164b84812d9d99","status":"modified"},{"additions":3,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.genmodel","changes":39,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.genmodel?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":36,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/model/entity.genmodel","new_code":" importerID=\"org.eclipse.emf.importer.cdo\" featureDelegation=\"Dynamic\" containmentProxies=\"true\"\n \n ","new_methods":[],"old_code":" importerID=\"org.eclipse.importer.cdo\" featureDelegation=\"Dynamic\" containmentProxies=\"true\"\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n ","old_methods":[],"patch":"@@ -3,7 +3,7 @@\n xmlns:genmodel=\"http://www.eclipse.org/emf/2002/GenModel\" copyrightText=\"Copyright (c) 2008-2009 Obeo.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA; Obeo - initial API and implementation\"\n modelDirectory=\"/org.obeonetwork.dsl.entity/src\" creationIcons=\"false\" modelPluginID=\"org.obeonetwork.dsl.entity\"\n modelName=\"Entity\" rootExtendsInterface=\"org.eclipse.emf.cdo.CDOObject\" rootExtendsClass=\"org.eclipse.emf.internal.cdo.CDOObjectImpl\"\n- importerID=\"org.eclipse.importer.cdo\" featureDelegation=\"Dynamic\" containmentProxies=\"true\"\n+ importerID=\"org.eclipse.emf.importer.cdo\" featureDelegation=\"Dynamic\" containmentProxies=\"true\"\n complianceLevel=\"5.0\" runtimeVersion=\"2.6\" usedGenPackages=\"../../org.obeonetwork.dsl.environment/model/environment.genmodel#//environment\">\n entity.ecore\n CDO=org.eclipse.emf.cdo\n@@ -14,48 +14,15 @@\n \n \n \n- \n- \n- \n- \n- \n- \n+ \n+ \n \n \n- \n- \n- \n- \n- \n- \n \n \n \n \n- \n \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n \n \n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.genmodel","sha":"3e2b2ac3b0be4be6b7dd0f11c783104d8caf3cb9","status":"modified"},{"additions":0,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntity.java","changes":154,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntity.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":154,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/Entity.java","new_code":"","new_methods":[],"old_code":" *
  • {@link org.obeonetwork.dsl.entity.Entity#getOwnedAttributes Owned Attributes}
    • \n *
  • {@link org.obeonetwork.dsl.entity.Entity#getOwnedReferences Owned References}
    • \n *
  • {@link org.obeonetwork.dsl.entity.Entity#getSupertype Supertype}
    • \n *
  • {@link org.obeonetwork.dsl.entity.Entity#getAttributes Attributes}
    • \n *
  • {@link org.obeonetwork.dsl.entity.Entity#getReferences References}
    • \n *
  • {@link org.obeonetwork.dsl.entity.Entity#getProperties Properties}
    • \n *
  • {@link org.obeonetwork.dsl.entity.Entity#getBlock Block}
    • \n\t/**\n\t * Returns the value of the 'Owned Attributes' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Attribute#getEntity Entity}'.\n\t * \n\t *

    \n\t * If the meaning of the 'Owned Attributes' containment\n\t * reference list isn't clear, there really should be more of a description\n\t * here...\n\t *

    \n\t * \n\t * @return the value of the 'Owned Attributes' containment reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_OwnedAttributes()\n\t * @see org.obeonetwork.dsl.entity.Attribute#getEntity\n\t * @model opposite=\"entity\" containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList getOwnedAttributes();\n\n\t/**\n\t * Returns the value of the 'Owned References' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Reference#getEntity Entity}'.\n\t * \n\t *

    \n\t * If the meaning of the 'Owned References' containment\n\t * reference list isn't clear, there really should be more of a description\n\t * here...\n\t *

    \n\t * \n\t * @return the value of the 'Owned References' containment reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_OwnedReferences()\n\t * @see org.obeonetwork.dsl.entity.Reference#getEntity\n\t * @model opposite=\"entity\" containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList getOwnedReferences();\n\n\t/**\n\t * Returns the value of the 'Supertype' reference. \n\t *

    \n\t * If the meaning of the 'Supertype' reference isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * \n\t * @return the value of the 'Supertype' reference.\n\t * @see #setSupertype(Entity)\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Supertype()\n\t * @model\n\t * @generated\n\t */\n\tEntity getSupertype();\n\n\t/**\n\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Entity#getSupertype Supertype}' reference.\n\t * \n\t * @param value the new value of the 'Supertype' reference.\n\t * @see #getSupertype()\n\t * @generated\n\t */\n\tvoid setSupertype(Entity value);\n\n\t/**\n\t * Returns the value of the 'Attributes' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\n\t * \n\t *

    \n\t * If the meaning of the 'Attributes' reference list isn't\n\t * clear, there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Attributes' reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Attributes()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList getAttributes();\n\n\t/**\n\t * Returns the value of the 'References' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\n\t * \n\t *

    \n\t * If the meaning of the 'References' reference list isn't\n\t * clear, there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'References' reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_References()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList getReferences();\n\n\t/**\n\t * Returns the value of the 'Properties' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Property}.\n\t * \n\t *

    \n\t * If the meaning of the 'Properties' reference list isn't\n\t * clear, there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Properties' reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Properties()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList getProperties();\n\n\t/**\n\t * Returns the value of the 'Block' container reference.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Block#getEntities Entities}'.\n\t * \n\t *

    \n\t * If the meaning of the 'Block' container reference isn't\n\t * clear, there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Block' container reference.\n\t * @see #setBlock(Block)\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Block()\n\t * @see org.obeonetwork.dsl.entity.Block#getEntities\n\t * @model opposite=\"entities\" required=\"true\" transient=\"false\"\n\t * @generated\n\t */\n\tBlock getBlock();\n\n\t/**\n\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Entity#getBlock Block}' container reference.\n\t * \n\t * @param value the new value of the 'Block' container reference.\n\t * @see #getBlock()\n\t * @generated\n\t */\n\tvoid setBlock(Block value);\n\n\t/**\n\t * \n\t * \n\t * @model\n\t * @generated\n\t */\n\tboolean isSubtypeOf(Entity entity);\n","old_methods":[],"patch":"@@ -22,17 +22,10 @@\n *

    \n * The following features are supported:\n *

      \n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getOwnedAttributes Owned Attributes}
      • \n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getOwnedReferences Owned References}
      • \n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getSupertype Supertype}
      • \n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getAttributes Attributes}
      • \n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getReferences References}
      • \n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getProperties Properties}
      • \n *
    • {@link org.obeonetwork.dsl.entity.Entity#getEstimatedVolumetry Estimated Volumetry}
      • \n *
    • {@link org.obeonetwork.dsl.entity.Entity#getEstimatedAccess Estimated Access}
      • \n *
    • {@link org.obeonetwork.dsl.entity.Entity#isHistorized Historized}
      • \n *
    • {@link org.obeonetwork.dsl.entity.Entity#getOwnedFinders Owned Finders}
      • \n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getBlock Block}
      • \n *
    • {@link org.obeonetwork.dsl.entity.Entity#getInheritanceKind Inheritance Kind}
      • \n *
    \n *

    \n@@ -49,118 +42,6 @@ public interface Entity extends StructuredType {\n \t */\n \tString copyright = \"Copyright (c) 2008-2009 Obeo.\\nAll rights reserved. This program and the accompanying materials\\nare made available under the terms of the Eclipse Public License v1.0\\nwhich accompanies this distribution, and is available at\\nhttp://www.eclipse.org/legal/epl-v10.html\\n\\nContributors:\\n Obeo - initial API and implementation\";\n \n-\t/**\n-\t * Returns the value of the 'Owned Attributes' containment reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Attribute#getEntity Entity}'.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'Owned Attributes' containment\n-\t * reference list isn't clear, there really should be more of a description\n-\t * here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'Owned Attributes' containment reference list.\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_OwnedAttributes()\n-\t * @see org.obeonetwork.dsl.entity.Attribute#getEntity\n-\t * @model opposite=\"entity\" containment=\"true\" resolveProxies=\"true\"\n-\t * @generated\n-\t */\n-\tEList getOwnedAttributes();\n-\n-\t/**\n-\t * Returns the value of the 'Owned References' containment reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Reference#getEntity Entity}'.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'Owned References' containment\n-\t * reference list isn't clear, there really should be more of a description\n-\t * here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'Owned References' containment reference list.\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_OwnedReferences()\n-\t * @see org.obeonetwork.dsl.entity.Reference#getEntity\n-\t * @model opposite=\"entity\" containment=\"true\" resolveProxies=\"true\"\n-\t * @generated\n-\t */\n-\tEList getOwnedReferences();\n-\n-\t/**\n-\t * Returns the value of the 'Supertype' reference. \n-\t *

    \n-\t * If the meaning of the 'Supertype' reference isn't clear,\n-\t * there really should be more of a description here...\n-\t *

    \n-\t * \n-\t * \n-\t * @return the value of the 'Supertype' reference.\n-\t * @see #setSupertype(Entity)\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Supertype()\n-\t * @model\n-\t * @generated\n-\t */\n-\tEntity getSupertype();\n-\n-\t/**\n-\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Entity#getSupertype Supertype}' reference.\n-\t * \n-\t * @param value the new value of the 'Supertype' reference.\n-\t * @see #getSupertype()\n-\t * @generated\n-\t */\n-\tvoid setSupertype(Entity value);\n-\n-\t/**\n-\t * Returns the value of the 'Attributes' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'Attributes' reference list isn't\n-\t * clear, there really should be more of a description here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'Attributes' reference list.\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Attributes()\n-\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n-\t * @generated\n-\t */\n-\tEList getAttributes();\n-\n-\t/**\n-\t * Returns the value of the 'References' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'References' reference list isn't\n-\t * clear, there really should be more of a description here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'References' reference list.\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_References()\n-\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n-\t * @generated\n-\t */\n-\tEList getReferences();\n-\n-\t/**\n-\t * Returns the value of the 'Properties' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Property}.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'Properties' reference list isn't\n-\t * clear, there really should be more of a description here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'Properties' reference list.\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Properties()\n-\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n-\t * @generated\n-\t */\n-\tEList getProperties();\n-\n \t/**\n \t * Returns the value of the 'Estimated Volumetry' attribute.\n \t * \n@@ -258,33 +139,6 @@ public interface Entity extends StructuredType {\n \t */\n \tEList getOwnedFinders();\n \n-\t/**\n-\t * Returns the value of the 'Block' container reference.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Block#getEntities Entities}'.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'Block' container reference isn't\n-\t * clear, there really should be more of a description here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'Block' container reference.\n-\t * @see #setBlock(Block)\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Block()\n-\t * @see org.obeonetwork.dsl.entity.Block#getEntities\n-\t * @model opposite=\"entities\" required=\"true\" transient=\"false\"\n-\t * @generated\n-\t */\n-\tBlock getBlock();\n-\n-\t/**\n-\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Entity#getBlock Block}' container reference.\n-\t * \n-\t * @param value the new value of the 'Block' container reference.\n-\t * @see #getBlock()\n-\t * @generated\n-\t */\n-\tvoid setBlock(Block value);\n-\n \t/**\n \t * Returns the value of the 'Inheritance Kind' attribute.\n \t * The literals are from the enumeration {@link org.obeonetwork.dsl.entity.InheritanceKind}.\n@@ -313,12 +167,4 @@ public interface Entity extends StructuredType {\n \t */\n \tvoid setInheritanceKind(InheritanceKind value);\n \n-\t/**\n-\t * \n-\t * \n-\t * @model\n-\t * @generated\n-\t */\n-\tboolean isSubtypeOf(Entity entity);\n-\n } // Entity","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntity.java","sha":"d437e6c7d4bafe48f759fae41f1ed0d2a1879f0e","status":"modified"},{"additions":0,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntityFactory.java","changes":27,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntityFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":27,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/EntityFactory.java","new_code":"","new_methods":[],"old_code":"\t/**\n\t * Returns a new object of class 'Block'.\n\t * \n\t * @return a new object of class 'Block'.\n\t * @generated\n\t */\n\tBlock createBlock();\n\n\t/**\n\t * Returns a new object of class 'Attribute'. \n\t * \n\t * @return a new object of class 'Attribute'.\n\t * @generated\n\t */\n\tAttribute createAttribute();\n\n\t/**\n\t * Returns a new object of class 'Reference'. \n\t * \n\t * @return a new object of class 'Reference'.\n\t * @generated\n\t */\n\tReference createReference();\n","old_methods":[],"patch":"@@ -44,15 +44,6 @@ public interface EntityFactory extends EFactory {\n \t */\n \tRoot createRoot();\n \n-\t/**\n-\t * Returns a new object of class 'Block'.\n-\t * \n-\t * @return a new object of class 'Block'.\n-\t * @generated\n-\t */\n-\tBlock createBlock();\n-\n \t/**\n \t * Returns a new object of class 'Entity'.\n \t * \n-\t * \n-\t * @return a new object of class 'Attribute'.\n-\t * @generated\n-\t */\n-\tAttribute createAttribute();\n-\n-\t/**\n-\t * Returns a new object of class 'Reference'. \n-\t * \n-\t * @return a new object of class 'Reference'.\n-\t * @generated\n-\t */\n-\tReference createReference();\n-\n \t/**\n \t * Returns a new object of class 'Finder'.\n \t * \n\t * \n\tint ENTITY__SUPERTYPE = EnvironmentPackage.STRUCTURED_TYPE__SUPERTYPE;\n\t * The feature id for the 'Associated Types' reference list.\n\t * \n\t * \n\tint ENTITY__ASSOCIATED_TYPES = EnvironmentPackage.STRUCTURED_TYPE__ASSOCIATED_TYPES;\n\t * The feature id for the 'Owned Attributes' containment reference list.\n\t * @ordered\n\tint ENTITY__OWNED_ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES;\n\t * The feature id for the 'Attributes' reference list.\n\tint ENTITY__ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE__ATTRIBUTES;\n\t * The feature id for the 'Owned References' containment reference list.\n\t * \n\tint ENTITY__OWNED_REFERENCES = EnvironmentPackage.STRUCTURED_TYPE__OWNED_REFERENCES;\n\t * The feature id for the 'References' reference list.\n\t * \n\tint ENTITY__REFERENCES = EnvironmentPackage.STRUCTURED_TYPE__REFERENCES;\n\t * The feature id for the 'Properties' reference list.\n\t * \n\tint ENTITY__PROPERTIES = EnvironmentPackage.STRUCTURED_TYPE__PROPERTIES;\n\t * The feature id for the 'Estimated Volumetry' attribute.\n\t * \n\tint ENTITY__ESTIMATED_VOLUMETRY = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 0;\n\t * The feature id for the 'Estimated Access' attribute.\n\t * \n\tint ENTITY__ESTIMATED_ACCESS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 1;\n\t * The feature id for the 'Historized' attribute. \n\t * \n\tint ENTITY__HISTORIZED = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 2;\n\t * The feature id for the 'Owned Finders' containment reference list.\n\t * \n\tint ENTITY__OWNED_FINDERS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 3;\n\t * The feature id for the 'Inheritance Kind' attribute.\n\t * \n\tint ENTITY__INHERITANCE_KIND = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 4;\n\t * The number of structural features of the 'Entity' class.\n\tint ENTITY_FEATURE_COUNT = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 5;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl Finder}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.FinderImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getFinder()\n\tint FINDER = 2;\n\t * The feature id for the 'Metadatas' containment reference.\n\tint FINDER__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n\t * The feature id for the 'Description' attribute.\n\t * \n\t * \n\tint FINDER__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n\t * The feature id for the 'Keywords' attribute list.\n\t * \n\t * \n\tint FINDER__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n\t * The feature id for the 'Behaviours' containment reference list.\n\t * \n\t * \n\tint FINDER__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n\t * The feature id for the 'Binding Registries' reference list.\n\t * \n\t * \n\tint FINDER__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\t * The feature id for the 'Version' attribute.\n\t * \n\t * \n\tint FINDER__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n\t * The feature id for the 'Created On' attribute.\n\t * \n\t * \n\tint FINDER__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n\t * The feature id for the 'Modified On' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n\n\t/**\n\t * The feature id for the 'Name' attribute. \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\n\n\t/**\n\t * The number of structural features of the 'Finder' class.\n\tint FINDER_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.CriterionImpl Criterion}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.CriterionImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getCriterion()\n\tint CRITERION = 4;\n\tint CRITERION__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n\tint CRITERION__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n\tint CRITERION__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n\tint CRITERION__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n\tint CRITERION__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\tint CRITERION__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n\tint CRITERION__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n\tint CRITERION__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n\t * The number of structural features of the 'Criterion' class.\n\tint CRITERION_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.InternalCriterionImpl Internal Criterion}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.InternalCriterionImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInternalCriterion()\n\tint INTERNAL_CRITERION = 3;\n\tint INTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n\tint INTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n\tint INTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n\tint INTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n\tint INTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n\tint INTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n\tint INTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n\tint INTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n\t * The feature id for the 'Target' reference. \n\t * \n\t * @ordered\n\tint EXTERNAL_CRITERION__TYPE = CRITERION_FEATURE_COUNT + 1;\n\t * The number of structural features of the 'External Criterion' class.\n\t * @ordered\n\tint EXTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.InheritanceKind Inheritance Kind}' enum.\n\t * @see org.obeonetwork.dsl.entity.InheritanceKind\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInheritanceKind()\n\tint INHERITANCE_KIND = 6;\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Root Root}'.\n\t * @return the meta object for class 'Root'.\n\t * @see org.obeonetwork.dsl.entity.Root\n\tEClass getRoot();\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Root#getName Name}'.\n\t * \n\t * \n\t * @return the meta object for the attribute 'Name'.\n\t * @see org.obeonetwork.dsl.entity.Root#getName()\n\t * @see #getRoot()\n\tEAttribute getRoot_Name();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Root#getNamespaces Namespaces}'.\n\t * \n\t * \n\t * @return the meta object for the containment reference list 'Namespaces'.\n\t * @see org.obeonetwork.dsl.entity.Root#getNamespaces()\n\t * @see #getRoot()\n\tEReference getRoot_Namespaces();\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Entity Entity}'.\n\t * @return the meta object for class 'Entity'.\n\t * @see org.obeonetwork.dsl.entity.Entity\n\tEClass getEntity();\n\t\t * \n\t\t * \n\t\tEAttribute ROOT__NAME = eINSTANCE.getRoot_Name();\n\t\t * The meta object literal for the 'Namespaces' containment reference list feature.\n\t\t * \n\t\t * \n\t\tEReference ROOT__NAMESPACES = eINSTANCE.getRoot_Namespaces();","new_methods":[],"old_code":"\tString eNS_URI = \"http://www.obeonetwork.org/dsl/entity/2.0.0\";\n\tint ROOT__METADATAS = EnvironmentPackage.NAMESPACE__METADATAS;\n\tint ROOT__DESCRIPTION = EnvironmentPackage.NAMESPACE__DESCRIPTION;\n\tint ROOT__KEYWORDS = EnvironmentPackage.NAMESPACE__KEYWORDS;\n\tint ROOT__BEHAVIOURS = EnvironmentPackage.NAMESPACE__BEHAVIOURS;\n\tint ROOT__BINDING_REGISTRIES = EnvironmentPackage.NAMESPACE__BINDING_REGISTRIES;\n\tint ROOT__VERSION = EnvironmentPackage.NAMESPACE__VERSION;\n\tint ROOT__CREATED_ON = EnvironmentPackage.NAMESPACE__CREATED_ON;\n\tint ROOT__MODIFIED_ON = EnvironmentPackage.NAMESPACE__MODIFIED_ON;\n\t * The feature id for the 'Owned Namespaces' containment reference list.\n\tint ROOT__OWNED_NAMESPACES = EnvironmentPackage.NAMESPACE__OWNED_NAMESPACES;\n\t * The feature id for the 'Owner' container reference.\n\tint ROOT__OWNER = EnvironmentPackage.NAMESPACE__OWNER;\n\t * The feature id for the 'Name' attribute.\n\tint ROOT__NAME = EnvironmentPackage.NAMESPACE__NAME;\n\n\t/**\n\t * The feature id for the 'Blocks' containment reference list.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint ROOT__BLOCKS = EnvironmentPackage.NAMESPACE_FEATURE_COUNT + 0;\n\tint ROOT_FEATURE_COUNT = EnvironmentPackage.NAMESPACE_FEATURE_COUNT + 1;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.BlockImpl Block}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.BlockImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getBlock()\n\tint BLOCK = 1;\n\tint BLOCK__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n\tint BLOCK__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n\tint BLOCK__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n\tint BLOCK__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n\tint BLOCK__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\tint BLOCK__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n\tint BLOCK__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n\tint BLOCK__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n\tint BLOCK__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\t * The feature id for the 'Entities' containment reference list.\n\tint BLOCK__ENTITIES = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n\t * The feature id for the 'Subblocks' containment reference list.\n\t * \n\tint BLOCK__SUBBLOCKS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\t * The number of structural features of the 'Block' class. \n\t * \n\tint BLOCK_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.EntityImpl Entity}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.EntityImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getEntity()\n\tint ENTITY = 2;\n\t * The feature id for the 'Metadatas' containment reference.\n\tint ENTITY__METADATAS = EnvironmentPackage.STRUCTURED_TYPE__METADATAS;\n\t * The feature id for the 'Description' attribute.\n\t * \n\t * \n\tint ENTITY__DESCRIPTION = EnvironmentPackage.STRUCTURED_TYPE__DESCRIPTION;\n\t * The feature id for the 'Keywords' attribute list.\n\t * \n\t * \n\tint ENTITY__KEYWORDS = EnvironmentPackage.STRUCTURED_TYPE__KEYWORDS;\n\t * The feature id for the 'Behaviours' containment reference list.\n\t * \n\t * \n\tint ENTITY__BEHAVIOURS = EnvironmentPackage.STRUCTURED_TYPE__BEHAVIOURS;\n\t * The feature id for the 'Binding Registries' reference list.\n\t * \n\t * \n\tint ENTITY__BINDING_REGISTRIES = EnvironmentPackage.STRUCTURED_TYPE__BINDING_REGISTRIES;\n\t * The feature id for the 'Version' attribute.\n\t * \n\t * \n\tint ENTITY__VERSION = EnvironmentPackage.STRUCTURED_TYPE__VERSION;\n\t * The feature id for the 'Created On' attribute.\n\t * \n\t * \n\tint ENTITY__CREATED_ON = EnvironmentPackage.STRUCTURED_TYPE__CREATED_ON;\n\t * The feature id for the 'Modified On' attribute.\n\t * \n\t * \n\tint ENTITY__MODIFIED_ON = EnvironmentPackage.STRUCTURED_TYPE__MODIFIED_ON;\n\t * The feature id for the 'Name' attribute. \n\t * \n\tint ENTITY__NAME = EnvironmentPackage.STRUCTURED_TYPE__NAME;\n\t * The feature id for the 'Type Definition' container reference.\n\tint ENTITY__TYPE_DEFINITION = EnvironmentPackage.STRUCTURED_TYPE__TYPE_DEFINITION;\n\t * The feature id for the 'Owned Attributes' containment reference list.\n\t * @ordered\n\tint ENTITY__OWNED_ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 0;\n\t * The feature id for the 'Owned References' containment reference list.\n\tint ENTITY__OWNED_REFERENCES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 1;\n\t * The feature id for the 'Supertype' reference. \n\t * \n\tint ENTITY__SUPERTYPE = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 2;\n\t * The feature id for the 'Attributes' reference list.\n\t * \n\tint ENTITY__ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 3;\n\t * The feature id for the 'References' reference list.\n\t * \n\tint ENTITY__REFERENCES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 4;\n\t * The feature id for the 'Properties' reference list.\n\t * \n\tint ENTITY__PROPERTIES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 5;\n\t * The feature id for the 'Estimated Volumetry' attribute.\n\t * \n\tint ENTITY__ESTIMATED_VOLUMETRY = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 6;\n\t * The feature id for the 'Estimated Access' attribute.\n\t * \n\tint ENTITY__ESTIMATED_ACCESS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 7;\n\t * The feature id for the 'Historized' attribute. \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint PROPERTY__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\n\t/**\n\t * The feature id for the 'Multiplicity' attribute.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint PROPERTY__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n\n\t/**\n\t * The feature id for the 'Is Primary Key' attribute.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint PROPERTY__IS_PRIMARY_KEY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\t * The number of structural features of the 'Property' class.\n\tint PROPERTY_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.AttributeImpl Attribute}' class.\n\t * @see org.obeonetwork.dsl.entity.impl.AttributeImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getAttribute()\n\tint ATTRIBUTE = 4;\n\tint ATTRIBUTE__METADATAS = PROPERTY__METADATAS;\n\tint ATTRIBUTE__DESCRIPTION = PROPERTY__DESCRIPTION;\n\tint ATTRIBUTE__KEYWORDS = PROPERTY__KEYWORDS;\n\tint ATTRIBUTE__BEHAVIOURS = PROPERTY__BEHAVIOURS;\n\tint ATTRIBUTE__BINDING_REGISTRIES = PROPERTY__BINDING_REGISTRIES;\n\tint ATTRIBUTE__VERSION = PROPERTY__VERSION;\n\tint ATTRIBUTE__CREATED_ON = PROPERTY__CREATED_ON;\n\tint ATTRIBUTE__MODIFIED_ON = PROPERTY__MODIFIED_ON;\n\t * The feature id for the 'Name' attribute. \n\t * @generated\n\t * @ordered\n\t */\n\tint ATTRIBUTE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\n\n\t/**\n\t * The feature id for the 'Is Primary Key' attribute.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint ATTRIBUTE__IS_PRIMARY_KEY = PROPERTY__IS_PRIMARY_KEY;\n\n\t/**\n\t * The feature id for the 'Entity' container reference.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint ATTRIBUTE__ENTITY = PROPERTY_FEATURE_COUNT + 0;\n\t * The feature id for the 'Type' reference. \n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\n\n\t/**\n\t * The feature id for the 'Is Primary Key' attribute.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__IS_PRIMARY_KEY = PROPERTY__IS_PRIMARY_KEY;\n\n\t/**\n\t * The feature id for the 'Entity' container reference.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__ENTITY = PROPERTY_FEATURE_COUNT + 0;\n\n\t/**\n\t * The feature id for the 'Is Composite' attribute.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__IS_COMPOSITE = PROPERTY_FEATURE_COUNT + 1;\n\n\t/**\n\t * The feature id for the 'Opposite Of' reference. \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__OPPOSITE_OF = PROPERTY_FEATURE_COUNT + 2;\n\n\t/**\n\t * The feature id for the 'Type' reference. \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__TYPE = PROPERTY_FEATURE_COUNT + 3;\n\n\t/**\n\t * The feature id for the 'Navigable' attribute. \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__NAVIGABLE = PROPERTY_FEATURE_COUNT + 4;\n\n\t/**\n\t * The number of structural features of the 'Reference' class.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 5;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl Finder}' class.\n\t * \n\t * @see org.obeonetwork.dsl.entity.impl.FinderImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getFinder()\n\t * @generated\n\t */\n\tint FINDER = 6;\n\n\t/**\n\t * The feature id for the 'Metadatas' containment reference.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n\n\t/**\n\t * The feature id for the 'Description' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n\n\t/**\n\t * The feature id for the 'Keywords' attribute list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n\n\t/**\n\t * The feature id for the 'Behaviours' containment reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n\n\t/**\n\t * The feature id for the 'Binding Registries' reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\n\t/**\n\t * The feature id for the 'Version' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n\n\t/**\n\t * The feature id for the 'Created On' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n\n\t/**\n\t * The feature id for the 'Modified On' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n\n\t/**\n\t * The feature id for the 'Name' attribute. \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\n\t/**\n\t * The feature id for the 'Entity' container reference.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__ENTITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n\n\t/**\n\t * The feature id for the 'Customized Name' attribute.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__CUSTOMIZED_NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\n\t/**\n\t * The feature id for the 'Criterions' containment reference list.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__CRITERIONS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n\n\t/**\n\t * The feature id for the 'Multiplicity' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\n\n\t/**\n\t * The number of structural features of the 'Finder' class.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint FINDER_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.CriterionImpl Criterion}' class.\n\t * \n\t * @see org.obeonetwork.dsl.entity.impl.CriterionImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getCriterion()\n\t * @generated\n\t */\n\tint CRITERION = 8;\n\n\t/**\n\t * The feature id for the 'Metadatas' containment reference.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n\n\t/**\n\t * The feature id for the 'Description' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n\n\t/**\n\t * The feature id for the 'Keywords' attribute list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n\n\t/**\n\t * The feature id for the 'Behaviours' containment reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n\n\t/**\n\t * The feature id for the 'Binding Registries' reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\n\t/**\n\t * The feature id for the 'Version' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n\n\t/**\n\t * The feature id for the 'Created On' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n\n\t/**\n\t * The feature id for the 'Modified On' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n\n\t/**\n\t * The number of structural features of the 'Criterion' class.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint CRITERION_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.InternalCriterionImpl Internal Criterion}' class.\n\t * \n\t * @see org.obeonetwork.dsl.entity.impl.InternalCriterionImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInternalCriterion()\n\t * @generated\n\t */\n\tint INTERNAL_CRITERION = 7;\n\n\t/**\n\t * The feature id for the 'Metadatas' containment reference.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n\n\t/**\n\t * The feature id for the 'Description' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n\n\t/**\n\t * The feature id for the 'Keywords' attribute list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n\n\t/**\n\t * The feature id for the 'Behaviours' containment reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n\n\t/**\n\t * The feature id for the 'Binding Registries' reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n\n\t/**\n\t * The feature id for the 'Version' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n\n\t/**\n\t * The feature id for the 'Created On' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n\n\t/**\n\t * The feature id for the 'Modified On' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n\n\t/**\n\t * The feature id for the 'Target' reference. \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__TARGET = CRITERION_FEATURE_COUNT + 0;\n\n\t/**\n\t * The feature id for the 'Name' attribute. \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 1;\n\n\t/**\n\t * The number of structural features of the 'Internal Criterion' class.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint INTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl External Criterion}' class.\n\t * \n\t * @see org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getExternalCriterion()\n\t * @generated\n\t */\n\tint EXTERNAL_CRITERION = 9;\n\n\t/**\n\t * The feature id for the 'Metadatas' containment reference.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n\n\t/**\n\t * The feature id for the 'Description' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n\n\t/**\n\t * The feature id for the 'Keywords' attribute list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n\n\t/**\n\t * The feature id for the 'Behaviours' containment reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n\n\t/**\n\t * The feature id for the 'Binding Registries' reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n\n\t/**\n\t * The feature id for the 'Version' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n\n\t/**\n\t * The feature id for the 'Created On' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n\n\t/**\n\t * The feature id for the 'Modified On' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n\n\t/**\n\t * The feature id for the 'Name' attribute. \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 0;\n\n\t/**\n\t * The feature id for the 'Type' reference. \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION__TYPE = CRITERION_FEATURE_COUNT + 1;\n\n\t/**\n\t * The number of structural features of the 'External Criterion' class.\n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint EXTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.InheritanceKind Inheritance Kind}' enum.\n\t * \n\t * @see org.obeonetwork.dsl.entity.InheritanceKind\n\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInheritanceKind()\n\t * @generated\n\t */\n\tint INHERITANCE_KIND = 10;\n\n\t/**\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Root Root}'.\n\t * \n\t * @return the meta object for class 'Root'.\n\t * @see org.obeonetwork.dsl.entity.Root\n\t * @generated\n\t */\n\tEClass getRoot();\n\n\t/**\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Root#getBlocks Blocks}'.\n\t * \n\t * @return the meta object for the containment reference list 'Blocks'.\n\t * @see org.obeonetwork.dsl.entity.Root#getBlocks()\n\t * @see #getRoot()\n\t * @generated\n\t */\n\tEReference getRoot_Blocks();\n\n\t/**\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Block Block}'.\n\t * \n\t * @return the meta object for class 'Block'.\n\t * @see org.obeonetwork.dsl.entity.Block\n\t * @generated\n\t */\n\tEClass getBlock();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Block#getName Name}'.\n\t * \n\t * @return the meta object for the attribute 'Name'.\n\t * @see org.obeonetwork.dsl.entity.Block#getName()\n\t * @see #getBlock()\n\t * @generated\n\t */\n\tEAttribute getBlock_Name();\n\n\t/**\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Block#getEntities Entities}'.\n\t * \n\t * @return the meta object for the containment reference list 'Entities'.\n\t * @see org.obeonetwork.dsl.entity.Block#getEntities()\n\t * @see #getBlock()\n\t * @generated\n\t */\n\tEReference getBlock_Entities();\n\n\t/**\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Block#getSubblocks Subblocks}'.\n\t * \n\t * @return the meta object for the containment reference list 'Subblocks'.\n\t * @see org.obeonetwork.dsl.entity.Block#getSubblocks()\n\t * @see #getBlock()\n\t * @generated\n\t */\n\tEReference getBlock_Subblocks();\n\n\t/**\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Entity Entity}'.\n\t * \n\t * @return the meta object for class 'Entity'.\n\t * @see org.obeonetwork.dsl.entity.Entity\n\tEClass getEntity();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Entity#getOwnedAttributes Owned Attributes}'.\n\t * @return the meta object for the containment reference list 'Owned Attributes'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getOwnedAttributes()\n\t * @see #getEntity()\n\tEReference getEntity_OwnedAttributes();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Entity#getOwnedReferences Owned References}'.\n\t * @return the meta object for the containment reference list 'Owned References'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getOwnedReferences()\n\t * @see #getEntity()\n\tEReference getEntity_OwnedReferences();\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Entity#getSupertype Supertype}'.\n\t * @return the meta object for the reference 'Supertype'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getSupertype()\n\t * @see #getEntity()\n\tEReference getEntity_Supertype();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getAttributes Attributes}'.\n\t * \n\t * @return the meta object for the reference list 'Attributes'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getAttributes()\n\t * @see #getEntity()\n\tEReference getEntity_Attributes();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getReferences References}'.\n\t * \n\t * @return the meta object for the reference list 'References'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getReferences()\n\t * @see #getEntity()\n\tEReference getEntity_References();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getProperties Properties}'.\n\t * @return the meta object for the reference list 'Properties'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getProperties()\n\t * @see #getEntity()\n\tEReference getEntity_Properties();\n\t/**\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Entity#getBlock Block}'.\n\t * \n\t * @return the meta object for the container reference 'Block'.\n\t * @see org.obeonetwork.dsl.entity.Entity#getBlock()\n\t * @see #getEntity()\n\t * @generated\n\t */\n\tEReference getEntity_Block();\n\n\t/**\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Property Property}'.\n\t * \n\t * @return the meta object for class 'Property'.\n\t * @see org.obeonetwork.dsl.entity.Property\n\t * @generated\n\t */\n\tEClass getProperty();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#getName Name}'.\n\t * \n\t * @return the meta object for the attribute 'Name'.\n\t * @see org.obeonetwork.dsl.entity.Property#getName()\n\t * @see #getProperty()\n\t * @generated\n\t */\n\tEAttribute getProperty_Name();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#getMultiplicity Multiplicity}'.\n\t * \n\t * @return the meta object for the attribute 'Multiplicity'.\n\t * @see org.obeonetwork.dsl.entity.Property#getMultiplicity()\n\t * @see #getProperty()\n\t * @generated\n\t */\n\tEAttribute getProperty_Multiplicity();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#isIsPrimaryKey Is Primary Key}'.\n\t * \n\t * @return the meta object for the attribute 'Is Primary Key'.\n\t * @see org.obeonetwork.dsl.entity.Property#isIsPrimaryKey()\n\t * @see #getProperty()\n\t * @generated\n\t */\n\tEAttribute getProperty_IsPrimaryKey();\n\n\t/**\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Attribute Attribute}'.\n\t * \n\t * @return the meta object for class 'Attribute'.\n\t * @see org.obeonetwork.dsl.entity.Attribute\n\t * @generated\n\t */\n\tEClass getAttribute();\n\n\t/**\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Attribute#getEntity Entity}'.\n\t * \n\t * @return the meta object for the container reference 'Entity'.\n\t * @see org.obeonetwork.dsl.entity.Attribute#getEntity()\n\t * @see #getAttribute()\n\t * @generated\n\t */\n\tEReference getAttribute_Entity();\n\n\t/**\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Attribute#getType Type}'.\n\t * \n\t * @return the meta object for the reference 'Type'.\n\t * @see org.obeonetwork.dsl.entity.Attribute#getType()\n\t * @see #getAttribute()\n\t * @generated\n\t */\n\tEReference getAttribute_Type();\n\n\t/**\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Reference Reference}'.\n\t * \n\t * @return the meta object for class 'Reference'.\n\t * @see org.obeonetwork.dsl.entity.Reference\n\t * @generated\n\t */\n\tEClass getReference();\n\n\t/**\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Reference#getEntity Entity}'.\n\t * \n\t * @return the meta object for the container reference 'Entity'.\n\t * @see org.obeonetwork.dsl.entity.Reference#getEntity()\n\t * @see #getReference()\n\t * @generated\n\t */\n\tEReference getReference_Entity();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Reference#isIsComposite Is Composite}'.\n\t * \n\t * @return the meta object for the attribute 'Is Composite'.\n\t * @see org.obeonetwork.dsl.entity.Reference#isIsComposite()\n\t * @see #getReference()\n\t * @generated\n\t */\n\tEAttribute getReference_IsComposite();\n\n\t/**\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Reference#getOppositeOf Opposite Of}'.\n\t * \n\t * @return the meta object for the reference 'Opposite Of'.\n\t * @see org.obeonetwork.dsl.entity.Reference#getOppositeOf()\n\t * @see #getReference()\n\t * @generated\n\t */\n\tEReference getReference_OppositeOf();\n\n\t/**\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Reference#getType Type}'.\n\t * \n\t * @return the meta object for the reference 'Type'.\n\t * @see org.obeonetwork.dsl.entity.Reference#getType()\n\t * @see #getReference()\n\t * @generated\n\t */\n\tEReference getReference_Type();\n\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Reference#isNavigable Navigable}'.\n\t * \n\t * @return the meta object for the attribute 'Navigable'.\n\t * @see org.obeonetwork.dsl.entity.Reference#isNavigable()\n\t * @see #getReference()\n\t * @generated\n\t */\n\tEAttribute getReference_Navigable();\n\n\t\t/**\n\t\t * The meta object literal for the 'Blocks' containment reference list feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference ROOT__BLOCKS = eINSTANCE.getRoot_Blocks();\n\n\t\t/**\n\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.BlockImpl Block}' class.\n\t\t * \n\t\t * @see org.obeonetwork.dsl.entity.impl.BlockImpl\n\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getBlock()\n\t\t * @generated\n\t\t */\n\t\tEClass BLOCK = eINSTANCE.getBlock();\n\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEAttribute BLOCK__NAME = eINSTANCE.getBlock_Name();\n\n\t\t/**\n\t\t * The meta object literal for the 'Entities' containment reference list feature.\n\t\t * \n\t\tEReference BLOCK__ENTITIES = eINSTANCE.getBlock_Entities();\n\t\t * The meta object literal for the 'Subblocks' containment reference list feature.\n\t\t * \n\t\tEReference BLOCK__SUBBLOCKS = eINSTANCE.getBlock_Subblocks();\n\t\t/**\n\t\t * The meta object literal for the 'Owned Attributes' containment reference list feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__OWNED_ATTRIBUTES = eINSTANCE.getEntity_OwnedAttributes();\n\n\t\t/**\n\t\t * The meta object literal for the 'Owned References' containment reference list feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__OWNED_REFERENCES = eINSTANCE.getEntity_OwnedReferences();\n\n\t\t/**\n\t\t * The meta object literal for the 'Supertype' reference feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__SUPERTYPE = eINSTANCE.getEntity_Supertype();\n\n\t\t/**\n\t\t * The meta object literal for the 'Attributes' reference list feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__ATTRIBUTES = eINSTANCE.getEntity_Attributes();\n\n\t\t/**\n\t\t * The meta object literal for the 'References' reference list feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__REFERENCES = eINSTANCE.getEntity_References();\n\n\t\t/**\n\t\t * The meta object literal for the 'Properties' reference list feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__PROPERTIES = eINSTANCE.getEntity_Properties();\n\n\t\t/**\n\t\t * The meta object literal for the 'Block' container reference feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference ENTITY__BLOCK = eINSTANCE.getEntity_Block();\n\n\t\t/**\n\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.PropertyImpl Property}' class.\n\t\t * \n\t\t * @see org.obeonetwork.dsl.entity.impl.PropertyImpl\n\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getProperty()\n\t\t * @generated\n\t\t */\n\t\tEClass PROPERTY = eINSTANCE.getProperty();\n\n\t\t/**\n\t\t * The meta object literal for the 'Name' attribute feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name();\n\n\t\t/**\n\t\t * The meta object literal for the 'Multiplicity' attribute feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEAttribute PROPERTY__MULTIPLICITY = eINSTANCE.getProperty_Multiplicity();\n\n\t\t/**\n\t\t * The meta object literal for the 'Is Primary Key' attribute feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEAttribute PROPERTY__IS_PRIMARY_KEY = eINSTANCE.getProperty_IsPrimaryKey();\n\n\t\t/**\n\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.AttributeImpl Attribute}' class.\n\t\t * \n\t\t * @see org.obeonetwork.dsl.entity.impl.AttributeImpl\n\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getAttribute()\n\t\t * @generated\n\t\t */\n\t\tEClass ATTRIBUTE = eINSTANCE.getAttribute();\n\n\t\t/**\n\t\t * The meta object literal for the 'Entity' container reference feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference ATTRIBUTE__ENTITY = eINSTANCE.getAttribute_Entity();\n\n\t\t/**\n\t\t * The meta object literal for the 'Type' reference feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference ATTRIBUTE__TYPE = eINSTANCE.getAttribute_Type();\n\n\t\t/**\n\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.ReferenceImpl Reference}' class.\n\t\t * \n\t\t * @see org.obeonetwork.dsl.entity.impl.ReferenceImpl\n\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getReference()\n\t\t * @generated\n\t\t */\n\t\tEClass REFERENCE = eINSTANCE.getReference();\n\n\t\t/**\n\t\t * The meta object literal for the 'Entity' container reference feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference REFERENCE__ENTITY = eINSTANCE.getReference_Entity();\n\n\t\t/**\n\t\t * The meta object literal for the 'Is Composite' attribute feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEAttribute REFERENCE__IS_COMPOSITE = eINSTANCE.getReference_IsComposite();\n\n\t\t/**\n\t\t * The meta object literal for the 'Opposite Of' reference feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference REFERENCE__OPPOSITE_OF = eINSTANCE.getReference_OppositeOf();\n\n\t\t/**\n\t\t * The meta object literal for the 'Type' reference feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference REFERENCE__TYPE = eINSTANCE.getReference_Type();\n\n\t\t/**\n\t\t * The meta object literal for the 'Navigable' attribute feature.\n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEAttribute REFERENCE__NAVIGABLE = eINSTANCE.getReference_Navigable();\n","old_methods":[],"patch":"@@ -53,7 +53,7 @@ public interface EntityPackage extends EPackage {\n \t * \n \t * @generated\n \t */\n-\tString eNS_URI = \"http://www.obeonetwork.org/dsl/entity/2.0.0\";\n+\tString eNS_URI = \"http://www.obeonetwork.org/dsl/entity/3.0.0\";\n \n \t/**\n \t * The package namespace name.\n@@ -85,7 +85,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__METADATAS = EnvironmentPackage.NAMESPACE__METADATAS;\n+\tint ROOT__METADATAS = EnvironmentPackage.TYPES_DEFINITION__METADATAS;\n \n \t/**\n \t * The feature id for the 'Description' attribute.\n@@ -94,7 +94,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__DESCRIPTION = EnvironmentPackage.NAMESPACE__DESCRIPTION;\n+\tint ROOT__DESCRIPTION = EnvironmentPackage.TYPES_DEFINITION__DESCRIPTION;\n \n \t/**\n \t * The feature id for the 'Keywords' attribute list.\n@@ -103,7 +103,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__KEYWORDS = EnvironmentPackage.NAMESPACE__KEYWORDS;\n+\tint ROOT__KEYWORDS = EnvironmentPackage.TYPES_DEFINITION__KEYWORDS;\n \n \t/**\n \t * The feature id for the 'Behaviours' containment reference list.\n@@ -112,7 +112,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__BEHAVIOURS = EnvironmentPackage.NAMESPACE__BEHAVIOURS;\n+\tint ROOT__BEHAVIOURS = EnvironmentPackage.TYPES_DEFINITION__BEHAVIOURS;\n \n \t/**\n \t * The feature id for the 'Binding Registries' reference list.\n@@ -121,7 +121,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__BINDING_REGISTRIES = EnvironmentPackage.NAMESPACE__BINDING_REGISTRIES;\n+\tint ROOT__BINDING_REGISTRIES = EnvironmentPackage.TYPES_DEFINITION__BINDING_REGISTRIES;\n \n \t/**\n \t * The feature id for the 'Version' attribute.\n@@ -130,7 +130,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__VERSION = EnvironmentPackage.NAMESPACE__VERSION;\n+\tint ROOT__VERSION = EnvironmentPackage.TYPES_DEFINITION__VERSION;\n \n \t/**\n \t * The feature id for the 'Created On' attribute.\n@@ -139,7 +139,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__CREATED_ON = EnvironmentPackage.NAMESPACE__CREATED_ON;\n+\tint ROOT__CREATED_ON = EnvironmentPackage.TYPES_DEFINITION__CREATED_ON;\n \n \t/**\n \t * The feature id for the 'Modified On' attribute.\n@@ -148,42 +148,34 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__MODIFIED_ON = EnvironmentPackage.NAMESPACE__MODIFIED_ON;\n+\tint ROOT__MODIFIED_ON = EnvironmentPackage.TYPES_DEFINITION__MODIFIED_ON;\n \n \t/**\n-\t * The feature id for the 'Owned Namespaces' containment reference list.\n+\t * The feature id for the 'Types' containment reference list.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__OWNED_NAMESPACES = EnvironmentPackage.NAMESPACE__OWNED_NAMESPACES;\n+\tint ROOT__TYPES = EnvironmentPackage.TYPES_DEFINITION__TYPES;\n \n \t/**\n-\t * The feature id for the 'Owner' container reference.\n+\t * The feature id for the 'Name' attribute.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__OWNER = EnvironmentPackage.NAMESPACE__OWNER;\n+\tint ROOT__NAME = EnvironmentPackage.TYPES_DEFINITION_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The feature id for the 'Name' attribute.\n+\t * The feature id for the 'Namespaces' containment reference list.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ROOT__NAME = EnvironmentPackage.NAMESPACE__NAME;\n-\n-\t/**\n-\t * The feature id for the 'Blocks' containment reference list.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint ROOT__BLOCKS = EnvironmentPackage.NAMESPACE_FEATURE_COUNT + 0;\n+\tint ROOT__NAMESPACES = EnvironmentPackage.TYPES_DEFINITION_FEATURE_COUNT + 1;\n \n \t/**\n \t * The number of structural features of the 'Root' class. \n-\t * @see org.obeonetwork.dsl.entity.impl.BlockImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getBlock()\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityImpl\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getEntity()\n \t * @generated\n \t */\n-\tint BLOCK = 1;\n+\tint ENTITY = 1;\n \n \t/**\n \t * The feature id for the 'Metadatas' containment reference.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n+\tint ENTITY__METADATAS = EnvironmentPackage.STRUCTURED_TYPE__METADATAS;\n \n \t/**\n \t * The feature id for the 'Description' attribute.\n@@ -218,7 +210,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n+\tint ENTITY__DESCRIPTION = EnvironmentPackage.STRUCTURED_TYPE__DESCRIPTION;\n \n \t/**\n \t * The feature id for the 'Keywords' attribute list.\n@@ -227,7 +219,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n+\tint ENTITY__KEYWORDS = EnvironmentPackage.STRUCTURED_TYPE__KEYWORDS;\n \n \t/**\n \t * The feature id for the 'Behaviours' containment reference list.\n@@ -236,7 +228,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n+\tint ENTITY__BEHAVIOURS = EnvironmentPackage.STRUCTURED_TYPE__BEHAVIOURS;\n \n \t/**\n \t * The feature id for the 'Binding Registries' reference list.\n@@ -245,7 +237,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n+\tint ENTITY__BINDING_REGISTRIES = EnvironmentPackage.STRUCTURED_TYPE__BINDING_REGISTRIES;\n \n \t/**\n \t * The feature id for the 'Version' attribute.\n@@ -254,7 +246,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n+\tint ENTITY__VERSION = EnvironmentPackage.STRUCTURED_TYPE__VERSION;\n \n \t/**\n \t * The feature id for the 'Created On' attribute.\n@@ -263,7 +255,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n+\tint ENTITY__CREATED_ON = EnvironmentPackage.STRUCTURED_TYPE__CREATED_ON;\n \n \t/**\n \t * The feature id for the 'Modified On' attribute.\n@@ -272,7 +264,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n+\tint ENTITY__MODIFIED_ON = EnvironmentPackage.STRUCTURED_TYPE__MODIFIED_ON;\n \n \t/**\n \t * The feature id for the 'Name' attribute. \n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__ENTITIES = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n+\tint ENTITY__TYPE_DEFINITION = EnvironmentPackage.STRUCTURED_TYPE__TYPE_DEFINITION;\n \n \t/**\n-\t * The feature id for the 'Subblocks' containment reference list.\n-\t * \n+\t * The feature id for the 'Supertype' reference. \n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK__SUBBLOCKS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n+\tint ENTITY__SUPERTYPE = EnvironmentPackage.STRUCTURED_TYPE__SUPERTYPE;\n \n \t/**\n-\t * The number of structural features of the 'Block' class. \n-\t * \n+\t * The feature id for the 'Associated Types' reference list.\n+\t * \n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint BLOCK_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n+\tint ENTITY__ASSOCIATED_TYPES = EnvironmentPackage.STRUCTURED_TYPE__ASSOCIATED_TYPES;\n \n \t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.EntityImpl Entity}' class.\n+\t * The feature id for the 'Owned Attributes' containment reference list.\n \t * \n-\t * @see org.obeonetwork.dsl.entity.impl.EntityImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getEntity()\n \t * @generated\n+\t * @ordered\n \t */\n-\tint ENTITY = 2;\n+\tint ENTITY__OWNED_ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES;\n \n \t/**\n-\t * The feature id for the 'Metadatas' containment reference.\n+\t * The feature id for the 'Attributes' reference list.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__METADATAS = EnvironmentPackage.STRUCTURED_TYPE__METADATAS;\n+\tint ENTITY__ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE__ATTRIBUTES;\n \n \t/**\n-\t * The feature id for the 'Description' attribute.\n-\t * \n-\t * \n+\t * The feature id for the 'Owned References' containment reference list.\n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__DESCRIPTION = EnvironmentPackage.STRUCTURED_TYPE__DESCRIPTION;\n+\tint ENTITY__OWNED_REFERENCES = EnvironmentPackage.STRUCTURED_TYPE__OWNED_REFERENCES;\n \n \t/**\n-\t * The feature id for the 'Keywords' attribute list.\n-\t * \n-\t * \n+\t * The feature id for the 'References' reference list.\n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__KEYWORDS = EnvironmentPackage.STRUCTURED_TYPE__KEYWORDS;\n+\tint ENTITY__REFERENCES = EnvironmentPackage.STRUCTURED_TYPE__REFERENCES;\n \n \t/**\n-\t * The feature id for the 'Behaviours' containment reference list.\n-\t * \n-\t * \n+\t * The feature id for the 'Properties' reference list.\n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__BEHAVIOURS = EnvironmentPackage.STRUCTURED_TYPE__BEHAVIOURS;\n+\tint ENTITY__PROPERTIES = EnvironmentPackage.STRUCTURED_TYPE__PROPERTIES;\n \n \t/**\n-\t * The feature id for the 'Binding Registries' reference list.\n-\t * \n-\t * \n+\t * The feature id for the 'Estimated Volumetry' attribute.\n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__BINDING_REGISTRIES = EnvironmentPackage.STRUCTURED_TYPE__BINDING_REGISTRIES;\n+\tint ENTITY__ESTIMATED_VOLUMETRY = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The feature id for the 'Version' attribute.\n-\t * \n-\t * \n+\t * The feature id for the 'Estimated Access' attribute.\n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__VERSION = EnvironmentPackage.STRUCTURED_TYPE__VERSION;\n+\tint ENTITY__ESTIMATED_ACCESS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 1;\n \n \t/**\n-\t * The feature id for the 'Created On' attribute.\n-\t * \n-\t * \n+\t * The feature id for the 'Historized' attribute. \n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__CREATED_ON = EnvironmentPackage.STRUCTURED_TYPE__CREATED_ON;\n+\tint ENTITY__HISTORIZED = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 2;\n \n \t/**\n-\t * The feature id for the 'Modified On' attribute.\n-\t * \n-\t * \n+\t * The feature id for the 'Owned Finders' containment reference list.\n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__MODIFIED_ON = EnvironmentPackage.STRUCTURED_TYPE__MODIFIED_ON;\n+\tint ENTITY__OWNED_FINDERS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 3;\n \n \t/**\n-\t * The feature id for the 'Name' attribute. \n-\t * \n+\t * The feature id for the 'Inheritance Kind' attribute.\n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__NAME = EnvironmentPackage.STRUCTURED_TYPE__NAME;\n+\tint ENTITY__INHERITANCE_KIND = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 4;\n \n \t/**\n-\t * The feature id for the 'Type Definition' container reference.\n+\t * The number of structural features of the 'Entity' class.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__TYPE_DEFINITION = EnvironmentPackage.STRUCTURED_TYPE__TYPE_DEFINITION;\n+\tint ENTITY_FEATURE_COUNT = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 5;\n \n \t/**\n-\t * The feature id for the 'Owned Attributes' containment reference list.\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl Finder}' class.\n \t * \n+\t * @see org.obeonetwork.dsl.entity.impl.FinderImpl\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getFinder()\n \t * @generated\n-\t * @ordered\n \t */\n-\tint ENTITY__OWNED_ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 0;\n+\tint FINDER = 2;\n \n \t/**\n-\t * The feature id for the 'Owned References' containment reference list.\n+\t * The feature id for the 'Metadatas' containment reference.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__OWNED_REFERENCES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 1;\n+\tint FINDER__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n \n \t/**\n-\t * The feature id for the 'Supertype' reference. \n-\t * \n+\t * The feature id for the 'Description' attribute.\n+\t * \n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__SUPERTYPE = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 2;\n+\tint FINDER__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n \n \t/**\n-\t * The feature id for the 'Attributes' reference list.\n-\t * \n+\t * The feature id for the 'Keywords' attribute list.\n+\t * \n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 3;\n+\tint FINDER__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n \n \t/**\n-\t * The feature id for the 'References' reference list.\n-\t * \n+\t * The feature id for the 'Behaviours' containment reference list.\n+\t * \n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__REFERENCES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 4;\n+\tint FINDER__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n \n \t/**\n-\t * The feature id for the 'Properties' reference list.\n-\t * \n+\t * The feature id for the 'Binding Registries' reference list.\n+\t * \n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__PROPERTIES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 5;\n+\tint FINDER__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n \n \t/**\n-\t * The feature id for the 'Estimated Volumetry' attribute.\n-\t * \n+\t * The feature id for the 'Version' attribute.\n+\t * \n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__ESTIMATED_VOLUMETRY = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 6;\n+\tint FINDER__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n \n \t/**\n-\t * The feature id for the 'Estimated Access' attribute.\n-\t * \n+\t * The feature id for the 'Created On' attribute.\n+\t * \n+\t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__ESTIMATED_ACCESS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 7;\n+\tint FINDER__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n \n \t/**\n-\t * The feature id for the 'Historized' attribute. \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint FINDER__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n+\n+\t/**\n+\t * The feature id for the 'Name' attribute. \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__HISTORIZED = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 8;\n+\tint FINDER__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The feature id for the 'Owned Finders' containment reference list.\n+\t * The feature id for the 'Entity' container reference.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__OWNED_FINDERS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 9;\n+\tint FINDER__ENTITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n \n \t/**\n-\t * The feature id for the 'Block' container reference.\n+\t * The feature id for the 'Customized Name' attribute.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__BLOCK = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 10;\n+\tint FINDER__CUSTOMIZED_NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n \n \t/**\n-\t * The feature id for the 'Inheritance Kind' attribute.\n+\t * The feature id for the 'Criterions' containment reference list.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY__INHERITANCE_KIND = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 11;\n+\tint FINDER__CRITERIONS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n \n \t/**\n-\t * The number of structural features of the 'Entity' class.\n+\t * The feature id for the 'Multiplicity' attribute.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint FINDER__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\n+\n+\t/**\n+\t * The number of structural features of the 'Finder' class.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENTITY_FEATURE_COUNT = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 12;\n+\tint FINDER_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n \n \t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.PropertyImpl Property}' class.\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.CriterionImpl Criterion}' class.\n \t * \n-\t * @see org.obeonetwork.dsl.entity.impl.PropertyImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getProperty()\n+\t * @see org.obeonetwork.dsl.entity.impl.CriterionImpl\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getCriterion()\n \t * @generated\n \t */\n-\tint PROPERTY = 3;\n+\tint CRITERION = 4;\n \n \t/**\n \t * The feature id for the 'Metadatas' containment reference.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n+\tint CRITERION__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n \n \t/**\n \t * The feature id for the 'Description' attribute.\n@@ -535,7 +544,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n+\tint CRITERION__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n \n \t/**\n \t * The feature id for the 'Keywords' attribute list.\n@@ -544,7 +553,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n+\tint CRITERION__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n \n \t/**\n \t * The feature id for the 'Behaviours' containment reference list.\n@@ -553,7 +562,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n+\tint CRITERION__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n \n \t/**\n \t * The feature id for the 'Binding Registries' reference list.\n@@ -562,7 +571,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n+\tint CRITERION__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n \n \t/**\n \t * The feature id for the 'Version' attribute.\n@@ -571,7 +580,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n+\tint CRITERION__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n \n \t/**\n \t * The feature id for the 'Created On' attribute.\n@@ -580,7 +589,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n+\tint CRITERION__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n \n \t/**\n \t * The feature id for the 'Modified On' attribute.\n@@ -589,57 +598,32 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n-\n-\t/**\n-\t * The feature id for the 'Name' attribute. \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint PROPERTY__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n-\n-\t/**\n-\t * The feature id for the 'Multiplicity' attribute.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint PROPERTY__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n-\n-\t/**\n-\t * The feature id for the 'Is Primary Key' attribute.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint PROPERTY__IS_PRIMARY_KEY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n+\tint CRITERION__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n \n \t/**\n-\t * The number of structural features of the 'Property' class.\n+\t * The number of structural features of the 'Criterion' class.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n+\tint CRITERION_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.AttributeImpl Attribute}' class.\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.InternalCriterionImpl Internal Criterion}' class.\n \t * \n-\t * @see org.obeonetwork.dsl.entity.impl.AttributeImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getAttribute()\n+\t * @see org.obeonetwork.dsl.entity.impl.InternalCriterionImpl\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInternalCriterion()\n \t * @generated\n \t */\n-\tint ATTRIBUTE = 4;\n+\tint INTERNAL_CRITERION = 3;\n \n \t/**\n \t * The feature id for the 'Metadatas' containment reference.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__METADATAS = PROPERTY__METADATAS;\n+\tint INTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n \n \t/**\n \t * The feature id for the 'Description' attribute.\n@@ -648,7 +632,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__DESCRIPTION = PROPERTY__DESCRIPTION;\n+\tint INTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n \n \t/**\n \t * The feature id for the 'Keywords' attribute list.\n@@ -657,7 +641,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__KEYWORDS = PROPERTY__KEYWORDS;\n+\tint INTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n \n \t/**\n \t * The feature id for the 'Behaviours' containment reference list.\n@@ -666,7 +650,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__BEHAVIOURS = PROPERTY__BEHAVIOURS;\n+\tint INTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n \n \t/**\n \t * The feature id for the 'Binding Registries' reference list.\n@@ -675,7 +659,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__BINDING_REGISTRIES = PROPERTY__BINDING_REGISTRIES;\n+\tint INTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n \n \t/**\n \t * The feature id for the 'Version' attribute.\n@@ -684,7 +668,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__VERSION = PROPERTY__VERSION;\n+\tint INTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n \n \t/**\n \t * The feature id for the 'Created On' attribute.\n@@ -693,7 +677,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__CREATED_ON = PROPERTY__CREATED_ON;\n+\tint INTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n \n \t/**\n \t * The feature id for the 'Modified On' attribute.\n@@ -702,74 +686,50 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__MODIFIED_ON = PROPERTY__MODIFIED_ON;\n+\tint INTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n \n \t/**\n-\t * The feature id for the 'Name' attribute. \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__NAME = PROPERTY__NAME;\n-\n-\t/**\n-\t * The feature id for the 'Multiplicity' attribute.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint ATTRIBUTE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\n-\n-\t/**\n-\t * The feature id for the 'Is Primary Key' attribute.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint ATTRIBUTE__IS_PRIMARY_KEY = PROPERTY__IS_PRIMARY_KEY;\n-\n-\t/**\n-\t * The feature id for the 'Entity' container reference.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint ATTRIBUTE__ENTITY = PROPERTY_FEATURE_COUNT + 0;\n+\tint INTERNAL_CRITERION__TARGET = CRITERION_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The feature id for the 'Type' reference. \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__TYPE = PROPERTY_FEATURE_COUNT + 1;\n+\tint INTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 1;\n \n \t/**\n-\t * The number of structural features of the 'Attribute' class.\n+\t * The number of structural features of the 'Internal Criterion' class.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 2;\n+\tint INTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n \n \t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ReferenceImpl Reference}' class.\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl External Criterion}' class.\n \t * \n-\t * @see org.obeonetwork.dsl.entity.impl.ReferenceImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getReference()\n+\t * @see org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getExternalCriterion()\n \t * @generated\n \t */\n-\tint REFERENCE = 5;\n+\tint EXTERNAL_CRITERION = 5;\n \n \t/**\n \t * The feature id for the 'Metadatas' containment reference.\n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__METADATAS = PROPERTY__METADATAS;\n+\tint EXTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n \n \t/**\n \t * The feature id for the 'Description' attribute.\n@@ -778,7 +738,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__DESCRIPTION = PROPERTY__DESCRIPTION;\n+\tint EXTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n \n \t/**\n \t * The feature id for the 'Keywords' attribute list.\n@@ -787,7 +747,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__KEYWORDS = PROPERTY__KEYWORDS;\n+\tint EXTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n \n \t/**\n \t * The feature id for the 'Behaviours' containment reference list.\n@@ -796,7 +756,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__BEHAVIOURS = PROPERTY__BEHAVIOURS;\n+\tint EXTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n \n \t/**\n \t * The feature id for the 'Binding Registries' reference list.\n@@ -805,7 +765,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__BINDING_REGISTRIES = PROPERTY__BINDING_REGISTRIES;\n+\tint EXTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n \n \t/**\n \t * The feature id for the 'Version' attribute.\n@@ -814,7 +774,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__VERSION = PROPERTY__VERSION;\n+\tint EXTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n \n \t/**\n \t * The feature id for the 'Created On' attribute.\n@@ -823,7 +783,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__CREATED_ON = PROPERTY__CREATED_ON;\n+\tint EXTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n \n \t/**\n \t * The feature id for the 'Modified On' attribute.\n@@ -832,7 +792,7 @@ public interface EntityPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__MODIFIED_ON = PROPERTY__MODIFIED_ON;\n+\tint EXTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n \n \t/**\n \t * The feature id for the 'Name' attribute. \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\n-\n-\t/**\n-\t * The feature id for the 'Is Primary Key' attribute.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__IS_PRIMARY_KEY = PROPERTY__IS_PRIMARY_KEY;\n-\n-\t/**\n-\t * The feature id for the 'Entity' container reference.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__ENTITY = PROPERTY_FEATURE_COUNT + 0;\n-\n-\t/**\n-\t * The feature id for the 'Is Composite' attribute.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__IS_COMPOSITE = PROPERTY_FEATURE_COUNT + 1;\n-\n-\t/**\n-\t * The feature id for the 'Opposite Of' reference. \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__OPPOSITE_OF = PROPERTY_FEATURE_COUNT + 2;\n-\n-\t/**\n-\t * The feature id for the 'Type' reference. \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__TYPE = PROPERTY_FEATURE_COUNT + 3;\n-\n-\t/**\n-\t * The feature id for the 'Navigable' attribute. \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE__NAVIGABLE = PROPERTY_FEATURE_COUNT + 4;\n-\n-\t/**\n-\t * The number of structural features of the 'Reference' class.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint REFERENCE_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 5;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl Finder}' class.\n-\t * \n-\t * @see org.obeonetwork.dsl.entity.impl.FinderImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getFinder()\n-\t * @generated\n-\t */\n-\tint FINDER = 6;\n-\n-\t/**\n-\t * The feature id for the 'Metadatas' containment reference.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n-\n-\t/**\n-\t * The feature id for the 'Description' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n-\n-\t/**\n-\t * The feature id for the 'Keywords' attribute list.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n-\n-\t/**\n-\t * The feature id for the 'Behaviours' containment reference list.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n-\n-\t/**\n-\t * The feature id for the 'Binding Registries' reference list.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n-\n-\t/**\n-\t * The feature id for the 'Version' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n-\n-\t/**\n-\t * The feature id for the 'Created On' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n-\n-\t/**\n-\t * The feature id for the 'Modified On' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n-\n-\t/**\n-\t * The feature id for the 'Name' attribute. \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n-\n-\t/**\n-\t * The feature id for the 'Entity' container reference.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__ENTITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n-\n-\t/**\n-\t * The feature id for the 'Customized Name' attribute.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__CUSTOMIZED_NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n-\n-\t/**\n-\t * The feature id for the 'Criterions' containment reference list.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__CRITERIONS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n-\n-\t/**\n-\t * The feature id for the 'Multiplicity' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\n-\n-\t/**\n-\t * The number of structural features of the 'Finder' class.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint FINDER_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.CriterionImpl Criterion}' class.\n-\t * \n-\t * @see org.obeonetwork.dsl.entity.impl.CriterionImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getCriterion()\n-\t * @generated\n-\t */\n-\tint CRITERION = 8;\n-\n-\t/**\n-\t * The feature id for the 'Metadatas' containment reference.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\n-\n-\t/**\n-\t * The feature id for the 'Description' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\n-\n-\t/**\n-\t * The feature id for the 'Keywords' attribute list.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\n-\n-\t/**\n-\t * The feature id for the 'Behaviours' containment reference list.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\n-\n-\t/**\n-\t * The feature id for the 'Binding Registries' reference list.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n-\n-\t/**\n-\t * The feature id for the 'Version' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\n-\n-\t/**\n-\t * The feature id for the 'Created On' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\n-\n-\t/**\n-\t * The feature id for the 'Modified On' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\n-\n-\t/**\n-\t * The number of structural features of the 'Criterion' class.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint CRITERION_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.InternalCriterionImpl Internal Criterion}' class.\n-\t * \n-\t * @see org.obeonetwork.dsl.entity.impl.InternalCriterionImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInternalCriterion()\n-\t * @generated\n-\t */\n-\tint INTERNAL_CRITERION = 7;\n-\n-\t/**\n-\t * The feature id for the 'Metadatas' containment reference.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n-\n-\t/**\n-\t * The feature id for the 'Description' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n-\n-\t/**\n-\t * The feature id for the 'Keywords' attribute list.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n-\n-\t/**\n-\t * The feature id for the 'Behaviours' containment reference list.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n-\n-\t/**\n-\t * The feature id for the 'Binding Registries' reference list.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n-\n-\t/**\n-\t * The feature id for the 'Version' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n-\n-\t/**\n-\t * The feature id for the 'Created On' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n-\n-\t/**\n-\t * The feature id for the 'Modified On' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n-\n-\t/**\n-\t * The feature id for the 'Target' reference. \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__TARGET = CRITERION_FEATURE_COUNT + 0;\n-\n-\t/**\n-\t * The feature id for the 'Name' attribute. \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 1;\n-\n-\t/**\n-\t * The number of structural features of the 'Internal Criterion' class.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint INTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl External Criterion}' class.\n-\t * \n-\t * @see org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getExternalCriterion()\n-\t * @generated\n-\t */\n-\tint EXTERNAL_CRITERION = 9;\n-\n-\t/**\n-\t * The feature id for the 'Metadatas' containment reference.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\n-\n-\t/**\n-\t * The feature id for the 'Description' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\n-\n-\t/**\n-\t * The feature id for the 'Keywords' attribute list.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\n-\n-\t/**\n-\t * The feature id for the 'Behaviours' containment reference list.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\n-\n-\t/**\n-\t * The feature id for the 'Binding Registries' reference list.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\n-\n-\t/**\n-\t * The feature id for the 'Version' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__VERSION = CRITERION__VERSION;\n-\n-\t/**\n-\t * The feature id for the 'Created On' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\n-\n-\t/**\n-\t * The feature id for the 'Modified On' attribute.\n-\t * \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\n-\n-\t/**\n-\t * The feature id for the 'Name' attribute. \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 0;\n-\n-\t/**\n-\t * The feature id for the 'Type' reference. \n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION__TYPE = CRITERION_FEATURE_COUNT + 1;\n-\n-\t/**\n-\t * The number of structural features of the 'External Criterion' class.\n-\t * \n-\t * @generated\n-\t * @ordered\n-\t */\n-\tint EXTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.InheritanceKind Inheritance Kind}' enum.\n-\t * \n-\t * @see org.obeonetwork.dsl.entity.InheritanceKind\n-\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInheritanceKind()\n-\t * @generated\n-\t */\n-\tint INHERITANCE_KIND = 10;\n-\n-\t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Root Root}'.\n-\t * \n-\t * @return the meta object for class 'Root'.\n-\t * @see org.obeonetwork.dsl.entity.Root\n-\t * @generated\n-\t */\n-\tEClass getRoot();\n-\n-\t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Root#getBlocks Blocks}'.\n-\t * \n-\t * @return the meta object for the containment reference list 'Blocks'.\n-\t * @see org.obeonetwork.dsl.entity.Root#getBlocks()\n-\t * @see #getRoot()\n-\t * @generated\n-\t */\n-\tEReference getRoot_Blocks();\n-\n-\t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Block Block}'.\n-\t * \n-\t * @return the meta object for class 'Block'.\n-\t * @see org.obeonetwork.dsl.entity.Block\n-\t * @generated\n-\t */\n-\tEClass getBlock();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Block#getName Name}'.\n-\t * \n-\t * @return the meta object for the attribute 'Name'.\n-\t * @see org.obeonetwork.dsl.entity.Block#getName()\n-\t * @see #getBlock()\n-\t * @generated\n-\t */\n-\tEAttribute getBlock_Name();\n-\n-\t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Block#getEntities Entities}'.\n-\t * \n-\t * @return the meta object for the containment reference list 'Entities'.\n-\t * @see org.obeonetwork.dsl.entity.Block#getEntities()\n-\t * @see #getBlock()\n-\t * @generated\n-\t */\n-\tEReference getBlock_Entities();\n-\n-\t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Block#getSubblocks Subblocks}'.\n-\t * \n-\t * @return the meta object for the containment reference list 'Subblocks'.\n-\t * @see org.obeonetwork.dsl.entity.Block#getSubblocks()\n-\t * @see #getBlock()\n-\t * @generated\n-\t */\n-\tEReference getBlock_Subblocks();\n-\n-\t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Entity Entity}'.\n-\t * \n-\t * @return the meta object for class 'Entity'.\n-\t * @see org.obeonetwork.dsl.entity.Entity\n+\t * The feature id for the 'Type' reference. \n+\t * \n \t * @generated\n+\t * @ordered\n \t */\n-\tEClass getEntity();\n+\tint EXTERNAL_CRITERION__TYPE = CRITERION_FEATURE_COUNT + 1;\n \n \t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Entity#getOwnedAttributes Owned Attributes}'.\n+\t * The number of structural features of the 'External Criterion' class.\n \t * \n-\t * @return the meta object for the containment reference list 'Owned Attributes'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getOwnedAttributes()\n-\t * @see #getEntity()\n \t * @generated\n+\t * @ordered\n \t */\n-\tEReference getEntity_OwnedAttributes();\n+\tint EXTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\n \n \t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Entity#getOwnedReferences Owned References}'.\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.InheritanceKind Inheritance Kind}' enum.\n \t * \n-\t * @return the meta object for the containment reference list 'Owned References'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getOwnedReferences()\n-\t * @see #getEntity()\n+\t * @see org.obeonetwork.dsl.entity.InheritanceKind\n+\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInheritanceKind()\n \t * @generated\n \t */\n-\tEReference getEntity_OwnedReferences();\n+\tint INHERITANCE_KIND = 6;\n \n \t/**\n-\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Entity#getSupertype Supertype}'.\n+\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Root Root}'.\n \t * \n-\t * @return the meta object for the reference 'Supertype'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getSupertype()\n-\t * @see #getEntity()\n+\t * @return the meta object for class 'Root'.\n+\t * @see org.obeonetwork.dsl.entity.Root\n \t * @generated\n \t */\n-\tEReference getEntity_Supertype();\n+\tEClass getRoot();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getAttributes Attributes}'.\n-\t * \n-\t * @return the meta object for the reference list 'Attributes'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getAttributes()\n-\t * @see #getEntity()\n+\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Root#getName Name}'.\n+\t * \n+\t * \n+\t * @return the meta object for the attribute 'Name'.\n+\t * @see org.obeonetwork.dsl.entity.Root#getName()\n+\t * @see #getRoot()\n \t * @generated\n \t */\n-\tEReference getEntity_Attributes();\n+\tEAttribute getRoot_Name();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getReferences References}'.\n-\t * \n-\t * @return the meta object for the reference list 'References'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getReferences()\n-\t * @see #getEntity()\n+\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Root#getNamespaces Namespaces}'.\n+\t * \n+\t * \n+\t * @return the meta object for the containment reference list 'Namespaces'.\n+\t * @see org.obeonetwork.dsl.entity.Root#getNamespaces()\n+\t * @see #getRoot()\n \t * @generated\n \t */\n-\tEReference getEntity_References();\n+\tEReference getRoot_Namespaces();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getProperties Properties}'.\n+\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Entity Entity}'.\n \t * \n-\t * @return the meta object for the reference list 'Properties'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getProperties()\n-\t * @see #getEntity()\n+\t * @return the meta object for class 'Entity'.\n+\t * @see org.obeonetwork.dsl.entity.Entity\n \t * @generated\n \t */\n-\tEReference getEntity_Properties();\n+\tEClass getEntity();\n \n \t/**\n \t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Entity#getEstimatedVolumetry Estimated Volumetry}'.\n@@ -1516,16 +909,6 @@ public interface EntityPackage extends EPackage {\n \t */\n \tEReference getEntity_OwnedFinders();\n \n-\t/**\n-\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Entity#getBlock Block}'.\n-\t * \n-\t * @return the meta object for the container reference 'Block'.\n-\t * @see org.obeonetwork.dsl.entity.Entity#getBlock()\n-\t * @see #getEntity()\n-\t * @generated\n-\t */\n-\tEReference getEntity_Block();\n-\n \t/**\n \t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Entity#getInheritanceKind Inheritance Kind}'.\n \t * \n@@ -1536,133 +919,6 @@ public interface EntityPackage extends EPackage {\n \t */\n \tEAttribute getEntity_InheritanceKind();\n \n-\t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Property Property}'.\n-\t * \n-\t * @return the meta object for class 'Property'.\n-\t * @see org.obeonetwork.dsl.entity.Property\n-\t * @generated\n-\t */\n-\tEClass getProperty();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#getName Name}'.\n-\t * \n-\t * @return the meta object for the attribute 'Name'.\n-\t * @see org.obeonetwork.dsl.entity.Property#getName()\n-\t * @see #getProperty()\n-\t * @generated\n-\t */\n-\tEAttribute getProperty_Name();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#getMultiplicity Multiplicity}'.\n-\t * \n-\t * @return the meta object for the attribute 'Multiplicity'.\n-\t * @see org.obeonetwork.dsl.entity.Property#getMultiplicity()\n-\t * @see #getProperty()\n-\t * @generated\n-\t */\n-\tEAttribute getProperty_Multiplicity();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#isIsPrimaryKey Is Primary Key}'.\n-\t * \n-\t * @return the meta object for the attribute 'Is Primary Key'.\n-\t * @see org.obeonetwork.dsl.entity.Property#isIsPrimaryKey()\n-\t * @see #getProperty()\n-\t * @generated\n-\t */\n-\tEAttribute getProperty_IsPrimaryKey();\n-\n-\t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Attribute Attribute}'.\n-\t * \n-\t * @return the meta object for class 'Attribute'.\n-\t * @see org.obeonetwork.dsl.entity.Attribute\n-\t * @generated\n-\t */\n-\tEClass getAttribute();\n-\n-\t/**\n-\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Attribute#getEntity Entity}'.\n-\t * \n-\t * @return the meta object for the container reference 'Entity'.\n-\t * @see org.obeonetwork.dsl.entity.Attribute#getEntity()\n-\t * @see #getAttribute()\n-\t * @generated\n-\t */\n-\tEReference getAttribute_Entity();\n-\n-\t/**\n-\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Attribute#getType Type}'.\n-\t * \n-\t * @return the meta object for the reference 'Type'.\n-\t * @see org.obeonetwork.dsl.entity.Attribute#getType()\n-\t * @see #getAttribute()\n-\t * @generated\n-\t */\n-\tEReference getAttribute_Type();\n-\n-\t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Reference Reference}'.\n-\t * \n-\t * @return the meta object for class 'Reference'.\n-\t * @see org.obeonetwork.dsl.entity.Reference\n-\t * @generated\n-\t */\n-\tEClass getReference();\n-\n-\t/**\n-\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Reference#getEntity Entity}'.\n-\t * \n-\t * @return the meta object for the container reference 'Entity'.\n-\t * @see org.obeonetwork.dsl.entity.Reference#getEntity()\n-\t * @see #getReference()\n-\t * @generated\n-\t */\n-\tEReference getReference_Entity();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Reference#isIsComposite Is Composite}'.\n-\t * \n-\t * @return the meta object for the attribute 'Is Composite'.\n-\t * @see org.obeonetwork.dsl.entity.Reference#isIsComposite()\n-\t * @see #getReference()\n-\t * @generated\n-\t */\n-\tEAttribute getReference_IsComposite();\n-\n-\t/**\n-\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Reference#getOppositeOf Opposite Of}'.\n-\t * \n-\t * @return the meta object for the reference 'Opposite Of'.\n-\t * @see org.obeonetwork.dsl.entity.Reference#getOppositeOf()\n-\t * @see #getReference()\n-\t * @generated\n-\t */\n-\tEReference getReference_OppositeOf();\n-\n-\t/**\n-\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Reference#getType Type}'.\n-\t * \n-\t * @return the meta object for the reference 'Type'.\n-\t * @see org.obeonetwork.dsl.entity.Reference#getType()\n-\t * @see #getReference()\n-\t * @generated\n-\t */\n-\tEReference getReference_Type();\n-\n-\t/**\n-\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Reference#isNavigable Navigable}'.\n-\t * \n-\t * @return the meta object for the attribute 'Navigable'.\n-\t * @see org.obeonetwork.dsl.entity.Reference#isNavigable()\n-\t * @see #getReference()\n-\t * @generated\n-\t */\n-\tEAttribute getReference_Navigable();\n-\n \t/**\n \t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Finder Finder}'.\n \t * \n@@ -1830,45 +1086,21 @@ interface Literals {\n \t\t */\n \t\tEClass ROOT = eINSTANCE.getRoot();\n \n-\t\t/**\n-\t\t * The meta object literal for the 'Blocks' containment reference list feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference ROOT__BLOCKS = eINSTANCE.getRoot_Blocks();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.BlockImpl Block}' class.\n-\t\t * \n-\t\t * @see org.obeonetwork.dsl.entity.impl.BlockImpl\n-\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getBlock()\n-\t\t * @generated\n-\t\t */\n-\t\tEClass BLOCK = eINSTANCE.getBlock();\n-\n \t\t/**\n \t\t * The meta object literal for the 'Name' attribute feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute BLOCK__NAME = eINSTANCE.getBlock_Name();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Entities' containment reference list feature.\n-\t\t * \n+\t\t * \n+\t\t * \n \t\t * @generated\n \t\t */\n-\t\tEReference BLOCK__ENTITIES = eINSTANCE.getBlock_Entities();\n+\t\tEAttribute ROOT__NAME = eINSTANCE.getRoot_Name();\n \n \t\t/**\n-\t\t * The meta object literal for the 'Subblocks' containment reference list feature.\n-\t\t * \n+\t\t * The meta object literal for the 'Namespaces' containment reference list feature.\n+\t\t * \n+\t\t * \n \t\t * @generated\n \t\t */\n-\t\tEReference BLOCK__SUBBLOCKS = eINSTANCE.getBlock_Subblocks();\n+\t\tEReference ROOT__NAMESPACES = eINSTANCE.getRoot_Namespaces();\n \n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.EntityImpl Entity}' class.\n@@ -1879,50 +1111,6 @@ interface Literals {\n \t\t */\n \t\tEClass ENTITY = eINSTANCE.getEntity();\n \n-\t\t/**\n-\t\t * The meta object literal for the 'Owned Attributes' containment reference list feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__OWNED_ATTRIBUTES = eINSTANCE.getEntity_OwnedAttributes();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Owned References' containment reference list feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__OWNED_REFERENCES = eINSTANCE.getEntity_OwnedReferences();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Supertype' reference feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__SUPERTYPE = eINSTANCE.getEntity_Supertype();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Attributes' reference list feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__ATTRIBUTES = eINSTANCE.getEntity_Attributes();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'References' reference list feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__REFERENCES = eINSTANCE.getEntity_References();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Properties' reference list feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__PROPERTIES = eINSTANCE.getEntity_Properties();\n-\n \t\t/**\n \t\t * The meta object literal for the 'Estimated Volumetry' attribute feature.\n \t\t * \n@@ -1952,120 +1140,13 @@ interface Literals {\n \t\t */\n \t\tEReference ENTITY__OWNED_FINDERS = eINSTANCE.getEntity_OwnedFinders();\n \n-\t\t/**\n-\t\t * The meta object literal for the 'Block' container reference feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference ENTITY__BLOCK = eINSTANCE.getEntity_Block();\n-\n \t\t/**\n \t\t * The meta object literal for the 'Inheritance Kind' attribute feature.\n \t\t * \n \t\t * @generated\n \t\t */\n \t\tEAttribute ENTITY__INHERITANCE_KIND = eINSTANCE.getEntity_InheritanceKind();\n \n-\t\t/**\n-\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.PropertyImpl Property}' class.\n-\t\t * \n-\t\t * @see org.obeonetwork.dsl.entity.impl.PropertyImpl\n-\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getProperty()\n-\t\t * @generated\n-\t\t */\n-\t\tEClass PROPERTY = eINSTANCE.getProperty();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Name' attribute feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Multiplicity' attribute feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute PROPERTY__MULTIPLICITY = eINSTANCE.getProperty_Multiplicity();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Is Primary Key' attribute feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute PROPERTY__IS_PRIMARY_KEY = eINSTANCE.getProperty_IsPrimaryKey();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.AttributeImpl Attribute}' class.\n-\t\t * \n-\t\t * @see org.obeonetwork.dsl.entity.impl.AttributeImpl\n-\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getAttribute()\n-\t\t * @generated\n-\t\t */\n-\t\tEClass ATTRIBUTE = eINSTANCE.getAttribute();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Entity' container reference feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference ATTRIBUTE__ENTITY = eINSTANCE.getAttribute_Entity();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Type' reference feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference ATTRIBUTE__TYPE = eINSTANCE.getAttribute_Type();\n-\n-\t\t/**\n-\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.ReferenceImpl Reference}' class.\n-\t\t * \n-\t\t * @see org.obeonetwork.dsl.entity.impl.ReferenceImpl\n-\t\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getReference()\n-\t\t * @generated\n-\t\t */\n-\t\tEClass REFERENCE = eINSTANCE.getReference();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Entity' container reference feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference REFERENCE__ENTITY = eINSTANCE.getReference_Entity();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Is Composite' attribute feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute REFERENCE__IS_COMPOSITE = eINSTANCE.getReference_IsComposite();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Opposite Of' reference feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference REFERENCE__OPPOSITE_OF = eINSTANCE.getReference_OppositeOf();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Type' reference feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEReference REFERENCE__TYPE = eINSTANCE.getReference_Type();\n-\n-\t\t/**\n-\t\t * The meta object literal for the 'Navigable' attribute feature.\n-\t\t * \n-\t\t * @generated\n-\t\t */\n-\t\tEAttribute REFERENCE__NAVIGABLE = eINSTANCE.getReference_Navigable();\n-\n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl Finder}' class.\n \t\t * ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntityPackage.java","sha":"14c3d4bb8c77170a81ed8f65adda6b569fd79b2f","status":"modified"},{"additions":2,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FInternalCriterion.java","changes":2,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FInternalCriterion.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/InternalCriterion.java","new_code":"import org.obeonetwork.dsl.environment.Attribute;\n","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -12,6 +12,8 @@\n */\n package org.obeonetwork.dsl.entity;\n \n+import org.obeonetwork.dsl.environment.Attribute;\n+\n /**\n * A representation of the model object 'Internal Criterion'.\n * ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FInternalCriterion.java","sha":"900d7d53d0d169f943e7592ec0265e42f7f99a26","status":"modified"},{"additions":37,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FRoot.java","changes":46,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FRoot.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":9,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/Root.java","new_code":"import org.obeonetwork.dsl.environment.TypesDefinition;\n *
  • {@link org.obeonetwork.dsl.entity.Root#getName Name}
    • \n *
  • {@link org.obeonetwork.dsl.entity.Root#getNamespaces Namespaces}
    • \npublic interface Root extends TypesDefinition {\n\t * Returns the value of the 'Name' attribute.\n\t * If the meaning of the 'Name' attribute isn't clear,\n\t * there really should be more of a description here...\n\t * @return the value of the 'Name' attribute.\n\t * @see #setName(String)\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Name()\n\t * @model\n\t * @generated\n\t */\n\tString getName();\n\n\t/**\n\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Root#getName Name}' attribute.\n\t * \n\t * \n\t * @param value the new value of the 'Name' attribute.\n\t * @see #getName()\n\t * @generated\n\t */\n\tvoid setName(String value);\n\n\t/**\n\t * Returns the value of the 'Namespaces' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Namespace}.\n\t * \n\t *

    \n\t * If the meaning of the 'Namespaces' containment reference list isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Namespaces' containment reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Namespaces()\n\tEList getNamespaces();","new_methods":[],"old_code":" *
  • {@link org.obeonetwork.dsl.entity.Root#getBlocks Blocks}
    • \npublic interface Root extends Namespace {\n\t * Returns the value of the 'Blocks' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Block}.\n\t * If the meaning of the 'Blocks' containment reference list\n\t * isn't clear, there really should be more of a description here...\n\t * @return the value of the 'Blocks' containment reference list.\n\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Blocks()\n\tEList getBlocks();","old_methods":[],"patch":"@@ -14,6 +14,7 @@\n \n import org.eclipse.emf.common.util.EList;\n import org.obeonetwork.dsl.environment.Namespace;\n+import org.obeonetwork.dsl.environment.TypesDefinition;\n \n /**\n * A representation of the model object 'Root'.\n@@ -22,15 +23,16 @@\n *

    \n * The following features are supported:\n *

      \n- *
    • {@link org.obeonetwork.dsl.entity.Root#getBlocks Blocks}
      • \n+ *
    • {@link org.obeonetwork.dsl.entity.Root#getName Name}
      • \n+ *
    • {@link org.obeonetwork.dsl.entity.Root#getNamespaces Namespaces}
      • \n *
    \n *

    \n *\n * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot()\n * @model\n * @generated\n */\n-public interface Root extends Namespace {\n+public interface Root extends TypesDefinition {\n \t/**\n \t * \n \t * \n@@ -39,19 +41,45 @@ public interface Root extends Namespace {\n \tString copyright = \"Copyright (c) 2008-2009 Obeo.\\nAll rights reserved. This program and the accompanying materials\\nare made available under the terms of the Eclipse Public License v1.0\\nwhich accompanies this distribution, and is available at\\nhttp://www.eclipse.org/legal/epl-v10.html\\n\\nContributors:\\n Obeo - initial API and implementation\";\n \n \t/**\n-\t * Returns the value of the 'Blocks' containment reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Block}.\n+\t * Returns the value of the 'Name' attribute.\n \t * \n \t *

    \n-\t * If the meaning of the 'Blocks' containment reference list\n-\t * isn't clear, there really should be more of a description here...\n+\t * If the meaning of the 'Name' attribute isn't clear,\n+\t * there really should be more of a description here...\n \t *

    \n \t * \n-\t * @return the value of the 'Blocks' containment reference list.\n-\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Blocks()\n+\t * @return the value of the 'Name' attribute.\n+\t * @see #setName(String)\n+\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Name()\n+\t * @model\n+\t * @generated\n+\t */\n+\tString getName();\n+\n+\t/**\n+\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Root#getName Name}' attribute.\n+\t * \n+\t * \n+\t * @param value the new value of the 'Name' attribute.\n+\t * @see #getName()\n+\t * @generated\n+\t */\n+\tvoid setName(String value);\n+\n+\t/**\n+\t * Returns the value of the 'Namespaces' containment reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Namespace}.\n+\t * \n+\t *

    \n+\t * If the meaning of the 'Namespaces' containment reference list isn't clear,\n+\t * there really should be more of a description here...\n+\t *

    \n+\t * \n+\t * @return the value of the 'Namespaces' containment reference list.\n+\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Namespaces()\n \t * @model containment=\"true\" resolveProxies=\"true\"\n \t * @generated\n \t */\n-\tEList getBlocks();\n+\tEList getNamespaces();\n \n } // Root","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FRoot.java","sha":"c63c83ff05c50157b57c9bea3628643643870180","status":"modified"},{"additions":6,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2FEntityFilter.java","changes":12,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2FEntityFilter.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":6,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/EntityFilter.java","new_code":"import org.obeonetwork.dsl.environment.Attribute;\nimport org.obeonetwork.dsl.environment.Property;\nimport org.obeonetwork.dsl.environment.Reference;\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.","new_methods":[],"old_code":"import org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Property;\nimport org.obeonetwork.dsl.entity.Reference;\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\n\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Property}.","old_methods":[],"patch":"@@ -13,11 +13,11 @@\n package org.obeonetwork.dsl.entity.extensionUtilities;\n \n import org.eclipse.emf.common.util.EList;\n-import org.obeonetwork.dsl.entity.Attribute;\n import org.obeonetwork.dsl.entity.Entity;\n-import org.obeonetwork.dsl.entity.Property;\n-import org.obeonetwork.dsl.entity.Reference;\n+import org.obeonetwork.dsl.environment.Attribute;\n import org.obeonetwork.dsl.environment.Filter;\n+import org.obeonetwork.dsl.environment.Property;\n+import org.obeonetwork.dsl.environment.Reference;\n \n /**\n * A representation of the model object 'Entity Filter'.\n@@ -47,7 +47,7 @@ public interface EntityFilter extends Filter {\n \n \t/**\n \t * Returns the value of the 'Attribute References' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n \t * \n \t *

    \n \t * If the meaning of the 'Attribute References' reference list\n@@ -63,7 +63,7 @@ public interface EntityFilter extends Filter {\n \n \t/**\n \t * Returns the value of the 'Reference References' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n \t * \n \t *

    \n \t * If the meaning of the 'Reference References' reference list\n@@ -79,7 +79,7 @@ public interface EntityFilter extends Filter {\n \n \t/**\n \t * Returns the value of the 'Owned Property References' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Property}.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\n \t * \n \t *

    \n \t * If the meaning of the 'Owned Property References' reference","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2FEntityFilter.java","sha":"c1a8de5ec12c4a7f45120d7daf3af06680d2fe87","status":"modified"},{"additions":24,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FEntityFilterImpl.java","changes":48,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FEntityFilterImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":24,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/impl/EntityFilterImpl.java","new_code":"import org.obeonetwork.dsl.environment.Attribute;\nimport org.obeonetwork.dsl.environment.Property;\nimport org.obeonetwork.dsl.environment.Reference;\n\n\n\t * \n\t * \n\tpublic EList getAttributeReferences() {\n\t\tBasicEList result = new UniqueEList() {\n\t\t\tprivate static final long serialVersionUID = 971586213550724954L;\n\n\t\tfor (Property property : getOwnedPropertyReferences()) {\n\t\t\t\tresult.add((Attribute)property);\n\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n\t\t\t\tthis, ExtensionUtilitiesPackage.Literals.ENTITY_FILTER__ATTRIBUTE_REFERENCES, result.size(),\n\t * \n\t * \n\tpublic EList getReferenceReferences() {\n\t\tBasicEList result = new UniqueEList() {\n\t\t\tprivate static final long serialVersionUID = 5391913769894408421L;\n\n\t\tfor (Property property : getOwnedPropertyReferences()) {\n\t\t\t\tresult.add((Reference)property);\n\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(","new_methods":[],"old_code":"import java.util.Iterator;\nimport org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Property;\nimport org.obeonetwork.dsl.entity.Reference;\n\t * \n\t * \n\tpublic EList getAttributeReferences() {\n\t\tBasicEList result = new UniqueEList() {\n\t\tCollection properties = getOwnedPropertyReferences();\n\t\tfor (Iterator iter = properties.iterator(); iter.hasNext();) {\n\t\t\tProperty property = (Property) iter.next();\n\t\t\t\tresult.add(property);\n\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n\t\t\t\tthis, ExtensionUtilitiesPackage.eINSTANCE\n\t\t\t\t\t\t.getEntityFilter_AttributeReferences(), result.size(),\n\t * \n\t * \n\tpublic EList getReferenceReferences() {\n\t\tBasicEList result = new UniqueEList() {\n\t\tCollection properties = getOwnedPropertyReferences();\n\t\tfor (Iterator iter = properties.iterator(); iter.hasNext();) {\n\t\t\tProperty property = (Property) iter.next();\n\t\t\t\tresult.add(property);\n\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(","old_methods":[],"patch":"@@ -13,19 +13,18 @@\n package org.obeonetwork.dsl.entity.extensionUtilities.impl;\n \n import java.util.Collection;\n-import java.util.Iterator;\n \n import org.eclipse.emf.common.util.BasicEList;\n import org.eclipse.emf.common.util.EList;\n import org.eclipse.emf.common.util.UniqueEList;\n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.util.EcoreEList;\n-import org.obeonetwork.dsl.entity.Attribute;\n import org.obeonetwork.dsl.entity.Entity;\n-import org.obeonetwork.dsl.entity.Property;\n-import org.obeonetwork.dsl.entity.Reference;\n import org.obeonetwork.dsl.entity.extensionUtilities.EntityFilter;\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\n+import org.obeonetwork.dsl.environment.Attribute;\n+import org.obeonetwork.dsl.environment.Property;\n+import org.obeonetwork.dsl.environment.Reference;\n import org.obeonetwork.dsl.environment.impl.FilterImpl;\n \n /**\n@@ -68,13 +67,17 @@ protected EClass eStaticClass() {\n \t\treturn ExtensionUtilitiesPackage.Literals.ENTITY_FILTER;\n \t}\n \n+\n+\n \t/**\n-\t * \n-\t * \n+\t * \n+\t * \n \t * @generated NOT\n \t */\n-\tpublic EList getAttributeReferences() {\n-\t\tBasicEList result = new UniqueEList() {\n+\tpublic EList getAttributeReferences() {\n+\t\tBasicEList result = new UniqueEList() {\n+\t\t\tprivate static final long serialVersionUID = 971586213550724954L;\n+\n \t\t\tprotected Object[] newData(int capacity) {\n \t\t\t\treturn new Attribute[capacity];\n \t\t\t}\n@@ -83,28 +86,27 @@ protected boolean useEquals() {\n \t\t\t\treturn false;\n \t\t\t}\n \t\t};\n-\t\tCollection properties = getOwnedPropertyReferences();\n-\t\tfor (Iterator iter = properties.iterator(); iter.hasNext();) {\n-\t\t\tProperty property = (Property) iter.next();\n+\t\tfor (Property property : getOwnedPropertyReferences()) {\n \t\t\tif (property instanceof Attribute) {\n-\t\t\t\tresult.add(property);\n+\t\t\t\tresult.add((Attribute)property);\n \t\t\t}\n \t\t}\n \t\tresult.shrink();\n-\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n-\t\t\t\tthis, ExtensionUtilitiesPackage.eINSTANCE\n-\t\t\t\t\t\t.getEntityFilter_AttributeReferences(), result.size(),\n+\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n+\t\t\t\tthis, ExtensionUtilitiesPackage.Literals.ENTITY_FILTER__ATTRIBUTE_REFERENCES, result.size(),\n \t\t\t\tresult.data());\n \t\treturn unmodifiableResult;\n \t}\n \n \t/**\n-\t * \n-\t * \n+\t * \n+\t * \n \t * @generated NOT\n \t */\n-\tpublic EList getReferenceReferences() {\n-\t\tBasicEList result = new UniqueEList() {\n+\tpublic EList getReferenceReferences() {\n+\t\tBasicEList result = new UniqueEList() {\n+\t\t\tprivate static final long serialVersionUID = 5391913769894408421L;\n+\n \t\t\tprotected Object[] newData(int capacity) {\n \t\t\t\treturn new Reference[capacity];\n \t\t\t}\n@@ -113,15 +115,13 @@ protected boolean useEquals() {\n \t\t\t\treturn false;\n \t\t\t}\n \t\t};\n-\t\tCollection properties = getOwnedPropertyReferences();\n-\t\tfor (Iterator iter = properties.iterator(); iter.hasNext();) {\n-\t\t\tProperty property = (Property) iter.next();\n+\t\tfor (Property property : getOwnedPropertyReferences()) {\n \t\t\tif (property instanceof Reference) {\n-\t\t\t\tresult.add(property);\n+\t\t\t\tresult.add((Reference)property);\n \t\t\t}\n \t\t}\n \t\tresult.shrink();\n-\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n+\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n \t\t\t\tthis, ExtensionUtilitiesPackage.eINSTANCE\n \t\t\t\t\t\t.getEntityFilter_ReferenceReferences(), result.size(),\n \t\t\t\tresult.data());","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FEntityFilterImpl.java","sha":"3175c5e3cd8c17cbd66b3193b033119fceb5f195","status":"modified"},{"additions":2,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesFactoryImpl.java","changes":3,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesFactoryImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":1,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/impl/ExtensionUtilitiesFactoryImpl.java","new_code":"import org.obeonetwork.dsl.entity.extensionUtilities.*;\n\t\t\tExtensionUtilitiesFactory theExtensionUtilitiesFactory = (ExtensionUtilitiesFactory)EPackage.Registry.INSTANCE.getEFactory(ExtensionUtilitiesPackage.eNS_URI);","new_methods":[],"old_code":"\t\t\tExtensionUtilitiesFactory theExtensionUtilitiesFactory = (ExtensionUtilitiesFactory)EPackage.Registry.INSTANCE.getEFactory(\"http://www.obeonetwork.org/dsl/entity/2.0.0/utilities\"); ","old_methods":[],"patch":"@@ -17,6 +17,7 @@\n import org.eclipse.emf.ecore.EPackage;\n import org.eclipse.emf.ecore.impl.EFactoryImpl;\n import org.eclipse.emf.ecore.plugin.EcorePlugin;\n+import org.obeonetwork.dsl.entity.extensionUtilities.*;\n import org.obeonetwork.dsl.entity.extensionUtilities.EntityFilter;\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesFactory;\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\n@@ -43,7 +44,7 @@ public class ExtensionUtilitiesFactoryImpl extends EFactoryImpl implements\n \t */\n \tpublic static ExtensionUtilitiesFactory init() {\n \t\ttry {\n-\t\t\tExtensionUtilitiesFactory theExtensionUtilitiesFactory = (ExtensionUtilitiesFactory)EPackage.Registry.INSTANCE.getEFactory(\"http://www.obeonetwork.org/dsl/entity/2.0.0/utilities\"); \n+\t\t\tExtensionUtilitiesFactory theExtensionUtilitiesFactory = (ExtensionUtilitiesFactory)EPackage.Registry.INSTANCE.getEFactory(ExtensionUtilitiesPackage.eNS_URI);\n \t\t\tif (theExtensionUtilitiesFactory != null) {\n \t\t\t\treturn theExtensionUtilitiesFactory;\n \t\t\t}","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesFactoryImpl.java","sha":"98c6a05bfb87fa174bb2d96f093d870c452e917f","status":"modified"},{"additions":3,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesPackageImpl.java","changes":6,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesPackageImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":3,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/impl/ExtensionUtilitiesPackageImpl.java","new_code":"\t\tinitEReference(getEntityFilter_AttributeReferences(), theEnvironmentPackage.getAttribute(), null, \"attributeReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntityFilter_ReferenceReferences(), theEnvironmentPackage.getReference(), null, \"referenceReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntityFilter_OwnedPropertyReferences(), theEnvironmentPackage.getProperty(), null, \"ownedPropertyReferences\", null, 0, -1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);","new_methods":[],"old_code":"\t\tinitEReference(getEntityFilter_AttributeReferences(), theEntityPackage.getAttribute(), null, \"attributeReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntityFilter_ReferenceReferences(), theEntityPackage.getReference(), null, \"referenceReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntityFilter_OwnedPropertyReferences(), theEntityPackage.getProperty(), null, \"ownedPropertyReferences\", null, 0, -1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);","old_methods":[],"patch":"@@ -217,9 +217,9 @@ public void initializePackageContents() {\n \n \t\t// Initialize classes and features; add operations and parameters\n \t\tinitEClass(entityFilterEClass, EntityFilter.class, \"EntityFilter\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEReference(getEntityFilter_AttributeReferences(), theEntityPackage.getAttribute(), null, \"attributeReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntityFilter_ReferenceReferences(), theEntityPackage.getReference(), null, \"referenceReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntityFilter_OwnedPropertyReferences(), theEntityPackage.getProperty(), null, \"ownedPropertyReferences\", null, 0, -1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\t\tinitEReference(getEntityFilter_AttributeReferences(), theEnvironmentPackage.getAttribute(), null, \"attributeReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n+\t\tinitEReference(getEntityFilter_ReferenceReferences(), theEnvironmentPackage.getReference(), null, \"referenceReferences\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n+\t\tinitEReference(getEntityFilter_OwnedPropertyReferences(), theEnvironmentPackage.getProperty(), null, \"ownedPropertyReferences\", null, 0, -1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t\tinitEReference(getEntityFilter_Entity(), theEntityPackage.getEntity(), null, \"entity\", null, 1, 1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t}\n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesPackageImpl.java","sha":"e9d6b7d5daecb5c2895ea1b7da848560dd0fc78e","status":"modified"},{"additions":1,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesAdapterFactory.java","changes":1,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/util/ExtensionUtilitiesAdapterFactory.java","new_code":"import org.obeonetwork.dsl.entity.extensionUtilities.*;","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -16,6 +16,7 @@\n import org.eclipse.emf.common.notify.Notifier;\n import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;\n import org.eclipse.emf.ecore.EObject;\n+import org.obeonetwork.dsl.entity.extensionUtilities.*;\n import org.obeonetwork.dsl.entity.extensionUtilities.EntityFilter;\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\n import org.obeonetwork.dsl.environment.Filter;","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesAdapterFactory.java","sha":"ce3d029830d89793d3504cad4bfc4e8ccaa01586","status":"modified"},{"additions":1,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesSwitch.java","changes":1,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesSwitch.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/util/ExtensionUtilitiesSwitch.java","new_code":"import org.obeonetwork.dsl.entity.extensionUtilities.*;","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -16,6 +16,7 @@\n \n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.EObject;\n+import org.obeonetwork.dsl.entity.extensionUtilities.*;\n import org.obeonetwork.dsl.entity.extensionUtilities.EntityFilter;\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\n import org.obeonetwork.dsl.environment.Filter;","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesSwitch.java","sha":"7c50391393d39bd6e2ff1e6c29e7056b8057015d","status":"modified"},{"additions":2,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityFactoryImpl.java","changes":37,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityFactoryImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":35,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityFactoryImpl.java","new_code":"import org.obeonetwork.dsl.entity.*;\n\t\t\tEntityFactory theEntityFactory = (EntityFactory)EPackage.Registry.INSTANCE.getEFactory(EntityPackage.eNS_URI);","new_methods":[],"old_code":"import org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Block;\nimport org.obeonetwork.dsl.entity.Reference;\nimport org.obeonetwork.dsl.entity.spec.ReferenceSpec;\n\t\t\tEntityFactory theEntityFactory = (EntityFactory)EPackage.Registry.INSTANCE.getEFactory(\"http://www.obeonetwork.org/dsl/entity/2.0.0\"); \n\t\t\tcase EntityPackage.BLOCK: return (EObject)createBlock();\n\t\t\tcase EntityPackage.ATTRIBUTE: return (EObject)createAttribute();\n\t\t\tcase EntityPackage.REFERENCE: return (EObject)createReference();\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic Block createBlock() {\n\t\tBlockImpl block = new BlockImpl();\n\t\treturn block;\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic Attribute createAttribute() {\n\t\tAttributeImpl attribute = new AttributeImpl();\n\t\treturn attribute;\n\t}\n\n\t/**\n\t * \n\t * @generated Not\n\t */\n\tpublic Reference createReference() {\n\t\tReferenceImpl reference = new ReferenceSpec();\n\t\treturn reference;\n\t}\n","old_methods":[{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityFactoryImpl.java","implementation":"BlockImpl block = new BlockImpl();\n\t\treturn block;","signature":"Block createBlock()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityFactoryImpl.java","implementation":"AttributeImpl attribute = new AttributeImpl();\n\t\treturn attribute;","signature":"Attribute createAttribute()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityFactoryImpl.java","implementation":"ReferenceImpl reference = new ReferenceSpec();\n\t\treturn reference;","signature":"Reference createReference()"}],"patch":"@@ -18,18 +18,15 @@\n import org.eclipse.emf.ecore.EPackage;\n import org.eclipse.emf.ecore.impl.EFactoryImpl;\n import org.eclipse.emf.ecore.plugin.EcorePlugin;\n-import org.obeonetwork.dsl.entity.Attribute;\n-import org.obeonetwork.dsl.entity.Block;\n+import org.obeonetwork.dsl.entity.*;\n import org.obeonetwork.dsl.entity.Entity;\n import org.obeonetwork.dsl.entity.EntityFactory;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.ExternalCriterion;\n import org.obeonetwork.dsl.entity.Finder;\n import org.obeonetwork.dsl.entity.InheritanceKind;\n import org.obeonetwork.dsl.entity.InternalCriterion;\n-import org.obeonetwork.dsl.entity.Reference;\n import org.obeonetwork.dsl.entity.Root;\n-import org.obeonetwork.dsl.entity.spec.ReferenceSpec;\n \n /**\n * An implementation of the model Factory. \n-\t * @generated\n-\t */\n-\tpublic Block createBlock() {\n-\t\tBlockImpl block = new BlockImpl();\n-\t\treturn block;\n-\t}\n-\n \t/**\n \t * \n \t * @generated\n@@ -148,24 +133,6 @@ public Entity createEntity() {\n \t\treturn entity;\n \t}\n \n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic Attribute createAttribute() {\n-\t\tAttributeImpl attribute = new AttributeImpl();\n-\t\treturn attribute;\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated Not\n-\t */\n-\tpublic Reference createReference() {\n-\t\tReferenceImpl reference = new ReferenceSpec();\n-\t\treturn reference;\n-\t}\n-\n \t/**\n \t * \n \t * @generated","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityFactoryImpl.java","sha":"abadb34c5276f1a33ec1734109c04af0f9632128","status":"modified"},{"additions":0,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityImpl.java","changes":266,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":266,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","new_code":"","new_methods":[],"old_code":"import org.eclipse.emf.common.util.BasicEList;\nimport org.eclipse.emf.common.util.UniqueEList;\nimport org.eclipse.emf.ecore.util.EcoreEList;\nimport org.eclipse.emf.ecore.util.EcoreUtil;\nimport org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Block;\nimport org.obeonetwork.dsl.entity.Property;\nimport org.obeonetwork.dsl.entity.Reference;\n *

  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedAttributes Owned Attributes}
    • \n *
  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedReferences Owned References}
    • \n *
  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getSupertype Supertype}
    • \n *
  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getAttributes Attributes}
    • \n *
  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getReferences References}
    • \n *
  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getProperties Properties}
    • \n *
  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getBlock Block}
    • \n\t/**\n\t * \n\t * @generated\n\t */\n\t@SuppressWarnings(\"unchecked\")\n\tpublic EList getOwnedAttributes() {\n\t\treturn (EList)eDynamicGet(EntityPackage.ENTITY__OWNED_ATTRIBUTES, EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES, true, true);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\t@SuppressWarnings(\"unchecked\")\n\tpublic EList getOwnedReferences() {\n\t\treturn (EList)eDynamicGet(EntityPackage.ENTITY__OWNED_REFERENCES, EntityPackage.Literals.ENTITY__OWNED_REFERENCES, true, true);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic Entity getSupertype() {\n\t\treturn (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, true, true);\n\t}\n\n\t/**\n\t * \n\t * \n\t * @generated\n\t */\n\tpublic Entity basicGetSupertype() {\n\t\treturn (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, false, true);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic void setSupertype(Entity newSupertype) {\n\t\teDynamicSet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, newSupertype);\n\t}\n\n\t/**\n\t * \n\t * \n\t * @generated NOT\n\t */\n\tpublic EList getAttributes() {\n\t\tBasicEList result = new UniqueEList() {\n\t\t\tprotected Object[] newData(int capacity) {\n\t\t\t\treturn new Attribute[capacity];\n\t\t\t}\n\n\t\t\tprotected boolean useEquals() {\n\t\t\t\treturn false;\n\t\t\t}\n\t\t};\n\t\tresult.addAll(getOwnedAttributes());\n\t\tif (getSupertype() != null)\n\t\t\tresult.addAll(getSupertype().getAttributes());\n\t\tresult.shrink();\n\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n\t\t\t\tthis, EntityPackage.eINSTANCE.getEntity_Attributes(), result\n\t\t\t\t\t\t.size(), result.data());\n\t\treturn unmodifiableResult;\n\t}\n\n\t/**\n\t * \n\t * \n\t * @generated NOT\n\t */\n\tpublic EList getReferences() {\n\t\tBasicEList result = new UniqueEList() {\n\t\t\tprotected Object[] newData(int capacity) {\n\t\t\t\treturn new Reference[capacity];\n\t\t\t}\n\n\t\t\tprotected boolean useEquals() {\n\t\t\t\treturn false;\n\t\t\t}\n\t\t};\n\t\tresult.addAll(getOwnedReferences());\n\t\tif (getSupertype() != null)\n\t\t\tresult.addAll(getSupertype().getReferences());\n\t\tresult.shrink();\n\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n\t\t\t\tthis, EntityPackage.eINSTANCE.getEntity_References(), result\n\t\t\t\t\t\t.size(), result.data());\n\t\treturn unmodifiableResult;\n\t}\n\n\t/**\n\t * \n\t * \n\t * @generated NOT\n\t */\n\tpublic EList getProperties() {\n\t\tBasicEList result = new UniqueEList() {\n\t\t\tprotected Object[] newData(int capacity) {\n\t\t\t\treturn new Property[capacity];\n\t\t\t}\n\n\t\t\tprotected boolean useEquals() {\n\t\t\t\treturn false;\n\t\t\t}\n\t\t};\n\t\tresult.addAll(getAttributes());\n\t\tresult.addAll(getReferences());\n\t\tresult.shrink();\n\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n\t\t\t\tthis, EntityPackage.eINSTANCE.getEntity_Attributes(), result\n\t\t\t\t\t\t.size(), result.data());\n\t\treturn unmodifiableResult;\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic Block getBlock() {\n\t\treturn (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, true, true);\n\t}\n\n\t/**\n\t * \n\t * \n\t * @generated\n\t */\n\tpublic Block basicGetBlock() {\n\t\treturn (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, false, true);\n\t}\n\n\t/**\n\t * \n\t * \n\t * @generated\n\t */\n\tpublic NotificationChain basicSetBlock(Block newBlock, NotificationChain msgs) {\n\t\tmsgs = eBasicSetContainer((InternalEObject)newBlock, EntityPackage.ENTITY__BLOCK, msgs);\n\t\treturn msgs;\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic void setBlock(Block newBlock) {\n\t\teDynamicSet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, newBlock);\n\t}\n\n\t/**\n\t * \n\t * \n\t * @generated NOT\n\t */\n\tpublic boolean isSubtypeOf(Entity entity) {\n\t\t// An entity A is a subtype of an entity B\n\t\t// - A and B are both the same entity\n\t\t// - the supertype of A is B\n\t\t// - the supertype of A is a subtype of B\n\t\treturn (EcoreUtil.equals(this, entity)\n\t\t\t\t|| (getSupertype() != null\n\t\t\t\t\t\t&& (EcoreUtil.equals(getSupertype(), entity) || getSupertype().isSubtypeOf(entity))));\n\t}\n\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\t\treturn ((InternalEList)(InternalEList)getOwnedAttributes()).basicAdd(otherEnd, msgs);\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\t\t\treturn ((InternalEList)(InternalEList)getOwnedReferences()).basicAdd(otherEnd, msgs);\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\tif (eInternalContainer() != null)\n\t\t\t\t\tmsgs = eBasicRemoveFromContainer(msgs);\n\t\t\t\treturn basicSetBlock((Block)otherEnd, msgs);\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\t\treturn ((InternalEList)getOwnedAttributes()).basicRemove(otherEnd, msgs);\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\t\t\treturn ((InternalEList)getOwnedReferences()).basicRemove(otherEnd, msgs);\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\treturn basicSetBlock(null, msgs);\n\t/**\n\t * \n\t * \n\t * @generated\n\t */\n\t@Override\n\tpublic NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {\n\t\tswitch (eContainerFeatureID()) {\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\treturn eInternalContainer().eInverseRemove(this, EntityPackage.BLOCK__ENTITIES, Block.class, msgs);\n\t\t}\n\t\treturn super.eBasicRemoveFromContainerFeature(msgs);\n\t}\n\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\t\treturn getOwnedAttributes();\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\t\t\treturn getOwnedReferences();\n\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n\t\t\t\tif (resolve) return getSupertype();\n\t\t\t\treturn basicGetSupertype();\n\t\t\tcase EntityPackage.ENTITY__ATTRIBUTES:\n\t\t\t\treturn getAttributes();\n\t\t\tcase EntityPackage.ENTITY__REFERENCES:\n\t\t\t\treturn getReferences();\n\t\t\tcase EntityPackage.ENTITY__PROPERTIES:\n\t\t\t\treturn getProperties();\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\tif (resolve) return getBlock();\n\t\t\t\treturn basicGetBlock();\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\t\tgetOwnedAttributes().clear();\n\t\t\t\tgetOwnedAttributes().addAll((Collection)newValue);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\t\t\tgetOwnedReferences().clear();\n\t\t\t\tgetOwnedReferences().addAll((Collection)newValue);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n\t\t\t\tsetSupertype((Entity)newValue);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\tsetBlock((Block)newValue);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\t\tgetOwnedAttributes().clear();\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\t\t\tgetOwnedReferences().clear();\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n\t\t\t\tsetSupertype((Entity)null);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\tsetBlock((Block)null);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n\t\t\t\treturn !getOwnedAttributes().isEmpty();\n\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n\t\t\t\treturn !getOwnedReferences().isEmpty();\n\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n\t\t\t\treturn basicGetSupertype() != null;\n\t\t\tcase EntityPackage.ENTITY__ATTRIBUTES:\n\t\t\t\treturn !getAttributes().isEmpty();\n\t\t\tcase EntityPackage.ENTITY__REFERENCES:\n\t\t\t\treturn !getReferences().isEmpty();\n\t\t\tcase EntityPackage.ENTITY__PROPERTIES:\n\t\t\t\treturn !getProperties().isEmpty();\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\treturn basicGetBlock() != null;","old_methods":[{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"return (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, true, true);","signature":"Entity getSupertype()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"return (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, false, true);","signature":"Entity basicGetSupertype()"},{"arguments":["Entity newSupertype"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"eDynamicSet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, newSupertype);","signature":"void setSupertype(Entity newSupertype)"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"BasicEList result = new UniqueEList() {\n\t\t\tprotected Object[] newData(int capacity) {\n\t\t\t\treturn new Attribute[capacity];","signature":"EList getAttributes()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"return false;","signature":"boolean useEquals()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"BasicEList result = new UniqueEList() {\n\t\t\tprotected Object[] newData(int capacity) {\n\t\t\t\treturn new Reference[capacity];","signature":"EList getReferences()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"return false;","signature":"boolean useEquals()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"BasicEList result = new UniqueEList() {\n\t\t\tprotected Object[] newData(int capacity) {\n\t\t\t\treturn new Property[capacity];","signature":"EList getProperties()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"return false;","signature":"boolean useEquals()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"return (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, true, true);","signature":"Block getBlock()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"return (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, false, true);","signature":"Block basicGetBlock()"},{"arguments":["Block newBlock"," NotificationChain msgs"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"msgs = eBasicSetContainer((InternalEObject)newBlock, EntityPackage.ENTITY__BLOCK, msgs);\n\t\treturn msgs;","signature":"NotificationChain basicSetBlock(Block newBlock, NotificationChain msgs)"},{"arguments":["Block newBlock"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"eDynamicSet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, newBlock);","signature":"void setBlock(Block newBlock)"},{"arguments":["Entity entity"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"// An entity A is a subtype of an entity B\n\t\t// - A and B are both the same entity\n\t\t// - the supertype of A is B\n\t\t// - the supertype of A is a subtype of B\n\t\treturn (EcoreUtil.equals(this, entity)\n\t\t\t\t|| (getSupertype() != null\n\t\t\t\t\t\t&& (EcoreUtil.equals(getSupertype(), entity) || getSupertype().isSubtypeOf(entity))));","signature":"boolean isSubtypeOf(Entity entity)"},{"arguments":["NotificationChain msgs"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java","implementation":"switch (eContainerFeatureID()) {\n\t\t\tcase EntityPackage.ENTITY__BLOCK:\n\t\t\t\treturn eInternalContainer().eInverseRemove(this, EntityPackage.BLOCK__ENTITIES, Block.class, msgs);","signature":"NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)"}],"patch":"@@ -15,22 +15,14 @@\n import java.util.Collection;\n \n import org.eclipse.emf.common.notify.NotificationChain;\n-import org.eclipse.emf.common.util.BasicEList;\n import org.eclipse.emf.common.util.EList;\n-import org.eclipse.emf.common.util.UniqueEList;\n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.InternalEObject;\n-import org.eclipse.emf.ecore.util.EcoreEList;\n-import org.eclipse.emf.ecore.util.EcoreUtil;\n import org.eclipse.emf.ecore.util.InternalEList;\n-import org.obeonetwork.dsl.entity.Attribute;\n-import org.obeonetwork.dsl.entity.Block;\n import org.obeonetwork.dsl.entity.Entity;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.Finder;\n import org.obeonetwork.dsl.entity.InheritanceKind;\n-import org.obeonetwork.dsl.entity.Property;\n-import org.obeonetwork.dsl.entity.Reference;\n import org.obeonetwork.dsl.environment.impl.StructuredTypeImpl;\n \n /**\n@@ -39,17 +31,10 @@\n *

    \n * The following features are implemented:\n *

      \n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedAttributes Owned Attributes}
      • \n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedReferences Owned References}
      • \n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getSupertype Supertype}
      • \n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getAttributes Attributes}
      • \n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getReferences References}
      • \n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getProperties Properties}
      • \n *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getEstimatedVolumetry Estimated Volumetry}
      • \n *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getEstimatedAccess Estimated Access}
      • \n *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#isHistorized Historized}
      • \n *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedFinders Owned Finders}
      • \n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getBlock Block}
      • \n *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getInheritanceKind Inheritance Kind}
      • \n *
    \n *

    \n@@ -118,123 +103,6 @@ protected EClass eStaticClass() {\n \t\treturn EntityPackage.Literals.ENTITY;\n \t}\n \n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\t@SuppressWarnings(\"unchecked\")\n-\tpublic EList getOwnedAttributes() {\n-\t\treturn (EList)eDynamicGet(EntityPackage.ENTITY__OWNED_ATTRIBUTES, EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES, true, true);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\t@SuppressWarnings(\"unchecked\")\n-\tpublic EList getOwnedReferences() {\n-\t\treturn (EList)eDynamicGet(EntityPackage.ENTITY__OWNED_REFERENCES, EntityPackage.Literals.ENTITY__OWNED_REFERENCES, true, true);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic Entity getSupertype() {\n-\t\treturn (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, true, true);\n-\t}\n-\n-\t/**\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\tpublic Entity basicGetSupertype() {\n-\t\treturn (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, false, true);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic void setSupertype(Entity newSupertype) {\n-\t\teDynamicSet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, newSupertype);\n-\t}\n-\n-\t/**\n-\t * \n-\t * \n-\t * @generated NOT\n-\t */\n-\tpublic EList getAttributes() {\n-\t\tBasicEList result = new UniqueEList() {\n-\t\t\tprotected Object[] newData(int capacity) {\n-\t\t\t\treturn new Attribute[capacity];\n-\t\t\t}\n-\n-\t\t\tprotected boolean useEquals() {\n-\t\t\t\treturn false;\n-\t\t\t}\n-\t\t};\n-\t\tresult.addAll(getOwnedAttributes());\n-\t\tif (getSupertype() != null)\n-\t\t\tresult.addAll(getSupertype().getAttributes());\n-\t\tresult.shrink();\n-\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n-\t\t\t\tthis, EntityPackage.eINSTANCE.getEntity_Attributes(), result\n-\t\t\t\t\t\t.size(), result.data());\n-\t\treturn unmodifiableResult;\n-\t}\n-\n-\t/**\n-\t * \n-\t * \n-\t * @generated NOT\n-\t */\n-\tpublic EList getReferences() {\n-\t\tBasicEList result = new UniqueEList() {\n-\t\t\tprotected Object[] newData(int capacity) {\n-\t\t\t\treturn new Reference[capacity];\n-\t\t\t}\n-\n-\t\t\tprotected boolean useEquals() {\n-\t\t\t\treturn false;\n-\t\t\t}\n-\t\t};\n-\t\tresult.addAll(getOwnedReferences());\n-\t\tif (getSupertype() != null)\n-\t\t\tresult.addAll(getSupertype().getReferences());\n-\t\tresult.shrink();\n-\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n-\t\t\t\tthis, EntityPackage.eINSTANCE.getEntity_References(), result\n-\t\t\t\t\t\t.size(), result.data());\n-\t\treturn unmodifiableResult;\n-\t}\n-\n-\t/**\n-\t * \n-\t * \n-\t * @generated NOT\n-\t */\n-\tpublic EList getProperties() {\n-\t\tBasicEList result = new UniqueEList() {\n-\t\t\tprotected Object[] newData(int capacity) {\n-\t\t\t\treturn new Property[capacity];\n-\t\t\t}\n-\n-\t\t\tprotected boolean useEquals() {\n-\t\t\t\treturn false;\n-\t\t\t}\n-\t\t};\n-\t\tresult.addAll(getAttributes());\n-\t\tresult.addAll(getReferences());\n-\t\tresult.shrink();\n-\t\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\n-\t\t\t\tthis, EntityPackage.eINSTANCE.getEntity_Attributes(), result\n-\t\t\t\t\t\t.size(), result.data());\n-\t\treturn unmodifiableResult;\n-\t}\n-\n \t/**\n \t * \n \t * @generated\n@@ -292,41 +160,6 @@ public EList getOwnedFinders() {\n \t\treturn (EList)eDynamicGet(EntityPackage.ENTITY__OWNED_FINDERS, EntityPackage.Literals.ENTITY__OWNED_FINDERS, true, true);\n \t}\n \n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic Block getBlock() {\n-\t\treturn (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, true, true);\n-\t}\n-\n-\t/**\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\tpublic Block basicGetBlock() {\n-\t\treturn (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, false, true);\n-\t}\n-\n-\t/**\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\tpublic NotificationChain basicSetBlock(Block newBlock, NotificationChain msgs) {\n-\t\tmsgs = eBasicSetContainer((InternalEObject)newBlock, EntityPackage.ENTITY__BLOCK, msgs);\n-\t\treturn msgs;\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic void setBlock(Block newBlock) {\n-\t\teDynamicSet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, newBlock);\n-\t}\n-\n \t/**\n \t * \n \t * @generated\n@@ -343,21 +176,6 @@ public void setInheritanceKind(InheritanceKind newInheritanceKind) {\n \t\teDynamicSet(EntityPackage.ENTITY__INHERITANCE_KIND, EntityPackage.Literals.ENTITY__INHERITANCE_KIND, newInheritanceKind);\n \t}\n \n-\t/**\n-\t * \n-\t * \n-\t * @generated NOT\n-\t */\n-\tpublic boolean isSubtypeOf(Entity entity) {\n-\t\t// An entity A is a subtype of an entity B\n-\t\t// - A and B are both the same entity\n-\t\t// - the supertype of A is B\n-\t\t// - the supertype of A is a subtype of B\n-\t\treturn (EcoreUtil.equals(this, entity)\n-\t\t\t\t|| (getSupertype() != null\n-\t\t\t\t\t\t&& (EcoreUtil.equals(getSupertype(), entity) || getSupertype().isSubtypeOf(entity))));\n-\t}\n-\n \t/**\n \t * \n \t * \n@@ -367,16 +185,8 @@ public boolean isSubtypeOf(Entity entity) {\n \t@Override\n \tpublic NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\t\treturn ((InternalEList)(InternalEList)getOwnedAttributes()).basicAdd(otherEnd, msgs);\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n-\t\t\t\treturn ((InternalEList)(InternalEList)getOwnedReferences()).basicAdd(otherEnd, msgs);\n \t\t\tcase EntityPackage.ENTITY__OWNED_FINDERS:\n \t\t\t\treturn ((InternalEList)(InternalEList)getOwnedFinders()).basicAdd(otherEnd, msgs);\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\tif (eInternalContainer() != null)\n-\t\t\t\t\tmsgs = eBasicRemoveFromContainer(msgs);\n-\t\t\t\treturn basicSetBlock((Block)otherEnd, msgs);\n \t\t}\n \t\treturn super.eInverseAdd(otherEnd, featureID, msgs);\n \t}\n@@ -389,32 +199,12 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No\n \t@Override\n \tpublic NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\t\treturn ((InternalEList)getOwnedAttributes()).basicRemove(otherEnd, msgs);\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n-\t\t\t\treturn ((InternalEList)getOwnedReferences()).basicRemove(otherEnd, msgs);\n \t\t\tcase EntityPackage.ENTITY__OWNED_FINDERS:\n \t\t\t\treturn ((InternalEList)getOwnedFinders()).basicRemove(otherEnd, msgs);\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\treturn basicSetBlock(null, msgs);\n \t\t}\n \t\treturn super.eInverseRemove(otherEnd, featureID, msgs);\n \t}\n \n-\t/**\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\t@Override\n-\tpublic NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {\n-\t\tswitch (eContainerFeatureID()) {\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\treturn eInternalContainer().eInverseRemove(this, EntityPackage.BLOCK__ENTITIES, Block.class, msgs);\n-\t\t}\n-\t\treturn super.eBasicRemoveFromContainerFeature(msgs);\n-\t}\n-\n \t/**\n \t * \n \t * \n@@ -423,19 +213,6 @@ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs\n \t@Override\n \tpublic Object eGet(int featureID, boolean resolve, boolean coreType) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\t\treturn getOwnedAttributes();\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n-\t\t\t\treturn getOwnedReferences();\n-\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n-\t\t\t\tif (resolve) return getSupertype();\n-\t\t\t\treturn basicGetSupertype();\n-\t\t\tcase EntityPackage.ENTITY__ATTRIBUTES:\n-\t\t\t\treturn getAttributes();\n-\t\t\tcase EntityPackage.ENTITY__REFERENCES:\n-\t\t\t\treturn getReferences();\n-\t\t\tcase EntityPackage.ENTITY__PROPERTIES:\n-\t\t\t\treturn getProperties();\n \t\t\tcase EntityPackage.ENTITY__ESTIMATED_VOLUMETRY:\n \t\t\t\treturn getEstimatedVolumetry();\n \t\t\tcase EntityPackage.ENTITY__ESTIMATED_ACCESS:\n@@ -444,9 +221,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {\n \t\t\t\treturn isHistorized();\n \t\t\tcase EntityPackage.ENTITY__OWNED_FINDERS:\n \t\t\t\treturn getOwnedFinders();\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\tif (resolve) return getBlock();\n-\t\t\t\treturn basicGetBlock();\n \t\t\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\n \t\t\t\treturn getInheritanceKind();\n \t\t}\n@@ -462,17 +236,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {\n \t@Override\n \tpublic void eSet(int featureID, Object newValue) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\t\tgetOwnedAttributes().clear();\n-\t\t\t\tgetOwnedAttributes().addAll((Collection)newValue);\n-\t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n-\t\t\t\tgetOwnedReferences().clear();\n-\t\t\t\tgetOwnedReferences().addAll((Collection)newValue);\n-\t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n-\t\t\t\tsetSupertype((Entity)newValue);\n-\t\t\t\treturn;\n \t\t\tcase EntityPackage.ENTITY__ESTIMATED_VOLUMETRY:\n \t\t\t\tsetEstimatedVolumetry((Integer)newValue);\n \t\t\t\treturn;\n@@ -486,9 +249,6 @@ public void eSet(int featureID, Object newValue) {\n \t\t\t\tgetOwnedFinders().clear();\n \t\t\t\tgetOwnedFinders().addAll((Collection)newValue);\n \t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\tsetBlock((Block)newValue);\n-\t\t\t\treturn;\n \t\t\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\n \t\t\t\tsetInheritanceKind((InheritanceKind)newValue);\n \t\t\t\treturn;\n@@ -504,15 +264,6 @@ public void eSet(int featureID, Object newValue) {\n \t@Override\n \tpublic void eUnset(int featureID) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\t\tgetOwnedAttributes().clear();\n-\t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n-\t\t\t\tgetOwnedReferences().clear();\n-\t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n-\t\t\t\tsetSupertype((Entity)null);\n-\t\t\t\treturn;\n \t\t\tcase EntityPackage.ENTITY__ESTIMATED_VOLUMETRY:\n \t\t\t\tsetEstimatedVolumetry(ESTIMATED_VOLUMETRY_EDEFAULT);\n \t\t\t\treturn;\n@@ -525,9 +276,6 @@ public void eUnset(int featureID) {\n \t\t\tcase EntityPackage.ENTITY__OWNED_FINDERS:\n \t\t\t\tgetOwnedFinders().clear();\n \t\t\t\treturn;\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\tsetBlock((Block)null);\n-\t\t\t\treturn;\n \t\t\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\n \t\t\t\tsetInheritanceKind(INHERITANCE_KIND_EDEFAULT);\n \t\t\t\treturn;\n@@ -543,18 +291,6 @@ public void eUnset(int featureID) {\n \t@Override\n \tpublic boolean eIsSet(int featureID) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\n-\t\t\t\treturn !getOwnedAttributes().isEmpty();\n-\t\t\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\n-\t\t\t\treturn !getOwnedReferences().isEmpty();\n-\t\t\tcase EntityPackage.ENTITY__SUPERTYPE:\n-\t\t\t\treturn basicGetSupertype() != null;\n-\t\t\tcase EntityPackage.ENTITY__ATTRIBUTES:\n-\t\t\t\treturn !getAttributes().isEmpty();\n-\t\t\tcase EntityPackage.ENTITY__REFERENCES:\n-\t\t\t\treturn !getReferences().isEmpty();\n-\t\t\tcase EntityPackage.ENTITY__PROPERTIES:\n-\t\t\t\treturn !getProperties().isEmpty();\n \t\t\tcase EntityPackage.ENTITY__ESTIMATED_VOLUMETRY:\n \t\t\t\treturn getEstimatedVolumetry() != ESTIMATED_VOLUMETRY_EDEFAULT;\n \t\t\tcase EntityPackage.ENTITY__ESTIMATED_ACCESS:\n@@ -563,8 +299,6 @@ public boolean eIsSet(int featureID) {\n \t\t\t\treturn isHistorized() != HISTORIZED_EDEFAULT;\n \t\t\tcase EntityPackage.ENTITY__OWNED_FINDERS:\n \t\t\t\treturn !getOwnedFinders().isEmpty();\n-\t\t\tcase EntityPackage.ENTITY__BLOCK:\n-\t\t\t\treturn basicGetBlock() != null;\n \t\t\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\n \t\t\t\treturn getInheritanceKind() != INHERITANCE_KIND_EDEFAULT;\n \t\t}","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityImpl.java","sha":"442e18967f0f9cf412423c25bf61fd10bed95b34","status":"modified"},{"additions":19,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityPackageImpl.java","changes":314,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityPackageImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":295,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","new_code":"\t * \n\t * \n\tpublic EAttribute getRoot_Name() {\n\t\treturn (EAttribute)rootEClass.getEStructuralFeatures().get(0);\n\t * \n\t * \n\tpublic EReference getRoot_Namespaces() {\n\t\treturn (EReference)rootEClass.getEStructuralFeatures().get(1);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(0);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(1);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(2);\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(3);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(4);\n\t\tcreateEAttribute(rootEClass, ROOT__NAME);\n\t\tcreateEReference(rootEClass, ROOT__NAMESPACES);\n\t\trootEClass.getESuperTypes().add(theEnvironmentPackage.getTypesDefinition());\n\t\tinitEAttribute(getRoot_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getRoot_Namespaces(), theEnvironmentPackage.getNamespace(), null, \"namespaces\", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getInternalCriterion_Target(), theEnvironmentPackage.getAttribute(), null, \"target\", null, 1, 1, InternalCriterion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);","new_methods":[],"old_code":"import org.eclipse.emf.ecore.EOperation;\nimport org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Block;\nimport org.obeonetwork.dsl.entity.Property;\nimport org.obeonetwork.dsl.entity.Reference;\n\t/**\n\t * \n\t * @generated\n\t */\n\tprivate EClass blockEClass = null;\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tprivate EClass propertyEClass = null;\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tprivate EClass attributeEClass = null;\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tprivate EClass referenceEClass = null;\n\n\t * \n\t * @generated\n\t */\n\tpublic EReference getRoot_Blocks() {\n\t\treturn (EReference)rootEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EClass getBlock() {\n\t\treturn blockEClass;\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EAttribute getBlock_Name() {\n\t\treturn (EAttribute)blockEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * \n\tpublic EReference getBlock_Entities() {\n\t\treturn (EReference)blockEClass.getEStructuralFeatures().get(1);\n\t * \n\tpublic EReference getBlock_Subblocks() {\n\t\treturn (EReference)blockEClass.getEStructuralFeatures().get(2);\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getEntity_OwnedAttributes() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getEntity_OwnedReferences() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(1);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getEntity_Supertype() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(2);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getEntity_Attributes() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(3);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getEntity_References() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(4);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getEntity_Properties() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(5);\n\t}\n\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(6);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(7);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(8);\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(9);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getEntity_Block() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(10);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(11);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EClass getProperty() {\n\t\treturn propertyEClass;\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EAttribute getProperty_Name() {\n\t\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EAttribute getProperty_Multiplicity() {\n\t\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(1);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EAttribute getProperty_IsPrimaryKey() {\n\t\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(2);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EClass getAttribute() {\n\t\treturn attributeEClass;\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getAttribute_Entity() {\n\t\treturn (EReference)attributeEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getAttribute_Type() {\n\t\treturn (EReference)attributeEClass.getEStructuralFeatures().get(1);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EClass getReference() {\n\t\treturn referenceEClass;\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getReference_Entity() {\n\t\treturn (EReference)referenceEClass.getEStructuralFeatures().get(0);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EAttribute getReference_IsComposite() {\n\t\treturn (EAttribute)referenceEClass.getEStructuralFeatures().get(1);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getReference_OppositeOf() {\n\t\treturn (EReference)referenceEClass.getEStructuralFeatures().get(2);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getReference_Type() {\n\t\treturn (EReference)referenceEClass.getEStructuralFeatures().get(3);\n\t}\n\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EAttribute getReference_Navigable() {\n\t\treturn (EAttribute)referenceEClass.getEStructuralFeatures().get(4);\n\t\tcreateEReference(rootEClass, ROOT__BLOCKS);\n\n\t\tblockEClass = createEClass(BLOCK);\n\t\tcreateEAttribute(blockEClass, BLOCK__NAME);\n\t\tcreateEReference(blockEClass, BLOCK__ENTITIES);\n\t\tcreateEReference(blockEClass, BLOCK__SUBBLOCKS);\n\t\tcreateEReference(entityEClass, ENTITY__OWNED_ATTRIBUTES);\n\t\tcreateEReference(entityEClass, ENTITY__OWNED_REFERENCES);\n\t\tcreateEReference(entityEClass, ENTITY__SUPERTYPE);\n\t\tcreateEReference(entityEClass, ENTITY__ATTRIBUTES);\n\t\tcreateEReference(entityEClass, ENTITY__REFERENCES);\n\t\tcreateEReference(entityEClass, ENTITY__PROPERTIES);\n\t\tcreateEReference(entityEClass, ENTITY__BLOCK);\n\t\tpropertyEClass = createEClass(PROPERTY);\n\t\tcreateEAttribute(propertyEClass, PROPERTY__NAME);\n\t\tcreateEAttribute(propertyEClass, PROPERTY__MULTIPLICITY);\n\t\tcreateEAttribute(propertyEClass, PROPERTY__IS_PRIMARY_KEY);\n\n\t\tattributeEClass = createEClass(ATTRIBUTE);\n\t\tcreateEReference(attributeEClass, ATTRIBUTE__ENTITY);\n\t\tcreateEReference(attributeEClass, ATTRIBUTE__TYPE);\n\n\t\treferenceEClass = createEClass(REFERENCE);\n\t\tcreateEReference(referenceEClass, REFERENCE__ENTITY);\n\t\tcreateEAttribute(referenceEClass, REFERENCE__IS_COMPOSITE);\n\t\tcreateEReference(referenceEClass, REFERENCE__OPPOSITE_OF);\n\t\tcreateEReference(referenceEClass, REFERENCE__TYPE);\n\t\tcreateEAttribute(referenceEClass, REFERENCE__NAVIGABLE);\n\n\t\trootEClass.getESuperTypes().add(theEnvironmentPackage.getNamespace());\n\t\tblockEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\n\t\tpropertyEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\n\t\tpropertyEClass.getESuperTypes().add(theEnvironmentPackage.getBoundableElement());\n\t\tattributeEClass.getESuperTypes().add(this.getProperty());\n\t\treferenceEClass.getESuperTypes().add(this.getProperty());\n\t\tinitEReference(getRoot_Blocks(), this.getBlock(), null, \"blocks\", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n\t\tinitEClass(blockEClass, Block.class, \"Block\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n\t\tinitEAttribute(getBlock_Name(), ecorePackage.getEString(), \"name\", null, 1, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getBlock_Entities(), this.getEntity(), this.getEntity_Block(), \"entities\", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getBlock_Subblocks(), this.getBlock(), null, \"subblocks\", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_OwnedAttributes(), this.getAttribute(), this.getAttribute_Entity(), \"ownedAttributes\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_OwnedReferences(), this.getReference(), this.getReference_Entity(), \"ownedReferences\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_Supertype(), this.getEntity(), null, \"supertype\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_Attributes(), this.getAttribute(), null, \"attributes\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_References(), this.getReference(), null, \"references\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_Properties(), this.getProperty(), null, \"properties\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getEntity_Block(), this.getBlock(), this.getBlock_Entities(), \"block\", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tEOperation op = addEOperation(entityEClass, ecorePackage.getEBoolean(), \"isSubtypeOf\", 0, 1, IS_UNIQUE, IS_ORDERED);\n\t\taddEParameter(op, this.getEntity(), \"entity\", 0, 1, IS_UNIQUE, IS_ORDERED);\n\n\t\tinitEClass(propertyEClass, Property.class, \"Property\", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n\t\tinitEAttribute(getProperty_Name(), ecorePackage.getEString(), \"name\", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEAttribute(getProperty_Multiplicity(), theEnvironmentPackage.getMultiplicityKind(), \"multiplicity\", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEAttribute(getProperty_IsPrimaryKey(), ecorePackage.getEBoolean(), \"isPrimaryKey\", \"false\", 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n\t\tinitEClass(attributeEClass, Attribute.class, \"Attribute\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n\t\tinitEReference(getAttribute_Entity(), this.getEntity(), this.getEntity_OwnedAttributes(), \"entity\", null, 1, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getAttribute_Type(), theEnvironmentPackage.getPrimitiveType(), null, \"type\", null, 1, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n\t\tinitEClass(referenceEClass, Reference.class, \"Reference\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n\t\tinitEReference(getReference_Entity(), this.getEntity(), this.getEntity_OwnedReferences(), \"entity\", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEAttribute(getReference_IsComposite(), ecorePackage.getEBoolean(), \"isComposite\", \"false\", 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getReference_OppositeOf(), this.getReference(), null, \"oppositeOf\", null, 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEReference(getReference_Type(), this.getEntity(), null, \"type\", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\t\tinitEAttribute(getReference_Navigable(), ecorePackage.getEBoolean(), \"navigable\", \"true\", 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n\t\top = addEOperation(referenceEClass, ecorePackage.getEBoolean(), \"canBeOppositeOf\", 1, 1, IS_UNIQUE, IS_ORDERED);\n\t\taddEParameter(op, this.getReference(), \"opposite\", 0, 1, IS_UNIQUE, IS_ORDERED);\n\n\t\tinitEReference(getInternalCriterion_Target(), this.getAttribute(), null, \"target\", null, 1, 1, InternalCriterion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);","old_methods":[{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)rootEClass.getEStructuralFeatures().get(0);","signature":"EReference getRoot_Blocks()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return blockEClass;","signature":"EClass getBlock()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EAttribute)blockEClass.getEStructuralFeatures().get(0);","signature":"EAttribute getBlock_Name()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)blockEClass.getEStructuralFeatures().get(1);\n\t * \n\tpublic EReference getBlock_Subblocks() {\n\t\treturn (EReference)blockEClass.getEStructuralFeatures().get(2);\n\t/**\n\t * \n\t * @generated\n\t */\n\tpublic EReference getEntity_OwnedAttributes() {\n\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(0);","signature":"EReference getBlock_Entities()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)entityEClass.getEStructuralFeatures().get(1);","signature":"EReference getEntity_OwnedReferences()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)entityEClass.getEStructuralFeatures().get(2);","signature":"EReference getEntity_Supertype()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)entityEClass.getEStructuralFeatures().get(3);","signature":"EReference getEntity_Attributes()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)entityEClass.getEStructuralFeatures().get(4);","signature":"EReference getEntity_References()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)entityEClass.getEStructuralFeatures().get(5);","signature":"EReference getEntity_Properties()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)entityEClass.getEStructuralFeatures().get(10);\n\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(11);","signature":"EReference getEntity_Block()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return propertyEClass;","signature":"EClass getProperty()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EAttribute)propertyEClass.getEStructuralFeatures().get(0);","signature":"EAttribute getProperty_Name()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EAttribute)propertyEClass.getEStructuralFeatures().get(1);","signature":"EAttribute getProperty_Multiplicity()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EAttribute)propertyEClass.getEStructuralFeatures().get(2);","signature":"EAttribute getProperty_IsPrimaryKey()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return attributeEClass;","signature":"EClass getAttribute()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)attributeEClass.getEStructuralFeatures().get(0);","signature":"EReference getAttribute_Entity()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)attributeEClass.getEStructuralFeatures().get(1);","signature":"EReference getAttribute_Type()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return referenceEClass;","signature":"EClass getReference()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)referenceEClass.getEStructuralFeatures().get(0);","signature":"EReference getReference_Entity()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EAttribute)referenceEClass.getEStructuralFeatures().get(1);","signature":"EAttribute getReference_IsComposite()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)referenceEClass.getEStructuralFeatures().get(2);","signature":"EReference getReference_OppositeOf()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java","implementation":"return (EReference)referenceEClass.getEStructuralFeatures().get(3);","signature":"EReference getReference_Type()"}],"patch":"@@ -15,12 +15,9 @@\n import org.eclipse.emf.ecore.EAttribute;\n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.EEnum;\n-import org.eclipse.emf.ecore.EOperation;\n import org.eclipse.emf.ecore.EPackage;\n import org.eclipse.emf.ecore.EReference;\n import org.eclipse.emf.ecore.impl.EPackageImpl;\n-import org.obeonetwork.dsl.entity.Attribute;\n-import org.obeonetwork.dsl.entity.Block;\n import org.obeonetwork.dsl.entity.Criterion;\n import org.obeonetwork.dsl.entity.Entity;\n import org.obeonetwork.dsl.entity.EntityFactory;\n@@ -29,8 +26,6 @@\n import org.obeonetwork.dsl.entity.Finder;\n import org.obeonetwork.dsl.entity.InheritanceKind;\n import org.obeonetwork.dsl.entity.InternalCriterion;\n-import org.obeonetwork.dsl.entity.Property;\n-import org.obeonetwork.dsl.entity.Reference;\n import org.obeonetwork.dsl.entity.Root;\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\n import org.obeonetwork.dsl.entity.extensionUtilities.impl.ExtensionUtilitiesPackageImpl;\n@@ -55,36 +50,12 @@ public class EntityPackageImpl extends EPackageImpl implements EntityPackage {\n \t */\n \tprivate EClass rootEClass = null;\n \n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tprivate EClass blockEClass = null;\n-\n \t/**\n \t * \n \t * @generated\n \t */\n \tprivate EClass entityEClass = null;\n \n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tprivate EClass propertyEClass = null;\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tprivate EClass attributeEClass = null;\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tprivate EClass referenceEClass = null;\n-\n \t/**\n \t * \n \t * @generated\n@@ -191,43 +162,21 @@ public EClass getRoot() {\n \t}\n \n \t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getRoot_Blocks() {\n-\t\treturn (EReference)rootEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EClass getBlock() {\n-\t\treturn blockEClass;\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EAttribute getBlock_Name() {\n-\t\treturn (EAttribute)blockEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n-\t/**\n-\t * \n+\t * \n+\t * \n \t * @generated\n \t */\n-\tpublic EReference getBlock_Entities() {\n-\t\treturn (EReference)blockEClass.getEStructuralFeatures().get(1);\n+\tpublic EAttribute getRoot_Name() {\n+\t\treturn (EAttribute)rootEClass.getEStructuralFeatures().get(0);\n \t}\n \n \t/**\n-\t * \n+\t * \n+\t * \n \t * @generated\n \t */\n-\tpublic EReference getBlock_Subblocks() {\n-\t\treturn (EReference)blockEClass.getEStructuralFeatures().get(2);\n+\tpublic EReference getRoot_Namespaces() {\n+\t\treturn (EReference)rootEClass.getEStructuralFeatures().get(1);\n \t}\n \n \t/**\n@@ -238,204 +187,44 @@ public EClass getEntity() {\n \t\treturn entityEClass;\n \t}\n \n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_OwnedAttributes() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_OwnedReferences() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(1);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_Supertype() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(2);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_Attributes() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(3);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_References() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(4);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_Properties() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(5);\n-\t}\n-\n \t/**\n \t * \n \t * @generated\n \t */\n \tpublic EAttribute getEntity_EstimatedVolumetry() {\n-\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(6);\n+\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(0);\n \t}\n \n \t/**\n \t * \n \t * @generated\n \t */\n \tpublic EAttribute getEntity_EstimatedAccess() {\n-\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(7);\n+\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(1);\n \t}\n \n \t/**\n \t * \n \t * @generated\n \t */\n \tpublic EAttribute getEntity_Historized() {\n-\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(8);\n+\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(2);\n \t}\n \n \t/**\n \t * \n \t * @generated\n \t */\n \tpublic EReference getEntity_OwnedFinders() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(9);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getEntity_Block() {\n-\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(10);\n+\t\treturn (EReference)entityEClass.getEStructuralFeatures().get(3);\n \t}\n \n \t/**\n \t * \n \t * @generated\n \t */\n \tpublic EAttribute getEntity_InheritanceKind() {\n-\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(11);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EClass getProperty() {\n-\t\treturn propertyEClass;\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EAttribute getProperty_Name() {\n-\t\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EAttribute getProperty_Multiplicity() {\n-\t\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(1);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EAttribute getProperty_IsPrimaryKey() {\n-\t\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(2);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EClass getAttribute() {\n-\t\treturn attributeEClass;\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getAttribute_Entity() {\n-\t\treturn (EReference)attributeEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getAttribute_Type() {\n-\t\treturn (EReference)attributeEClass.getEStructuralFeatures().get(1);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EClass getReference() {\n-\t\treturn referenceEClass;\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getReference_Entity() {\n-\t\treturn (EReference)referenceEClass.getEStructuralFeatures().get(0);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EAttribute getReference_IsComposite() {\n-\t\treturn (EAttribute)referenceEClass.getEStructuralFeatures().get(1);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getReference_OppositeOf() {\n-\t\treturn (EReference)referenceEClass.getEStructuralFeatures().get(2);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EReference getReference_Type() {\n-\t\treturn (EReference)referenceEClass.getEStructuralFeatures().get(3);\n-\t}\n-\n-\t/**\n-\t * \n-\t * @generated\n-\t */\n-\tpublic EAttribute getReference_Navigable() {\n-\t\treturn (EAttribute)referenceEClass.getEStructuralFeatures().get(4);\n+\t\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(4);\n \t}\n \n \t/**\n@@ -578,43 +367,16 @@ public void createPackageContents() {\n \n \t\t// Create classes and their features\n \t\trootEClass = createEClass(ROOT);\n-\t\tcreateEReference(rootEClass, ROOT__BLOCKS);\n-\n-\t\tblockEClass = createEClass(BLOCK);\n-\t\tcreateEAttribute(blockEClass, BLOCK__NAME);\n-\t\tcreateEReference(blockEClass, BLOCK__ENTITIES);\n-\t\tcreateEReference(blockEClass, BLOCK__SUBBLOCKS);\n+\t\tcreateEAttribute(rootEClass, ROOT__NAME);\n+\t\tcreateEReference(rootEClass, ROOT__NAMESPACES);\n \n \t\tentityEClass = createEClass(ENTITY);\n-\t\tcreateEReference(entityEClass, ENTITY__OWNED_ATTRIBUTES);\n-\t\tcreateEReference(entityEClass, ENTITY__OWNED_REFERENCES);\n-\t\tcreateEReference(entityEClass, ENTITY__SUPERTYPE);\n-\t\tcreateEReference(entityEClass, ENTITY__ATTRIBUTES);\n-\t\tcreateEReference(entityEClass, ENTITY__REFERENCES);\n-\t\tcreateEReference(entityEClass, ENTITY__PROPERTIES);\n \t\tcreateEAttribute(entityEClass, ENTITY__ESTIMATED_VOLUMETRY);\n \t\tcreateEAttribute(entityEClass, ENTITY__ESTIMATED_ACCESS);\n \t\tcreateEAttribute(entityEClass, ENTITY__HISTORIZED);\n \t\tcreateEReference(entityEClass, ENTITY__OWNED_FINDERS);\n-\t\tcreateEReference(entityEClass, ENTITY__BLOCK);\n \t\tcreateEAttribute(entityEClass, ENTITY__INHERITANCE_KIND);\n \n-\t\tpropertyEClass = createEClass(PROPERTY);\n-\t\tcreateEAttribute(propertyEClass, PROPERTY__NAME);\n-\t\tcreateEAttribute(propertyEClass, PROPERTY__MULTIPLICITY);\n-\t\tcreateEAttribute(propertyEClass, PROPERTY__IS_PRIMARY_KEY);\n-\n-\t\tattributeEClass = createEClass(ATTRIBUTE);\n-\t\tcreateEReference(attributeEClass, ATTRIBUTE__ENTITY);\n-\t\tcreateEReference(attributeEClass, ATTRIBUTE__TYPE);\n-\n-\t\treferenceEClass = createEClass(REFERENCE);\n-\t\tcreateEReference(referenceEClass, REFERENCE__ENTITY);\n-\t\tcreateEAttribute(referenceEClass, REFERENCE__IS_COMPOSITE);\n-\t\tcreateEReference(referenceEClass, REFERENCE__OPPOSITE_OF);\n-\t\tcreateEReference(referenceEClass, REFERENCE__TYPE);\n-\t\tcreateEAttribute(referenceEClass, REFERENCE__NAVIGABLE);\n-\n \t\tfinderEClass = createEClass(FINDER);\n \t\tcreateEAttribute(finderEClass, FINDER__NAME);\n \t\tcreateEReference(finderEClass, FINDER__ENTITY);\n@@ -670,63 +432,25 @@ public void initializePackageContents() {\n \t\t// Set bounds for type parameters\n \n \t\t// Add supertypes to classes\n-\t\trootEClass.getESuperTypes().add(theEnvironmentPackage.getNamespace());\n-\t\tblockEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\n+\t\trootEClass.getESuperTypes().add(theEnvironmentPackage.getTypesDefinition());\n \t\tentityEClass.getESuperTypes().add(theEnvironmentPackage.getStructuredType());\n-\t\tpropertyEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\n-\t\tpropertyEClass.getESuperTypes().add(theEnvironmentPackage.getBoundableElement());\n-\t\tattributeEClass.getESuperTypes().add(this.getProperty());\n-\t\treferenceEClass.getESuperTypes().add(this.getProperty());\n \t\tfinderEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\n \t\tinternalCriterionEClass.getESuperTypes().add(this.getCriterion());\n \t\tcriterionEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\n \t\texternalCriterionEClass.getESuperTypes().add(this.getCriterion());\n \n \t\t// Initialize classes and features; add operations and parameters\n \t\tinitEClass(rootEClass, Root.class, \"Root\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEReference(getRoot_Blocks(), this.getBlock(), null, \"blocks\", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\n-\t\tinitEClass(blockEClass, Block.class, \"Block\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEAttribute(getBlock_Name(), ecorePackage.getEString(), \"name\", null, 1, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getBlock_Entities(), this.getEntity(), this.getEntity_Block(), \"entities\", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getBlock_Subblocks(), this.getBlock(), null, \"subblocks\", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\t\tinitEAttribute(getRoot_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\t\tinitEReference(getRoot_Namespaces(), theEnvironmentPackage.getNamespace(), null, \"namespaces\", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n \t\tinitEClass(entityEClass, Entity.class, \"Entity\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEReference(getEntity_OwnedAttributes(), this.getAttribute(), this.getAttribute_Entity(), \"ownedAttributes\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntity_OwnedReferences(), this.getReference(), this.getReference_Entity(), \"ownedReferences\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntity_Supertype(), this.getEntity(), null, \"supertype\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntity_Attributes(), this.getAttribute(), null, \"attributes\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntity_References(), this.getReference(), null, \"references\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntity_Properties(), this.getProperty(), null, \"properties\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n \t\tinitEAttribute(getEntity_EstimatedVolumetry(), ecorePackage.getEInt(), \"estimatedVolumetry\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t\tinitEAttribute(getEntity_EstimatedAccess(), ecorePackage.getEInt(), \"estimatedAccess\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t\tinitEAttribute(getEntity_Historized(), ecorePackage.getEBoolean(), \"historized\", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t\tinitEReference(getEntity_OwnedFinders(), this.getFinder(), this.getFinder_Entity(), \"ownedFinders\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getEntity_Block(), this.getBlock(), this.getBlock_Entities(), \"block\", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t\tinitEAttribute(getEntity_InheritanceKind(), this.getInheritanceKind(), \"inheritanceKind\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n-\t\tEOperation op = addEOperation(entityEClass, ecorePackage.getEBoolean(), \"isSubtypeOf\", 0, 1, IS_UNIQUE, IS_ORDERED);\n-\t\taddEParameter(op, this.getEntity(), \"entity\", 0, 1, IS_UNIQUE, IS_ORDERED);\n-\n-\t\tinitEClass(propertyEClass, Property.class, \"Property\", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEAttribute(getProperty_Name(), ecorePackage.getEString(), \"name\", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEAttribute(getProperty_Multiplicity(), theEnvironmentPackage.getMultiplicityKind(), \"multiplicity\", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEAttribute(getProperty_IsPrimaryKey(), ecorePackage.getEBoolean(), \"isPrimaryKey\", \"false\", 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\n-\t\tinitEClass(attributeEClass, Attribute.class, \"Attribute\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEReference(getAttribute_Entity(), this.getEntity(), this.getEntity_OwnedAttributes(), \"entity\", null, 1, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getAttribute_Type(), theEnvironmentPackage.getPrimitiveType(), null, \"type\", null, 1, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\n-\t\tinitEClass(referenceEClass, Reference.class, \"Reference\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEReference(getReference_Entity(), this.getEntity(), this.getEntity_OwnedReferences(), \"entity\", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEAttribute(getReference_IsComposite(), ecorePackage.getEBoolean(), \"isComposite\", \"false\", 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getReference_OppositeOf(), this.getReference(), null, \"oppositeOf\", null, 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEReference(getReference_Type(), this.getEntity(), null, \"type\", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\t\tinitEAttribute(getReference_Navigable(), ecorePackage.getEBoolean(), \"navigable\", \"true\", 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n-\n-\t\top = addEOperation(referenceEClass, ecorePackage.getEBoolean(), \"canBeOppositeOf\", 1, 1, IS_UNIQUE, IS_ORDERED);\n-\t\taddEParameter(op, this.getReference(), \"opposite\", 0, 1, IS_UNIQUE, IS_ORDERED);\n-\n \t\tinitEClass(finderEClass, Finder.class, \"Finder\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n \t\tinitEAttribute(getFinder_Name(), ecorePackage.getEString(), \"name\", null, 1, 1, Finder.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n \t\tinitEReference(getFinder_Entity(), this.getEntity(), this.getEntity_OwnedFinders(), \"entity\", null, 1, 1, Finder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n@@ -735,7 +459,7 @@ public void initializePackageContents() {\n \t\tinitEAttribute(getFinder_Multiplicity(), theEnvironmentPackage.getMultiplicityKind(), \"multiplicity\", null, 1, 1, Finder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n \t\tinitEClass(internalCriterionEClass, InternalCriterion.class, \"InternalCriterion\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n-\t\tinitEReference(getInternalCriterion_Target(), this.getAttribute(), null, \"target\", null, 1, 1, InternalCriterion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\t\tinitEReference(getInternalCriterion_Target(), theEnvironmentPackage.getAttribute(), null, \"target\", null, 1, 1, InternalCriterion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \t\tinitEAttribute(getInternalCriterion_Name(), ecorePackage.getEString(), \"name\", null, 1, 1, InternalCriterion.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\n \n \t\tinitEClass(criterionEClass, Criterion.class, \"Criterion\", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityPackageImpl.java","sha":"d7e575abcdcee65011558eedb6ba479f73153d6a","status":"modified"},{"additions":2,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FFinderImpl.java","changes":4,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FFinderImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":2,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/FinderImpl.java","new_code":"\t\t\tEList listCriterions = getCriterions();\n\t\t\t\tfor (Iterator iter = listCriterions.iterator(); iter.hasNext();) {","new_methods":[],"old_code":"\t\t\tEList listCriterions = getCriterions();\n\t\t\t\tfor (Iterator iter = listCriterions.iterator(); iter.hasNext();) {","old_methods":[],"patch":"@@ -110,9 +110,9 @@ public String getName() {\n \t\t\tresult = customizedName;\n \t\t} else {\n \t\t\tresult = \"finder : \";\n-\t\t\tEList listCriterions = getCriterions();\n+\t\t\tEList listCriterions = getCriterions();\n \t\t\tif (listCriterions != null) {\n-\t\t\t\tfor (Iterator iter = listCriterions.iterator(); iter.hasNext();) {\n+\t\t\t\tfor (Iterator iter = listCriterions.iterator(); iter.hasNext();) {\n \t\t\t\t\tCriterion criterion = (Criterion) iter.next();\n \t\t\t\t\tif (criterion instanceof InternalCriterion) {\n \t\t\t\t\t\tInternalCriterion internalCriterion = (InternalCriterion) criterion;","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FFinderImpl.java","sha":"bacbbf45ce7bdee39b4667997638164633522610","status":"modified"},{"additions":5,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FInternalCriterionImpl.java","changes":8,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FInternalCriterionImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":3,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/InternalCriterionImpl.java","new_code":"import org.obeonetwork.dsl.environment.Attribute;\n\t * \n\t * \n\t\tif (getTarget() != null) {\n\t\t}","new_methods":[],"old_code":"import org.obeonetwork.dsl.entity.Attribute;\n\t * \n\t\tif (getTarget() != null)","old_methods":[],"patch":"@@ -13,9 +13,9 @@\n package org.obeonetwork.dsl.entity.impl;\n \n import org.eclipse.emf.ecore.EClass;\n-import org.obeonetwork.dsl.entity.Attribute;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.InternalCriterion;\n+import org.obeonetwork.dsl.environment.Attribute;\n \n /**\n * An implementation of the model object 'Internal Criterion'.\n@@ -84,7 +84,8 @@ public Attribute basicGetTarget() {\n \t}\n \n \t/**\n-\t * \n+\t * \n+\t * \n \t * @generated\n \t */\n \tpublic void setTarget(Attribute newTarget) {\n@@ -98,8 +99,9 @@ public void setTarget(Attribute newTarget) {\n \t */\n \tpublic String getName() {\n \t\tString result = \"\";\n-\t\tif (getTarget() != null)\n+\t\tif (getTarget() != null) {\n \t\t\tresult = getTarget().getName();\n+\t\t}\n \t\treturn result;\n \t}\n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FInternalCriterionImpl.java","sha":"7bdfcf9563b821b85d0dbda0f59b871ea6353cd8","status":"modified"},{"additions":57,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FRootImpl.java","changes":75,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FRootImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":18,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/RootImpl.java","new_code":"import org.obeonetwork.dsl.environment.Namespace;\nimport org.obeonetwork.dsl.environment.impl.TypesDefinitionImpl;\n *
  • {@link org.obeonetwork.dsl.entity.impl.RootImpl#getName Name}
    • \n *
  • {@link org.obeonetwork.dsl.entity.impl.RootImpl#getNamespaces Namespaces}
    • \npublic class RootImpl extends TypesDefinitionImpl implements Root {\n\t/**\n\t * The default value of the '{@link #getName() Name}' attribute.\n\t * \n\t * \n\t * @see #getName()\n\t * @generated\n\t * @ordered\n\t */\n\tprotected static final String NAME_EDEFAULT = null;\n\t * \n\t * \n\t * @generated\n\t */\n\tpublic String getName() {\n\t\treturn (String)eDynamicGet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, true, true);\n\t}\n\n\t/**\n\t * \n\t * \n\t * @generated\n\t */\n\tpublic void setName(String newName) {\n\t\teDynamicSet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, newName);\n\t}\n\n\t/**\n\t * \n\t * \n\tpublic EList getNamespaces() {\n\t\treturn (EList)eDynamicGet(EntityPackage.ROOT__NAMESPACES, EntityPackage.Literals.ROOT__NAMESPACES, true, true);\n\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n\t\t\t\treturn ((InternalEList)getNamespaces()).basicRemove(otherEnd, msgs);\n\t\t\tcase EntityPackage.ROOT__NAME:\n\t\t\t\treturn getName();\n\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n\t\t\t\treturn getNamespaces();\n\t\t\tcase EntityPackage.ROOT__NAME:\n\t\t\t\tsetName((String)newValue);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n\t\t\t\tgetNamespaces().clear();\n\t\t\t\tgetNamespaces().addAll((Collection)newValue);\n\t\t\tcase EntityPackage.ROOT__NAME:\n\t\t\t\tsetName(NAME_EDEFAULT);\n\t\t\t\treturn;\n\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n\t\t\t\tgetNamespaces().clear();\n\t\t\tcase EntityPackage.ROOT__NAME:\n\t\t\t\treturn NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());\n\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n\t\t\t\treturn !getNamespaces().isEmpty();","new_methods":[{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/RootImpl.java","implementation":"return (String)eDynamicGet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, true, true);","signature":"String getName()"},{"arguments":["String newName"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/RootImpl.java","implementation":"eDynamicSet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, newName);","signature":"void setName(String newName)"}],"old_code":"import org.obeonetwork.dsl.entity.Block;\nimport org.obeonetwork.dsl.environment.impl.NamespaceImpl;\n *
  • {@link org.obeonetwork.dsl.entity.impl.RootImpl#getBlocks Blocks}
    • \npublic class RootImpl extends NamespaceImpl implements Root {\n\t * \n\tpublic EList getBlocks() {\n\t\treturn (EList)eDynamicGet(EntityPackage.ROOT__BLOCKS, EntityPackage.Literals.ROOT__BLOCKS, true, true);\n\t\t\tcase EntityPackage.ROOT__BLOCKS:\n\t\t\t\treturn ((InternalEList)getBlocks()).basicRemove(otherEnd, msgs);\n\t\t\tcase EntityPackage.ROOT__BLOCKS:\n\t\t\t\treturn getBlocks();\n\t\t\tcase EntityPackage.ROOT__BLOCKS:\n\t\t\t\tgetBlocks().clear();\n\t\t\t\tgetBlocks().addAll((Collection)newValue);\n\t\t\tcase EntityPackage.ROOT__BLOCKS:\n\t\t\t\tgetBlocks().clear();\n\t\t\tcase EntityPackage.ROOT__BLOCKS:\n\t\t\t\treturn !getBlocks().isEmpty();","old_methods":[],"patch":"@@ -19,30 +19,40 @@\n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.InternalEObject;\n import org.eclipse.emf.ecore.util.InternalEList;\n-import org.obeonetwork.dsl.entity.Block;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.Root;\n-import org.obeonetwork.dsl.environment.impl.NamespaceImpl;\n+import org.obeonetwork.dsl.environment.Namespace;\n+import org.obeonetwork.dsl.environment.impl.TypesDefinitionImpl;\n \n /**\n * An implementation of the model object 'Root'.\n * \n *

    \n * The following features are implemented:\n *

      \n- *
    • {@link org.obeonetwork.dsl.entity.impl.RootImpl#getBlocks Blocks}
      • \n+ *
    • {@link org.obeonetwork.dsl.entity.impl.RootImpl#getName Name}
      • \n+ *
    • {@link org.obeonetwork.dsl.entity.impl.RootImpl#getNamespaces Namespaces}
      • \n *
    \n *

    \n *\n * @generated\n */\n-public class RootImpl extends NamespaceImpl implements Root {\n+public class RootImpl extends TypesDefinitionImpl implements Root {\n \t/**\n \t * \n \t * \n \t * @generated\n \t */\n \tpublic static final String copyright = \"Copyright (c) 2008-2009 Obeo.\\nAll rights reserved. This program and the accompanying materials\\nare made available under the terms of the Eclipse Public License v1.0\\nwhich accompanies this distribution, and is available at\\nhttp://www.eclipse.org/legal/epl-v10.html\\n\\nContributors:\\n Obeo - initial API and implementation\";\n+\t/**\n+\t * The default value of the '{@link #getName() Name}' attribute.\n+\t * \n+\t * \n+\t * @see #getName()\n+\t * @generated\n+\t * @ordered\n+\t */\n+\tprotected static final String NAME_EDEFAULT = null;\n \t/**\n \t * \n \t * @generated\n@@ -61,12 +71,31 @@ protected EClass eStaticClass() {\n \t}\n \n \t/**\n-\t * \n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\tpublic String getName() {\n+\t\treturn (String)eDynamicGet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, true, true);\n+\t}\n+\n+\t/**\n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\tpublic void setName(String newName) {\n+\t\teDynamicSet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, newName);\n+\t}\n+\n+\t/**\n+\t * \n+\t * \n \t * @generated\n \t */\n \t@SuppressWarnings(\"unchecked\")\n-\tpublic EList getBlocks() {\n-\t\treturn (EList)eDynamicGet(EntityPackage.ROOT__BLOCKS, EntityPackage.Literals.ROOT__BLOCKS, true, true);\n+\tpublic EList getNamespaces() {\n+\t\treturn (EList)eDynamicGet(EntityPackage.ROOT__NAMESPACES, EntityPackage.Literals.ROOT__NAMESPACES, true, true);\n \t}\n \n \t/**\n@@ -77,8 +106,8 @@ public EList getBlocks() {\n \t@Override\n \tpublic NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ROOT__BLOCKS:\n-\t\t\t\treturn ((InternalEList)getBlocks()).basicRemove(otherEnd, msgs);\n+\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n+\t\t\t\treturn ((InternalEList)getNamespaces()).basicRemove(otherEnd, msgs);\n \t\t}\n \t\treturn super.eInverseRemove(otherEnd, featureID, msgs);\n \t}\n@@ -91,8 +120,10 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,\n \t@Override\n \tpublic Object eGet(int featureID, boolean resolve, boolean coreType) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ROOT__BLOCKS:\n-\t\t\t\treturn getBlocks();\n+\t\t\tcase EntityPackage.ROOT__NAME:\n+\t\t\t\treturn getName();\n+\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n+\t\t\t\treturn getNamespaces();\n \t\t}\n \t\treturn super.eGet(featureID, resolve, coreType);\n \t}\n@@ -106,9 +137,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {\n \t@Override\n \tpublic void eSet(int featureID, Object newValue) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ROOT__BLOCKS:\n-\t\t\t\tgetBlocks().clear();\n-\t\t\t\tgetBlocks().addAll((Collection)newValue);\n+\t\t\tcase EntityPackage.ROOT__NAME:\n+\t\t\t\tsetName((String)newValue);\n+\t\t\t\treturn;\n+\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n+\t\t\t\tgetNamespaces().clear();\n+\t\t\t\tgetNamespaces().addAll((Collection)newValue);\n \t\t\t\treturn;\n \t\t}\n \t\tsuper.eSet(featureID, newValue);\n@@ -122,8 +156,11 @@ public void eSet(int featureID, Object newValue) {\n \t@Override\n \tpublic void eUnset(int featureID) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ROOT__BLOCKS:\n-\t\t\t\tgetBlocks().clear();\n+\t\t\tcase EntityPackage.ROOT__NAME:\n+\t\t\t\tsetName(NAME_EDEFAULT);\n+\t\t\t\treturn;\n+\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n+\t\t\t\tgetNamespaces().clear();\n \t\t\t\treturn;\n \t\t}\n \t\tsuper.eUnset(featureID);\n@@ -137,8 +174,10 @@ public void eUnset(int featureID) {\n \t@Override\n \tpublic boolean eIsSet(int featureID) {\n \t\tswitch (featureID) {\n-\t\t\tcase EntityPackage.ROOT__BLOCKS:\n-\t\t\t\treturn !getBlocks().isEmpty();\n+\t\t\tcase EntityPackage.ROOT__NAME:\n+\t\t\t\treturn NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());\n+\t\t\tcase EntityPackage.ROOT__NAMESPACES:\n+\t\t\t\treturn !getNamespaces().isEmpty();\n \t\t}\n \t\treturn super.eIsSet(featureID);\n \t}","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FRootImpl.java","sha":"cbb596c6dd5bc0876d83505b8be3f7f9db4a3b85","status":"modified"},{"additions":7,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntityAdapterFactory.java","changes":85,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntityAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":78,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java","new_code":"import org.obeonetwork.dsl.entity.*;\nimport org.obeonetwork.dsl.environment.TypesDefinition;\n\t\t\tpublic Adapter caseTypesDefinition(TypesDefinition object) {\n\t\t\t\treturn createTypesDefinitionAdapter();\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.TypesDefinition Types Definition}'.\n\t * @see org.obeonetwork.dsl.environment.TypesDefinition\n\tpublic Adapter createTypesDefinitionAdapter() {","new_methods":[{"arguments":["TypesDefinition object"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java","implementation":"return createTypesDefinitionAdapter();\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.TypesDefinition Types Definition","signature":"Adapter caseTypesDefinition(TypesDefinition object)"}],"old_code":"import org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Block;\nimport org.obeonetwork.dsl.entity.Property;\nimport org.obeonetwork.dsl.entity.Reference;\nimport org.obeonetwork.dsl.environment.Namespace;\n\t\t\tpublic Adapter caseBlock(Block object) {\n\t\t\t\treturn createBlockAdapter();\n\t\t\t}\n\t\t\t@Override\n\t\t\tpublic Adapter caseProperty(Property object) {\n\t\t\t\treturn createPropertyAdapter();\n\t\t\t}\n\t\t\t@Override\n\t\t\tpublic Adapter caseAttribute(Attribute object) {\n\t\t\t\treturn createAttributeAdapter();\n\t\t\t}\n\t\t\t@Override\n\t\t\tpublic Adapter caseReference(Reference object) {\n\t\t\t\treturn createReferenceAdapter();\n\t\t\t}\n\t\t\t@Override\n\t\t\tpublic Adapter caseNamespace(Namespace object) {\n\t\t\t\treturn createNamespaceAdapter();\n\t/**\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Block Block}'.\n\t * This default implementation returns null so that\n\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n\t * will catch all the cases anyway. \n\t * @return the new adapter.\n\t * @see org.obeonetwork.dsl.entity.Block\n\t * @generated\n\t */\n\tpublic Adapter createBlockAdapter() {\n\t\treturn null;\n\t}\n\n\t/**\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Property Property}'.\n\t * This default implementation returns null so that\n\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n\t * will catch all the cases anyway. \n\t * @return the new adapter.\n\t * @see org.obeonetwork.dsl.entity.Property\n\t * @generated\n\t */\n\tpublic Adapter createPropertyAdapter() {\n\t\treturn null;\n\t}\n\n\t/**\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Attribute Attribute}'.\n\t * This default implementation returns null so that\n\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n\t * will catch all the cases anyway. \n\t * @return the new adapter.\n\t * @see org.obeonetwork.dsl.entity.Attribute\n\t * @generated\n\t */\n\tpublic Adapter createAttributeAdapter() {\n\t\treturn null;\n\t}\n\n\t/**\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Reference Reference}'.\n\t * This default implementation returns null so that\n\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n\t * will catch all the cases anyway. \n\t * @return the new adapter.\n\t * @see org.obeonetwork.dsl.entity.Reference\n\t * @generated\n\t */\n\tpublic Adapter createReferenceAdapter() {\n\t\treturn null;\n\t}\n\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.Namespace Namespace}'.\n\t * @see org.obeonetwork.dsl.environment.Namespace\n\tpublic Adapter createNamespaceAdapter() {","old_methods":[{"arguments":["Block object"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java","implementation":"return createBlockAdapter();","signature":"Adapter caseBlock(Block object)"},{"arguments":["Property object"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java","implementation":"return createPropertyAdapter();","signature":"Adapter caseProperty(Property object)"},{"arguments":["Attribute object"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java","implementation":"return createAttributeAdapter();","signature":"Adapter caseAttribute(Attribute object)"},{"arguments":["Reference object"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java","implementation":"return createReferenceAdapter();","signature":"Adapter caseReference(Reference object)"},{"arguments":["Namespace object"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java","implementation":"return createNamespaceAdapter();\n\t/**\n\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Block Block","signature":"Adapter caseNamespace(Namespace object)"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java","implementation":"return null;","signature":"Adapter createBlockAdapter()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java","implementation":"return null;","signature":"Adapter createPropertyAdapter()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java","implementation":"return null;","signature":"Adapter createAttributeAdapter()"},{"arguments":[],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java","implementation":"return null;","signature":"Adapter createReferenceAdapter()"}],"patch":"@@ -16,22 +16,19 @@\n import org.eclipse.emf.common.notify.Notifier;\n import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;\n import org.eclipse.emf.ecore.EObject;\n-import org.obeonetwork.dsl.entity.Attribute;\n-import org.obeonetwork.dsl.entity.Block;\n+import org.obeonetwork.dsl.entity.*;\n import org.obeonetwork.dsl.entity.Criterion;\n import org.obeonetwork.dsl.entity.Entity;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.ExternalCriterion;\n import org.obeonetwork.dsl.entity.Finder;\n import org.obeonetwork.dsl.entity.InternalCriterion;\n-import org.obeonetwork.dsl.entity.Property;\n-import org.obeonetwork.dsl.entity.Reference;\n import org.obeonetwork.dsl.entity.Root;\n import org.obeonetwork.dsl.environment.BoundableElement;\n-import org.obeonetwork.dsl.environment.Namespace;\n import org.obeonetwork.dsl.environment.ObeoDSMObject;\n import org.obeonetwork.dsl.environment.StructuredType;\n import org.obeonetwork.dsl.environment.Type;\n+import org.obeonetwork.dsl.environment.TypesDefinition;\n \n /**\n * The Adapter Factory for the model. It\n@@ -98,26 +95,10 @@ public Adapter caseRoot(Root object) {\n \t\t\t\treturn createRootAdapter();\n \t\t\t}\n \t\t\t@Override\n-\t\t\tpublic Adapter caseBlock(Block object) {\n-\t\t\t\treturn createBlockAdapter();\n-\t\t\t}\n-\t\t\t@Override\n \t\t\tpublic Adapter caseEntity(Entity object) {\n \t\t\t\treturn createEntityAdapter();\n \t\t\t}\n \t\t\t@Override\n-\t\t\tpublic Adapter caseProperty(Property object) {\n-\t\t\t\treturn createPropertyAdapter();\n-\t\t\t}\n-\t\t\t@Override\n-\t\t\tpublic Adapter caseAttribute(Attribute object) {\n-\t\t\t\treturn createAttributeAdapter();\n-\t\t\t}\n-\t\t\t@Override\n-\t\t\tpublic Adapter caseReference(Reference object) {\n-\t\t\t\treturn createReferenceAdapter();\n-\t\t\t}\n-\t\t\t@Override\n \t\t\tpublic Adapter caseFinder(Finder object) {\n \t\t\t\treturn createFinderAdapter();\n \t\t\t}\n@@ -138,8 +119,8 @@ public Adapter caseObeoDSMObject(ObeoDSMObject object) {\n \t\t\t\treturn createObeoDSMObjectAdapter();\n \t\t\t}\n \t\t\t@Override\n-\t\t\tpublic Adapter caseNamespace(Namespace object) {\n-\t\t\t\treturn createNamespaceAdapter();\n+\t\t\tpublic Adapter caseTypesDefinition(TypesDefinition object) {\n+\t\t\t\treturn createTypesDefinitionAdapter();\n \t\t\t}\n \t\t\t@Override\n \t\t\tpublic Adapter caseBoundableElement(BoundableElement object) {\n@@ -186,19 +167,6 @@ public Adapter createRootAdapter() {\n \t\treturn null;\n \t}\n \n-\t/**\n-\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Block Block}'.\n-\t * This default implementation returns null so that\n-\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n-\t * will catch all the cases anyway. \n-\t * @return the new adapter.\n-\t * @see org.obeonetwork.dsl.entity.Block\n-\t * @generated\n-\t */\n-\tpublic Adapter createBlockAdapter() {\n-\t\treturn null;\n-\t}\n-\n \t/**\n \t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Entity Entity}'.\n \t * This default implementation returns null so that\n@@ -212,45 +180,6 @@ public Adapter createEntityAdapter() {\n \t\treturn null;\n \t}\n \n-\t/**\n-\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Property Property}'.\n-\t * This default implementation returns null so that\n-\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n-\t * will catch all the cases anyway. \n-\t * @return the new adapter.\n-\t * @see org.obeonetwork.dsl.entity.Property\n-\t * @generated\n-\t */\n-\tpublic Adapter createPropertyAdapter() {\n-\t\treturn null;\n-\t}\n-\n-\t/**\n-\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Attribute Attribute}'.\n-\t * This default implementation returns null so that\n-\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n-\t * will catch all the cases anyway. \n-\t * @return the new adapter.\n-\t * @see org.obeonetwork.dsl.entity.Attribute\n-\t * @generated\n-\t */\n-\tpublic Adapter createAttributeAdapter() {\n-\t\treturn null;\n-\t}\n-\n-\t/**\n-\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Reference Reference}'.\n-\t * This default implementation returns null so that\n-\t * we can easily ignore cases; it's useful to ignore a case when inheritance\n-\t * will catch all the cases anyway. \n-\t * @return the new adapter.\n-\t * @see org.obeonetwork.dsl.entity.Reference\n-\t * @generated\n-\t */\n-\tpublic Adapter createReferenceAdapter() {\n-\t\treturn null;\n-\t}\n-\n \t/**\n \t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Finder Finder}'.\n \t * This default implementation returns null so that\n@@ -317,16 +246,16 @@ public Adapter createObeoDSMObjectAdapter() {\n \t}\n \n \t/**\n-\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.Namespace Namespace}'.\n+\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.TypesDefinition Types Definition}'.\n \t * \n \t * This default implementation returns null so that we can easily ignore cases;\n \t * it's useful to ignore a case when inheritance will catch all the cases anyway.\n \t * \n \t * @return the new adapter.\n-\t * @see org.obeonetwork.dsl.environment.Namespace\n+\t * @see org.obeonetwork.dsl.environment.TypesDefinition\n \t * @generated\n \t */\n-\tpublic Adapter createNamespaceAdapter() {\n+\tpublic Adapter createTypesDefinitionAdapter() {\n \t\treturn null;\n \t}\n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntityAdapterFactory.java","sha":"ac05074845bf6ca61ece6632e41fed8c61dc46f0","status":"modified"},{"additions":6,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntitySwitch.java","changes":100,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntitySwitch.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":94,"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java","new_code":"import org.obeonetwork.dsl.entity.*;\nimport org.obeonetwork.dsl.environment.TypesDefinition;\n\t\t\t\tif (result == null) result = caseTypesDefinition(root);\n\t * Returns the result of interpreting the object as an instance of 'Types Definition'.\n\t * @return the result of interpreting the object as an instance of 'Types Definition'.\n\tpublic T caseTypesDefinition(TypesDefinition object) {","new_methods":[],"old_code":"import org.obeonetwork.dsl.entity.Attribute;\nimport org.obeonetwork.dsl.entity.Block;\nimport org.obeonetwork.dsl.entity.Property;\nimport org.obeonetwork.dsl.entity.Reference;\nimport org.obeonetwork.dsl.environment.Namespace;\n\t\t\t\tif (result == null) result = caseNamespace(root);\n\t\t\tcase EntityPackage.BLOCK: {\n\t\t\t\tBlock block = (Block)theEObject;\n\t\t\t\tT result = caseBlock(block);\n\t\t\t\tif (result == null) result = caseObeoDSMObject(block);\n\t\t\t\tif (result == null) result = defaultCase(theEObject);\n\t\t\t\treturn result;\n\t\t\t}\n\t\t\tcase EntityPackage.PROPERTY: {\n\t\t\t\tProperty property = (Property)theEObject;\n\t\t\t\tT result = caseProperty(property);\n\t\t\t\tif (result == null) result = caseObeoDSMObject(property);\n\t\t\t\tif (result == null) result = caseBoundableElement(property);\n\t\t\t\tif (result == null) result = defaultCase(theEObject);\n\t\t\t\treturn result;\n\t\t\t}\n\t\t\tcase EntityPackage.ATTRIBUTE: {\n\t\t\t\tAttribute attribute = (Attribute)theEObject;\n\t\t\t\tT result = caseAttribute(attribute);\n\t\t\t\tif (result == null) result = caseProperty(attribute);\n\t\t\t\tif (result == null) result = caseObeoDSMObject(attribute);\n\t\t\t\tif (result == null) result = caseBoundableElement(attribute);\n\t\t\t\tif (result == null) result = defaultCase(theEObject);\n\t\t\t\treturn result;\n\t\t\t}\n\t\t\tcase EntityPackage.REFERENCE: {\n\t\t\t\tReference reference = (Reference)theEObject;\n\t\t\t\tT result = caseReference(reference);\n\t\t\t\tif (result == null) result = caseProperty(reference);\n\t\t\t\tif (result == null) result = caseObeoDSMObject(reference);\n\t\t\t\tif (result == null) result = caseBoundableElement(reference);\n\t\t\t\tif (result == null) result = defaultCase(theEObject);\n\t\t\t\treturn result;\n\t\t\t}\n\t/**\n\t * Returns the result of interpreting the object as an instance of 'Block'.\n\t * This implementation returns null; returning a\n\t * non-null result will terminate the switch. \n\t * @param object the target of the switch.\n\t * @return the result of interpreting the object as an instance of 'Block'.\n\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n\t * @generated\n\t */\n\tpublic T caseBlock(Block object) {\n\t\treturn null;\n\t}\n\n\t/**\n\t * Returns the result of interpreting the object as an instance of 'Property'.\n\t * This implementation returns null; returning a\n\t * non-null result will terminate the switch. \n\t * @param object the target of the switch.\n\t * @return the result of interpreting the object as an instance of 'Property'.\n\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n\t * @generated\n\t */\n\tpublic T caseProperty(Property object) {\n\t\treturn null;\n\t}\n\n\t/**\n\t * Returns the result of interpreting the object as an instance of 'Attribute'.\n\t * This implementation returns null; returning a\n\t * non-null result will terminate the switch. \n\t * @param object the target of the switch.\n\t * @return the result of interpreting the object as an instance of 'Attribute'.\n\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n\t * @generated\n\t */\n\tpublic T caseAttribute(Attribute object) {\n\t\treturn null;\n\t}\n\n\t/**\n\t * Returns the result of interpreting the object as an instance of 'Reference'.\n\t * This implementation returns null; returning a\n\t * non-null result will terminate the switch. \n\t * @param object the target of the switch.\n\t * @return the result of interpreting the object as an instance of 'Reference'.\n\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n\t * @generated\n\t */\n\tpublic T caseReference(Reference object) {\n\t\treturn null;\n\t}\n\n\t * Returns the result of interpreting the object as an instance of 'Namespace'.\n\t * @return the result of interpreting the object as an instance of 'Namespace'.\n\tpublic T caseNamespace(Namespace object) {","old_methods":[{"arguments":["Block object"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java","implementation":"return null;","signature":"T caseBlock(Block object)"},{"arguments":["Property object"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java","implementation":"return null;","signature":"T caseProperty(Property object)"},{"arguments":["Attribute object"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java","implementation":"return null;","signature":"T caseAttribute(Attribute object)"},{"arguments":["Reference object"],"filename":"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java","implementation":"return null;","signature":"T caseReference(Reference object)"}],"patch":"@@ -16,22 +16,19 @@\n \n import org.eclipse.emf.ecore.EClass;\n import org.eclipse.emf.ecore.EObject;\n-import org.obeonetwork.dsl.entity.Attribute;\n-import org.obeonetwork.dsl.entity.Block;\n+import org.obeonetwork.dsl.entity.*;\n import org.obeonetwork.dsl.entity.Criterion;\n import org.obeonetwork.dsl.entity.Entity;\n import org.obeonetwork.dsl.entity.EntityPackage;\n import org.obeonetwork.dsl.entity.ExternalCriterion;\n import org.obeonetwork.dsl.entity.Finder;\n import org.obeonetwork.dsl.entity.InternalCriterion;\n-import org.obeonetwork.dsl.entity.Property;\n-import org.obeonetwork.dsl.entity.Reference;\n import org.obeonetwork.dsl.entity.Root;\n import org.obeonetwork.dsl.environment.BoundableElement;\n-import org.obeonetwork.dsl.environment.Namespace;\n import org.obeonetwork.dsl.environment.ObeoDSMObject;\n import org.obeonetwork.dsl.environment.StructuredType;\n import org.obeonetwork.dsl.environment.Type;\n+import org.obeonetwork.dsl.environment.TypesDefinition;\n \n /**\n * The Switch for the model's inheritance\n@@ -112,18 +109,11 @@ protected T doSwitch(int classifierID, EObject theEObject) {\n \t\t\tcase EntityPackage.ROOT: {\n \t\t\t\tRoot root = (Root)theEObject;\n \t\t\t\tT result = caseRoot(root);\n-\t\t\t\tif (result == null) result = caseNamespace(root);\n+\t\t\t\tif (result == null) result = caseTypesDefinition(root);\n \t\t\t\tif (result == null) result = caseObeoDSMObject(root);\n \t\t\t\tif (result == null) result = defaultCase(theEObject);\n \t\t\t\treturn result;\n \t\t\t}\n-\t\t\tcase EntityPackage.BLOCK: {\n-\t\t\t\tBlock block = (Block)theEObject;\n-\t\t\t\tT result = caseBlock(block);\n-\t\t\t\tif (result == null) result = caseObeoDSMObject(block);\n-\t\t\t\tif (result == null) result = defaultCase(theEObject);\n-\t\t\t\treturn result;\n-\t\t\t}\n \t\t\tcase EntityPackage.ENTITY: {\n \t\t\t\tEntity entity = (Entity)theEObject;\n \t\t\t\tT result = caseEntity(entity);\n@@ -134,32 +124,6 @@ protected T doSwitch(int classifierID, EObject theEObject) {\n \t\t\t\tif (result == null) result = defaultCase(theEObject);\n \t\t\t\treturn result;\n \t\t\t}\n-\t\t\tcase EntityPackage.PROPERTY: {\n-\t\t\t\tProperty property = (Property)theEObject;\n-\t\t\t\tT result = caseProperty(property);\n-\t\t\t\tif (result == null) result = caseObeoDSMObject(property);\n-\t\t\t\tif (result == null) result = caseBoundableElement(property);\n-\t\t\t\tif (result == null) result = defaultCase(theEObject);\n-\t\t\t\treturn result;\n-\t\t\t}\n-\t\t\tcase EntityPackage.ATTRIBUTE: {\n-\t\t\t\tAttribute attribute = (Attribute)theEObject;\n-\t\t\t\tT result = caseAttribute(attribute);\n-\t\t\t\tif (result == null) result = caseProperty(attribute);\n-\t\t\t\tif (result == null) result = caseObeoDSMObject(attribute);\n-\t\t\t\tif (result == null) result = caseBoundableElement(attribute);\n-\t\t\t\tif (result == null) result = defaultCase(theEObject);\n-\t\t\t\treturn result;\n-\t\t\t}\n-\t\t\tcase EntityPackage.REFERENCE: {\n-\t\t\t\tReference reference = (Reference)theEObject;\n-\t\t\t\tT result = caseReference(reference);\n-\t\t\t\tif (result == null) result = caseProperty(reference);\n-\t\t\t\tif (result == null) result = caseObeoDSMObject(reference);\n-\t\t\t\tif (result == null) result = caseBoundableElement(reference);\n-\t\t\t\tif (result == null) result = defaultCase(theEObject);\n-\t\t\t\treturn result;\n-\t\t\t}\n \t\t\tcase EntityPackage.FINDER: {\n \t\t\t\tFinder finder = (Finder)theEObject;\n \t\t\t\tT result = caseFinder(finder);\n@@ -207,19 +171,6 @@ public T caseRoot(Root object) {\n \t\treturn null;\n \t}\n \n-\t/**\n-\t * Returns the result of interpreting the object as an instance of 'Block'.\n-\t * This implementation returns null; returning a\n-\t * non-null result will terminate the switch. \n-\t * @param object the target of the switch.\n-\t * @return the result of interpreting the object as an instance of 'Block'.\n-\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n-\t * @generated\n-\t */\n-\tpublic T caseBlock(Block object) {\n-\t\treturn null;\n-\t}\n-\n \t/**\n \t * Returns the result of interpreting the object as an instance of 'Entity'.\n \t * This implementation returns null; returning a\n@@ -233,45 +184,6 @@ public T caseEntity(Entity object) {\n \t\treturn null;\n \t}\n \n-\t/**\n-\t * Returns the result of interpreting the object as an instance of 'Property'.\n-\t * This implementation returns null; returning a\n-\t * non-null result will terminate the switch. \n-\t * @param object the target of the switch.\n-\t * @return the result of interpreting the object as an instance of 'Property'.\n-\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n-\t * @generated\n-\t */\n-\tpublic T caseProperty(Property object) {\n-\t\treturn null;\n-\t}\n-\n-\t/**\n-\t * Returns the result of interpreting the object as an instance of 'Attribute'.\n-\t * This implementation returns null; returning a\n-\t * non-null result will terminate the switch. \n-\t * @param object the target of the switch.\n-\t * @return the result of interpreting the object as an instance of 'Attribute'.\n-\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n-\t * @generated\n-\t */\n-\tpublic T caseAttribute(Attribute object) {\n-\t\treturn null;\n-\t}\n-\n-\t/**\n-\t * Returns the result of interpreting the object as an instance of 'Reference'.\n-\t * This implementation returns null; returning a\n-\t * non-null result will terminate the switch. \n-\t * @param object the target of the switch.\n-\t * @return the result of interpreting the object as an instance of 'Reference'.\n-\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n-\t * @generated\n-\t */\n-\tpublic T caseReference(Reference object) {\n-\t\treturn null;\n-\t}\n-\n \t/**\n \t * Returns the result of interpreting the object as an instance of 'Finder'.\n \t * This implementation returns null; returning a\n@@ -338,17 +250,17 @@ public T caseObeoDSMObject(ObeoDSMObject object) {\n \t}\n \n \t/**\n-\t * Returns the result of interpreting the object as an instance of 'Namespace'.\n+\t * Returns the result of interpreting the object as an instance of 'Types Definition'.\n \t * \n \t * This implementation returns null;\n \t * returning a non-null result will terminate the switch.\n \t * \n \t * @param object the target of the switch.\n-\t * @return the result of interpreting the object as an instance of 'Namespace'.\n+\t * @return the result of interpreting the object as an instance of 'Types Definition'.\n \t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n \t * @generated\n \t */\n-\tpublic T caseNamespace(Namespace object) {\n+\tpublic T caseTypesDefinition(TypesDefinition object) {\n \t\treturn null;\n \t}\n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntitySwitch.java","sha":"0cf7a11337417ea5adc5bd6fbf14004c9fb76e4a","status":"modified"},{"additions":1,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2FMETA-INF%2FMANIFEST.MF","changes":2,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":1,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/META-INF/MANIFEST.MF","new_code":"Bundle-SymbolicName: org.obeonetwork.dsl.environment.edit;singleton:=true","new_methods":[],"old_code":"Bundle-SymbolicName: org.obeonetwork.dsl.environment.edit; singleton:=true","old_methods":[],"patch":"@@ -1,7 +1,7 @@\n Manifest-Version: 1.0\n Bundle-ManifestVersion: 2\n Bundle-Name: %pluginName\n-Bundle-SymbolicName: org.obeonetwork.dsl.environment.edit; singleton:=true\n+Bundle-SymbolicName: org.obeonetwork.dsl.environment.edit;singleton:=true\n Bundle-Version: 2.4.0.qualifier\n Bundle-ClassPath: .\n Bundle-Activator: org.obeonetwork.dsl.environment.provider.EnvironmentEditPlugin$Implementation","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2FMETA-INF%2FMANIFEST.MF","sha":"694a9532100ddfb15b88a1cc5f89f6598a66a953","status":"modified"},{"additions":48,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fmodel%2Fenvironment.components","changes":51,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fmodel%2Fenvironment.components?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":3,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/model/environment.components","new_code":" \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n ","new_methods":[],"old_code":" \n \n ","old_methods":[],"patch":"@@ -132,6 +132,9 @@\n \n \n \n+ \n+ \n+ \n \n \n \n@@ -142,8 +145,8 @@\n \n \n \n- \n- \n+ \n+ \n \n \n \n@@ -157,6 +160,9 @@\n \n \n \n+ \n+ \n+ \n \n \n \n@@ -202,6 +208,22 @@\n \n \n \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n \n \n \n@@ -339,6 +361,9 @@\n \n \n \n+ \n+ \n+ \n \n \n \n@@ -350,7 +375,7 @@\n \n \n \n- \n+ \n \n \n \n@@ -365,6 +390,9 @@\n \n \n \n+ \n+ \n+ \n \n \n \n@@ -420,6 +448,23 @@\n \n \n \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n \n \n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fmodel%2Fenvironment.components","sha":"595e8f47e4ad473d574db6b52ed63452855710fe","status":"modified"},{"additions":60,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fplugin.properties","changes":145,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fplugin.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":85,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/plugin.properties","new_code":"# Copyright (c) 2008-2009 Obeo.\n# All rights reserved. This program and the accompanying materials\n# are made available under the terms of the Eclipse Public License v1.0\n# which accompanies this distribution, and is available at\n# http://www.eclipse.org/legal/epl-v10.html\n# \n# Contributors:\n# Obeo - initial API and implementation\nproviderName = www.example.org\n_UI_PriorityDefinition_type = Priority Definition\n_UI_Priority_type = Priority\n_UI_MetaData_type = Meta Data\n_UI_TypesDefinition_type = Types Definition\n_UI_Behaviour_type = Behaviour\n_UI_StructuredType_type = Structured Type\n_UI_DTO_type = DTO\n_UI_FilterContainer_type = Filter Container\n_UI_Filter_type = Filter\n_UI_Namespace_type = Namespace\n_UI_Attribute_type = Attribute\n_UI_Reference_type = Reference\n_UI_Property_type = Property\n_UI_BindingInfo_type = Binding Info\n_UI_BindingReference_type = Binding Reference\n_UI_BindingElement_type = Binding Element\n_UI_BindingRegistry_type = Binding Registry\n_UI_BoundableElement_type = Boundable Element\n_UI_Environment_priorityDefinitions_feature = Priority Definitions\n_UI_Environment_typesDefinition_feature = Types Definition\n_UI_Environment_namespaces_feature = Namespaces\n_UI_Type_typeDefinition_feature = Type Definition\n_UI_ObeoDSMObject_description_feature = Description\n_UI_ObeoDSMObject_keywords_feature = Keywords\n_UI_ObeoDSMObject_behaviours_feature = Behaviours\n_UI_ObeoDSMObject_bindingRegistries_feature = Binding Registries\n_UI_ObeoDSMObject_version_feature = Version\n_UI_ObeoDSMObject_createdOn_feature = Created On\n_UI_ObeoDSMObject_modifiedOn_feature = Modified On\n_UI_MetaDataContainer_metadatas_feature = Metadatas\n_UI_StructuredType_supertype_feature = Supertype\n_UI_StructuredType_associatedTypes_feature = Associated Types\n_UI_StructuredType_ownedAttributes_feature = Owned Attributes\n_UI_StructuredType_attributes_feature = Attributes\n_UI_StructuredType_ownedReferences_feature = Owned References\n_UI_StructuredType_references_feature = References\n_UI_StructuredType_properties_feature = Properties\n_UI_Attribute_containingType_feature = Containing Type\n_UI_Reference_containingType_feature = Containing Type\n_UI_Reference_referencedType_feature = Referenced Type\n_UI_Property_isIdentifier_feature = Is Identifier\n_UI_BindingInfo_references_feature = References\n_UI_BindingElement_boundElement_feature = Bound Element\n_UI_BindingElement_bindingExpression_feature = Binding Expression\n_UI_BindingRegistry_bindingInfos_feature = Binding Infos\n_UI_Unknown_feature = Unspecified\n\n_UI_MultiplicityKind_ZERO_ONE_literal = 0..1\n_UI_MultiplicityKind_ONE_literal = 1\n_UI_MultiplicityKind_ZERO_STAR_literal = 0..*\n_UI_MultiplicityKind_ONE_STAR_literal = 1..*","new_methods":[],"old_code":"# \n# \n#\n# $Id$\n\n# ====================================================================\n# To code developer:\n# Do NOT change the properties between this line and the\n# \"%%% END OF TRANSLATED PROPERTIES %%%\" line.\n# Make a new property name, append to the end of the file and change\n# the code to use the new property.\n# ====================================================================\n\n# ====================================================================\n# %%% END OF TRANSLATED PROPERTIES %%%\n# ====================================================================\nproviderName = Obeo.fr\n_UI_Environment_types_feature = Types\n_UI_MetaDataContainer_annotations_feature = Annotations\n_UI_Unknown_feature = Unspecified\n\n_UI_PriorityDefinition_type = Priority Definition\n_UI_PriorityKind_type = Priority Kind\n_UI_Environment_priorityDefinitions_feature = Priority Definitions\n_UI_PriorityKind_name_feature = Name\n_UI_MetaData_type = Meta Data\n_UI_ObeoDSMObject_metadataContainer_feature = Metadata Container\n_UI_MetaDataContainer_metadatas_feature = Metadatas\n_UI_Priority_type = Priority\n_UI_TypesDefinition_type = Types Definition\n_UI_Environment_typesDefinition_feature = Types Definition\n_UI_Type_typeDefinition_feature = Type Definition\n_UI_TypesDefinition_name_feature = Name\n_UI_Behaviour_type = Behaviour\n_UI_Environment_behaviours_feature = Behaviours\n_UI_StructuredType_type = Structured Type\n_UI_DTO_type = DTO\n_UI_FilterContainer_type = Filter Container\n_UI_Filter_type = Filter\n_UI_MultiplicityKind_ZERO_ONE_literal = 0..1\n_UI_MultiplicityKind_ONE_literal = 1\n_UI_MultiplicityKind_ZERO_STAR_literal = 0..*\n_UI_MultiplicityKind_ONE_STAR_literal = 1..*\n_UI_DTO_references_feature = References\n_UI_Container_type = Container\n_UI_Namespace_type = Namespace\n_UI_ObeoDSMObject_description_feature = Description\n_UI_ObeoDSMObject_keywords_feature = Keywords\n_UI_Attribute_type = Attribute\n_UI_Reference_type = Reference\n_UI_Property_type = Property\n_UI_DTO_properties_feature = Properties\n_UI_DTO_ownedReferences_feature = Owned References\n_UI_DTO_attributes_feature = Attributes\n_UI_DTO_ownedAttributes_feature = Owned Attributes\n_UI_Attribute_dto_feature = Dto\n_UI_Reference_type_feature = Type\n_UI_Reference_dto_feature = Dto\n_UI_DTO_supertype_feature = Supertype\n_UI_DTO_associatedTypes_feature = Associated Types\n_UI_ObeoDSMObject_behaviours_feature = Behaviours\n_UI_Binding_type = Binding\n_UI_BindingCluster_type = Binding Cluster\n_UI_BindingElement_type = Binding Element\n_UI_ObeoDSMObject_bindings_feature = Bindings\n_UI_Binding_clusters_feature = Clusters\n_UI_Binding_left_feature = Left\n_UI_Binding_right_feature = Right\n_UI_BindingCluster_left_feature = Left\n_UI_BindingCluster_right_feature = Right\n_UI_BindingElement_boundElement_feature = Bound Element\n_UI_BindingElement_bindingExpression_feature = Binding Expression\n_UI_BindingInfo_type = Binding Info\n_UI_BindingInfo_clusters_feature = Clusters\n_UI_ObeoDSMObject_bindingInfos_feature = Binding Infos\n_UI_BindingRegistry_type = Binding Registry\n_UI_ObeoDSMObject_bindingRegistries_feature = Binding Registries\n_UI_BindingRegistry_bindingInfos_feature = Binding Infos\n_UI_BindingElement_internalPath_feature = Internal Path\n_UI_BindingReference_type = Binding Reference\n_UI_BindingInfo_references_feature = References\n_UI_BoundableElement_type = Boundable Element\n_UI_ObeoDSMObject_version_feature = Version\n_UI_ObeoDSMObject_createdOn_feature = Created On\n_UI_ObeoDSMObject_modifiedOn_feature = Modified On","old_methods":[],"patch":"@@ -1,22 +1,14 @@\n-# \n-# \n-#\n-# $Id$\n-\n-# ====================================================================\n-# To code developer:\n-# Do NOT change the properties between this line and the\n-# \"%%% END OF TRANSLATED PROPERTIES %%%\" line.\n-# Make a new property name, append to the end of the file and change\n-# the code to use the new property.\n-# ====================================================================\n-\n-# ====================================================================\n-# %%% END OF TRANSLATED PROPERTIES %%%\n-# ====================================================================\n+# Copyright (c) 2008-2009 Obeo.\n+# All rights reserved. This program and the accompanying materials\n+# are made available under the terms of the Eclipse Public License v1.0\n+# which accompanies this distribution, and is available at\n+# http://www.eclipse.org/legal/epl-v10.html\n+# \n+# Contributors:\n+# Obeo - initial API and implementation\n \n pluginName = Environment Edit Support\n-providerName = Obeo.fr\n+providerName = www.example.org\n \n _UI_CreateChild_text = {0}\n _UI_CreateChild_text2 = {1} {0}\n@@ -37,112 +29,95 @@ _UI_InterDSMLink_type = Inter DSM Link\n _UI_ObeoDSMObject_type = Obeo DSM Object\n _UI_MetaDataContainer_type = Meta Data Container\n _UI_Annotation_type = Annotation\n+_UI_PriorityDefinition_type = Priority Definition\n+_UI_Priority_type = Priority\n+_UI_MetaData_type = Meta Data\n+_UI_TypesDefinition_type = Types Definition\n+_UI_Behaviour_type = Behaviour\n+_UI_StructuredType_type = Structured Type\n+_UI_DTO_type = DTO\n+_UI_FilterContainer_type = Filter Container\n+_UI_Filter_type = Filter\n+_UI_Namespace_type = Namespace\n+_UI_Attribute_type = Attribute\n+_UI_Reference_type = Reference\n+_UI_Property_type = Property\n+_UI_BindingInfo_type = Binding Info\n+_UI_BindingReference_type = Binding Reference\n+_UI_BindingElement_type = Binding Element\n+_UI_BindingRegistry_type = Binding Registry\n+_UI_BoundableElement_type = Boundable Element\n _UI_Unknown_type = Object\n \n _UI_Unknown_datatype= Value\n \n _UI_Environment_name_feature = Name\n-_UI_Environment_types_feature = Types\n _UI_Environment_actions_feature = Actions\n _UI_Environment_links_feature = Links\n+_UI_Environment_priorityDefinitions_feature = Priority Definitions\n+_UI_Environment_typesDefinition_feature = Types Definition\n+_UI_Environment_namespaces_feature = Namespaces\n _UI_Type_name_feature = Name\n+_UI_Type_typeDefinition_feature = Type Definition\n _UI_Enumeration_fields_feature = Fields\n _UI_Field_name_feature = Name\n _UI_Action_name_feature = Name\n _UI_InterDSMLink_name_feature = Name\n _UI_InterDSMLink_target_feature = Target\n _UI_ObeoDSMObject_metadatas_feature = Metadatas\n-_UI_MetaDataContainer_annotations_feature = Annotations\n+_UI_ObeoDSMObject_description_feature = Description\n+_UI_ObeoDSMObject_keywords_feature = Keywords\n+_UI_ObeoDSMObject_behaviours_feature = Behaviours\n+_UI_ObeoDSMObject_bindingRegistries_feature = Binding Registries\n+_UI_ObeoDSMObject_version_feature = Version\n+_UI_ObeoDSMObject_createdOn_feature = Created On\n+_UI_ObeoDSMObject_modifiedOn_feature = Modified On\n+_UI_MetaDataContainer_metadatas_feature = Metadatas\n _UI_Annotation_title_feature = Title\n _UI_Annotation_body_feature = Body\n-_UI_Unknown_feature = Unspecified\n-\n-_UI_PriorityDefinition_type = Priority Definition\n-_UI_PriorityKind_type = Priority Kind\n-_UI_Environment_priorityDefinitions_feature = Priority Definitions\n _UI_PriorityDefinition_priorities_feature = Priorities\n-_UI_PriorityKind_name_feature = Name\n-_UI_MetaData_type = Meta Data\n-_UI_ObeoDSMObject_metadataContainer_feature = Metadata Container\n-_UI_MetaDataContainer_metadatas_feature = Metadatas\n-_UI_Priority_type = Priority\n-_UI_TypesDefinition_type = Types Definition\n-_UI_Environment_typesDefinition_feature = Types Definition\n _UI_Priority_name_feature = Name\n _UI_TypesDefinition_types_feature = Types\n-_UI_Type_typeDefinition_feature = Type Definition\n-_UI_TypesDefinition_name_feature = Name\n-_UI_Behaviour_type = Behaviour\n-_UI_Environment_behaviours_feature = Behaviours\n-_UI_StructuredType_type = Structured Type\n-_UI_DTO_type = DTO\n-_UI_FilterContainer_type = Filter Container\n-_UI_Filter_type = Filter\n+_UI_StructuredType_supertype_feature = Supertype\n+_UI_StructuredType_associatedTypes_feature = Associated Types\n+_UI_StructuredType_ownedAttributes_feature = Owned Attributes\n+_UI_StructuredType_attributes_feature = Attributes\n+_UI_StructuredType_ownedReferences_feature = Owned References\n+_UI_StructuredType_references_feature = References\n+_UI_StructuredType_properties_feature = Properties\n _UI_DTO_ownedContainer_feature = Owned Container\n _UI_FilterContainer_ownedFilters_feature = Owned Filters\n-_UI_MultiplicityKind_ZERO_ONE_literal = 0..1\n-_UI_MultiplicityKind_ONE_literal = 1\n-_UI_MultiplicityKind_ZERO_STAR_literal = 0..*\n-_UI_MultiplicityKind_ONE_STAR_literal = 1..*\n-_UI_DTO_references_feature = References\n-_UI_Container_type = Container\n-_UI_Namespace_type = Namespace\n _UI_Namespace_ownedNamespaces_feature = Owned Namespaces\n _UI_Namespace_owner_feature = Owner\n _UI_Namespace_name_feature = Name\n-_UI_ObeoDSMObject_description_feature = Description\n-_UI_ObeoDSMObject_keywords_feature = Keywords\n-_UI_Attribute_type = Attribute\n-_UI_Reference_type = Reference\n-_UI_Property_type = Property\n-_UI_DTO_properties_feature = Properties\n-_UI_DTO_ownedReferences_feature = Owned References\n-_UI_DTO_attributes_feature = Attributes\n-_UI_DTO_ownedAttributes_feature = Owned Attributes\n _UI_Attribute_type_feature = Type\n-_UI_Attribute_dto_feature = Dto\n+_UI_Attribute_containingType_feature = Containing Type\n _UI_Reference_isComposite_feature = Is Composite\n _UI_Reference_navigable_feature = Navigable\n _UI_Reference_oppositeOf_feature = Opposite Of\n-_UI_Reference_type_feature = Type\n-_UI_Reference_dto_feature = Dto\n+_UI_Reference_containingType_feature = Containing Type\n+_UI_Reference_referencedType_feature = Referenced Type\n _UI_Property_name_feature = Name\n _UI_Property_multiplicity_feature = Multiplicity\n-_UI_DTO_supertype_feature = Supertype\n-_UI_DTO_associatedTypes_feature = Associated Types\n-_UI_ObeoDSMObject_behaviours_feature = Behaviours\n-_UI_Binding_type = Binding\n-_UI_BindingCluster_type = Binding Cluster\n-_UI_BindingElement_type = Binding Element\n-_UI_ObeoDSMObject_bindings_feature = Bindings\n-_UI_Binding_clusters_feature = Clusters\n-_UI_Binding_left_feature = Left\n-_UI_Binding_right_feature = Right\n-_UI_BindingCluster_left_feature = Left\n-_UI_BindingCluster_right_feature = Right\n-_UI_BindingElement_boundElement_feature = Bound Element\n-_UI_BindingElement_bindingExpression_feature = Binding Expression\n-_UI_BindingInfo_type = Binding Info\n-_UI_BindingInfo_clusters_feature = Clusters\n+_UI_Property_isIdentifier_feature = Is Identifier\n+_UI_BindingInfo_references_feature = References\n _UI_BindingInfo_left_feature = Left\n _UI_BindingInfo_right_feature = Right\n-_UI_ObeoDSMObject_bindingInfos_feature = Binding Infos\n-_UI_BindingRegistry_type = Binding Registry\n-_UI_ObeoDSMObject_bindingRegistries_feature = Binding Registries\n _UI_BindingInfo_subBindingInfos_feature = Sub Binding Infos\n-_UI_BindingRegistry_bindingInfos_feature = Binding Infos\n _UI_BindingInfo_targets_feature = Targets\n-_UI_BindingElement_internalPath_feature = Internal Path\n-_UI_BindingReference_type = Binding Reference\n-_UI_BindingInfo_references_feature = References\n _UI_BindingInfo_elements_feature = Elements\n _UI_BindingReference_left_feature = Left\n _UI_BindingReference_right_feature = Right\n+_UI_BindingElement_boundElement_feature = Bound Element\n+_UI_BindingElement_bindingExpression_feature = Binding Expression\n _UI_BindingElement_referencedByAsLeft_feature = Referenced By As Left\n _UI_BindingElement_referencedByAsRight_feature = Referenced By As Right\n _UI_BindingElement_referencedBy_feature = Referenced By\n-_UI_BoundableElement_type = Boundable Element\n _UI_BindingElement_pathReferences_feature = Path References\n-_UI_ObeoDSMObject_version_feature = Version\n-_UI_ObeoDSMObject_createdOn_feature = Created On\n-_UI_ObeoDSMObject_modifiedOn_feature = Modified On\n+_UI_BindingRegistry_bindingInfos_feature = Binding Infos\n+_UI_Unknown_feature = Unspecified\n+\n+_UI_MultiplicityKind_ZERO_ONE_literal = 0..1\n+_UI_MultiplicityKind_ONE_literal = 1\n+_UI_MultiplicityKind_ZERO_STAR_literal = 0..*\n+_UI_MultiplicityKind_ONE_STAR_literal = 1..*","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fplugin.properties","sha":"eab5e4eef17685c805787420281e8966ceb09a8d","status":"modified"},{"additions":7,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Fenvironment_properties.plugin.xml","changes":8,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Fenvironment_properties.plugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":1,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/environment_properties.plugin.xml","new_code":" uri=\"http://www.obeonetwork.org/dsl/environment/3.0.0\"\n \n \n","new_methods":[],"old_code":" uri=\"http://www.obeonetwork.org/dsl/environment/2.0.0\"","old_methods":[],"patch":"@@ -6,7 +6,7 @@\n \n \n \n \n@@ -140,6 +140,12 @@\n category=\"default\">\n \n \n+ \n+ \n+\n \n \n providers = new ArrayList(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new DTOPropertiesEditionProvider(providers);\n\t}","new_methods":[{"arguments":[],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/EnvironmentEEFAdapterFactory.java","implementation":"List providers = new ArrayList(1);\n\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n\t\treturn new DTOPropertiesEditionProvider(providers);","signature":"Adapter createDTOAdapter()"}],"old_code":"","old_methods":[],"patch":"@@ -114,6 +114,16 @@ public Adapter createTypesDefinitionAdapter() {\n \t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n \t\treturn new TypesDefinitionPropertiesEditionProvider(providers);\n \t}\n+\t/**\n+\t * {@inheritDoc}\n+\t * @see org.obeonetwork.dsl.environment.util.EnvironmentAdapterFactory#createDTOAdapter()\n+\t * \n+\t */\n+\tpublic Adapter createDTOAdapter() {\n+\t\tList providers = new ArrayList(1);\n+\t\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\n+\t\treturn new DTOPropertiesEditionProvider(providers);\n+\t}\n \t/**\n \t * {@inheritDoc}\n \t * @see org.obeonetwork.dsl.environment.util.EnvironmentAdapterFactory#createFilterContainerAdapter()","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentEEFAdapterFactory.java","sha":"a64e1e1ebdbb344c4d30bba12e22b2d4dacc3b5e","status":"modified"},{"additions":28,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentMessages.java","changes":29,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentMessages.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":1,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/EnvironmentMessages.java","new_code":"\t\n\tpublic static String DTOPropertiesEditionPart_PropertiesGroupLabel;\n\n\t\n\tpublic static String DTO_ReadOnly;\n\n\t\n\tpublic static String DTO_Part_Title;\n\n\tpublic static String AttributePropertiesEditionPart_IdentifierLabel;\n\n\t\n\tpublic static String ReferencePropertiesEditionPart_ReferencedTypeLabel;\n\tpublic static String ReferencePropertiesEditionPart_IdentifierLabel;\n\n\t\n\t\n\tpublic static String DTOPropertiesEditionPart_NameLabel;\n\n\t\n\tpublic static String DTOPropertiesEditionPart_SupertypeLabel;\n\n\t\n\tpublic static String DTOPropertiesEditionPart_AssociatedTypesLabel;\n\n\t\n\tpublic static String DTOPropertiesEditionPart_DescriptionLabel;\n","new_methods":[],"old_code":"\tpublic static String ReferencePropertiesEditionPart_TypeLabel;","old_methods":[],"patch":"@@ -64,6 +64,9 @@ public class EnvironmentMessages extends NLS {\n \t\n \tpublic static String BindingElementPropertiesEditionPart_PropertiesGroupLabel;\n \n+\t\n+\tpublic static String DTOPropertiesEditionPart_PropertiesGroupLabel;\n+\n \n \t\n \tpublic static String Environment_ReadOnly;\n@@ -167,6 +170,12 @@ public class EnvironmentMessages extends NLS {\n \t\n \tpublic static String BindingElement_Part_Title;\n \n+\t\n+\tpublic static String DTO_ReadOnly;\n+\n+\t\n+\tpublic static String DTO_Part_Title;\n+\n \n \t\n \tpublic static String EnvironmentPropertiesEditionPart_NameLabel;\n@@ -241,13 +250,16 @@ public class EnvironmentMessages extends NLS {\n \tpublic static String AttributePropertiesEditionPart_MultiplicityLabel;\n \n \t\n+\tpublic static String AttributePropertiesEditionPart_IdentifierLabel;\n+\n+\t\n \tpublic static String AttributePropertiesEditionPart_DescriptionLabel;\n \n \t\n \tpublic static String ReferencePropertiesEditionPart_NameLabel;\n \n \t\n-\tpublic static String ReferencePropertiesEditionPart_TypeLabel;\n+\tpublic static String ReferencePropertiesEditionPart_ReferencedTypeLabel;\n \n \t\n \tpublic static String ReferencePropertiesEditionPart_MultiplicityLabel;\n@@ -262,6 +274,9 @@ public class EnvironmentMessages extends NLS {\n \tpublic static String ReferencePropertiesEditionPart_OppositeOfLabel;\n \n \t\n+\tpublic static String ReferencePropertiesEditionPart_IdentifierLabel;\n+\n+\t\n \tpublic static String ReferencePropertiesEditionPart_DescriptionLabel;\n \n \t\n@@ -294,6 +309,18 @@ public class EnvironmentMessages extends NLS {\n \t\n \tpublic static String BindingElementPropertiesEditionPart_DescriptionLabel;\n \n+\t\n+\tpublic static String DTOPropertiesEditionPart_NameLabel;\n+\n+\t\n+\tpublic static String DTOPropertiesEditionPart_SupertypeLabel;\n+\n+\t\n+\tpublic static String DTOPropertiesEditionPart_AssociatedTypesLabel;\n+\n+\t\n+\tpublic static String DTOPropertiesEditionPart_DescriptionLabel;\n+\n \n \t\n \tpublic static String PropertiesEditionPart_DocumentationLabel;","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentMessages.java","sha":"b1321030c678e24fd8ab99a53421e0f0bc0739e3","status":"modified"},{"additions":8,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentPropertiesEditionPartProvider.java","changes":8,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentPropertiesEditionPartProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/EnvironmentPropertiesEditionPartProvider.java","new_code":"import org.obeonetwork.dsl.environment.parts.forms.DTOPropertiesEditionPartForm;\nimport org.obeonetwork.dsl.environment.parts.impl.DTOPropertiesEditionPartImpl;\n\t\tif (key == EnvironmentViewsRepository.DTO.class) {\n\t\t\tif (kind == EnvironmentViewsRepository.SWT_KIND)\n\t\t\t\treturn new DTOPropertiesEditionPartImpl(component);\n\t\t\tif (kind == EnvironmentViewsRepository.FORM_KIND)\n\t\t\t\treturn new DTOPropertiesEditionPartForm(component);\n\t\t}","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -16,6 +16,7 @@\n import org.obeonetwork.dsl.environment.parts.forms.BindingElementPropertiesEditionPartForm;\n import org.obeonetwork.dsl.environment.parts.forms.BindingInfoPropertiesEditionPartForm;\n import org.obeonetwork.dsl.environment.parts.forms.BindingReferencePropertiesEditionPartForm;\n+import org.obeonetwork.dsl.environment.parts.forms.DTOPropertiesEditionPartForm;\n import org.obeonetwork.dsl.environment.parts.forms.EnumerationPropertiesEditionPartForm;\n import org.obeonetwork.dsl.environment.parts.forms.EnvironmentPropertiesEditionPartForm;\n import org.obeonetwork.dsl.environment.parts.forms.FieldPropertiesEditionPartForm;\n@@ -34,6 +35,7 @@\n import org.obeonetwork.dsl.environment.parts.impl.BindingElementPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.environment.parts.impl.BindingInfoPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.environment.parts.impl.BindingReferencePropertiesEditionPartImpl;\n+import org.obeonetwork.dsl.environment.parts.impl.DTOPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.environment.parts.impl.EnumerationPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.environment.parts.impl.EnvironmentPropertiesEditionPartImpl;\n import org.obeonetwork.dsl.environment.parts.impl.FieldPropertiesEditionPartImpl;\n@@ -170,6 +172,12 @@ public IPropertiesEditionPart getPropertiesEditionPart(Object key, int kind, IPr\n \t\t\tif (kind == EnvironmentViewsRepository.FORM_KIND)\n \t\t\t\treturn new BindingElementPropertiesEditionPartForm(component);\n \t\t}\n+\t\tif (key == EnvironmentViewsRepository.DTO.class) {\n+\t\t\tif (kind == EnvironmentViewsRepository.SWT_KIND)\n+\t\t\t\treturn new DTOPropertiesEditionPartImpl(component);\n+\t\t\tif (kind == EnvironmentViewsRepository.FORM_KIND)\n+\t\t\t\treturn new DTOPropertiesEditionPartForm(component);\n+\t\t}\n \t\treturn null;\n \t}\n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentPropertiesEditionPartProvider.java","sha":"1385a20260f0557f20ef3d8edd1ca2917a23e3da","status":"modified"},{"additions":10,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages.properties","changes":11,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":1,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/environmentMessages.properties","new_code":"DTOPropertiesEditionPart_PropertiesGroupLabel=Properties\nDTO_ReadOnly=This property is read only\nDTO_Part_Title=Base\nAttributePropertiesEditionPart_IdentifierLabel=Identifier\nReferencePropertiesEditionPart_ReferencedTypeLabel=ReferencedType : \nReferencePropertiesEditionPart_IdentifierLabel=Identifier\nDTOPropertiesEditionPart_NameLabel=Name : \nDTOPropertiesEditionPart_SupertypeLabel=Supertype : \nDTOPropertiesEditionPart_AssociatedTypesLabel=AssociatedTypes : \nDTOPropertiesEditionPart_DescriptionLabel=Description : ","new_methods":[],"old_code":"ReferencePropertiesEditionPart_TypeLabel=Type : ","old_methods":[],"patch":"@@ -24,6 +24,7 @@ MetadatasPropertiesEditionPart_PropertiesGroupLabel=Properties\n BindingInfoPropertiesEditionPart_PropertiesGroupLabel=Properties\n BindingReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\n BindingElementPropertiesEditionPart_PropertiesGroupLabel=Properties\n+DTOPropertiesEditionPart_PropertiesGroupLabel=Properties\n Environment_ReadOnly=This property is read only\n Environment_Part_Title=Environment\n PrimitiveType_ReadOnly=This property is read only\n@@ -58,6 +59,8 @@ BindingReference_ReadOnly=This property is read only\n BindingReference_Part_Title=BindingReference\n BindingElement_ReadOnly=This property is read only\n BindingElement_Part_Title=BindingElement\n+DTO_ReadOnly=This property is read only\n+DTO_Part_Title=Base\n EnvironmentPropertiesEditionPart_NameLabel=Name : \n EnvironmentPropertiesEditionPart_DescriptionLabel=Description : \n PrimitiveTypePropertiesEditionPart_NameLabel=Name : \n@@ -82,13 +85,15 @@ NamespacePropertiesEditionPart_DescriptionLabel=Description :\n AttributePropertiesEditionPart_NameLabel=Name : \n AttributePropertiesEditionPart_TypeLabel=Type : \n AttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n+AttributePropertiesEditionPart_IdentifierLabel=Identifier\n AttributePropertiesEditionPart_DescriptionLabel=Description : \n ReferencePropertiesEditionPart_NameLabel=Name : \n-ReferencePropertiesEditionPart_TypeLabel=Type : \n+ReferencePropertiesEditionPart_ReferencedTypeLabel=ReferencedType : \n ReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n ReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\n ReferencePropertiesEditionPart_NavigableLabel=Navigable\n ReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \n+ReferencePropertiesEditionPart_IdentifierLabel=Identifier\n ReferencePropertiesEditionPart_DescriptionLabel=Description : \n MetadatasPropertiesEditionPart_MetadataLabel=Metadata : \n BindingInfoPropertiesEditionPart_LeftLabel=Left : \n@@ -100,6 +105,10 @@ BindingReferencePropertiesEditionPart_DescriptionLabel=Description :\n BindingElementPropertiesEditionPart_BoundElementLabel=BoundElement : \n BindingElementPropertiesEditionPart_BindingExpressionLabel=BindingExpression : \n BindingElementPropertiesEditionPart_DescriptionLabel=Description : \n+DTOPropertiesEditionPart_NameLabel=Name : \n+DTOPropertiesEditionPart_SupertypeLabel=Supertype : \n+DTOPropertiesEditionPart_AssociatedTypesLabel=AssociatedTypes : \n+DTOPropertiesEditionPart_DescriptionLabel=Description : \n PropertiesEditionPart_PropertiesGroupLabel=Properties\n PropertiesEditionPart_EditTableViewerLabel=Edit\n PropertiesEditionPart_DocumentationLabel=Documentation","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages.properties","sha":"28dab2df2a7081dc6267d84b3ea828f8f61b586d","status":"modified"},{"additions":10,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages_fr.properties","changes":11,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages_fr.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":1,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/environmentMessages_fr.properties","new_code":"DTOPropertiesEditionPart_PropertiesGroupLabel=Properties\nDTO_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\nDTO_Part_Title=Base\nAttributePropertiesEditionPart_IdentifierLabel=Identifier\nReferencePropertiesEditionPart_ReferencedTypeLabel=ReferencedType : \nReferencePropertiesEditionPart_IdentifierLabel=Identifier\nDTOPropertiesEditionPart_NameLabel=Name : \nDTOPropertiesEditionPart_SupertypeLabel=Supertype : \nDTOPropertiesEditionPart_AssociatedTypesLabel=AssociatedTypes : \nDTOPropertiesEditionPart_DescriptionLabel=Description : ","new_methods":[],"old_code":"ReferencePropertiesEditionPart_TypeLabel=Type : ","old_methods":[],"patch":"@@ -24,6 +24,7 @@ MetadatasPropertiesEditionPart_PropertiesGroupLabel=Properties\n BindingInfoPropertiesEditionPart_PropertiesGroupLabel=Properties\n BindingReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\n BindingElementPropertiesEditionPart_PropertiesGroupLabel=Properties\n+DTOPropertiesEditionPart_PropertiesGroupLabel=Properties\n Environment_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n Environment_Part_Title=Environment\n PrimitiveType_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n@@ -58,6 +59,8 @@ BindingReference_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n BindingReference_Part_Title=BindingReference\n BindingElement_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n BindingElement_Part_Title=BindingElement\n+DTO_ReadOnly=Cette propri\\u00E9t\\u00E9 est en lecture seule\n+DTO_Part_Title=Base\n EnvironmentPropertiesEditionPart_NameLabel=Name : \n EnvironmentPropertiesEditionPart_DescriptionLabel=Description : \n PrimitiveTypePropertiesEditionPart_NameLabel=Name : \n@@ -82,13 +85,15 @@ NamespacePropertiesEditionPart_DescriptionLabel=Description :\n AttributePropertiesEditionPart_NameLabel=Name : \n AttributePropertiesEditionPart_TypeLabel=Type : \n AttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n+AttributePropertiesEditionPart_IdentifierLabel=Identifier\n AttributePropertiesEditionPart_DescriptionLabel=Description : \n ReferencePropertiesEditionPart_NameLabel=Name : \n-ReferencePropertiesEditionPart_TypeLabel=Type : \n+ReferencePropertiesEditionPart_ReferencedTypeLabel=ReferencedType : \n ReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \n ReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\n ReferencePropertiesEditionPart_NavigableLabel=Navigable\n ReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \n+ReferencePropertiesEditionPart_IdentifierLabel=Identifier\n ReferencePropertiesEditionPart_DescriptionLabel=Description : \n MetadatasPropertiesEditionPart_MetadataLabel=Metadata : \n BindingInfoPropertiesEditionPart_LeftLabel=Left : \n@@ -100,6 +105,10 @@ BindingReferencePropertiesEditionPart_DescriptionLabel=Description :\n BindingElementPropertiesEditionPart_BoundElementLabel=BoundElement : \n BindingElementPropertiesEditionPart_BindingExpressionLabel=BindingExpression : \n BindingElementPropertiesEditionPart_DescriptionLabel=Description : \n+DTOPropertiesEditionPart_NameLabel=Name : \n+DTOPropertiesEditionPart_SupertypeLabel=Supertype : \n+DTOPropertiesEditionPart_AssociatedTypesLabel=AssociatedTypes : \n+DTOPropertiesEditionPart_DescriptionLabel=Description : \n PropertiesEditionPart_PropertiesGroupLabel=Propri\\u00E9t\\u00E9s\n PropertiesEditionPart_EditTableViewerLabel=Editer\n PropertiesEditionPart_DocumentationLabel=Documentation","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages_fr.properties","sha":"65ce5974b7b7110052e93f10f6a652c31f2354f5","status":"modified"},{"additions":0,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FDTOItemProvider.java","changes":109,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FDTOItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":109,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java","new_code":"","new_methods":[],"old_code":"\t\t\taddAssociatedTypesPropertyDescriptor(object);\n\t\t\taddPropertiesPropertyDescriptor(object);\n\t\t\taddReferencesPropertyDescriptor(object);\n\t\t\taddAttributesPropertyDescriptor(object);\n\t\t\taddSupertypePropertyDescriptor(object);\n\t/**\n\t * This adds a property descriptor for the Associated Types feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addAssociatedTypesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_associatedTypes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_associatedTypes_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__ASSOCIATED_TYPES, true, false,\n\t\t\t\ttrue, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the Properties feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addPropertiesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_properties_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_properties_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__PROPERTIES, false, false,\n\t\t\t\tfalse, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the References feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addReferencesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_references_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_references_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__REFERENCES, false, false,\n\t\t\t\tfalse, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the Attributes feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addAttributesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_attributes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_attributes_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__ATTRIBUTES, false, false,\n\t\t\t\tfalse, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the Supertype feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addSupertypePropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_supertype_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_supertype_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__SUPERTYPE, true, false, true,\n\t\t\t\tnull, null, null));\n\t}\n\n\t\t\tchildrenFeatures\n\t\t\t\t\t.add(EnvironmentPackage.Literals.DTO__OWNED_REFERENCES);\n\t\t\tchildrenFeatures\n\t\t\t\t\t.add(EnvironmentPackage.Literals.DTO__OWNED_ATTRIBUTES);\n\t\tcase EnvironmentPackage.DTO__OWNED_REFERENCES:\n\t\tcase EnvironmentPackage.DTO__OWNED_ATTRIBUTES:\n\n\t\tnewChildDescriptors.add(createChildParameter(\n\t\t\t\tEnvironmentPackage.Literals.DTO__OWNED_REFERENCES,\n\t\t\t\tEnvironmentFactory.eINSTANCE.createReference()));\n\n\t\tnewChildDescriptors.add(createChildParameter(\n\t\t\t\tEnvironmentPackage.Literals.DTO__OWNED_ATTRIBUTES,\n\t\t\t\tEnvironmentFactory.eINSTANCE.createAttribute()));","old_methods":[{"arguments":["Object object"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java","implementation":"itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_associatedTypes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_associatedTypes_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__ASSOCIATED_TYPES, true, false,\n\t\t\t\ttrue, null, null, null));","signature":"void addAssociatedTypesPropertyDescriptor(Object object)"},{"arguments":["Object object"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java","implementation":"itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_properties_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_properties_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__PROPERTIES, false, false,\n\t\t\t\tfalse, null, null, null));","signature":"void addPropertiesPropertyDescriptor(Object object)"},{"arguments":["Object object"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java","implementation":"itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_references_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_references_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__REFERENCES, false, false,\n\t\t\t\tfalse, null, null, null));","signature":"void addReferencesPropertyDescriptor(Object object)"},{"arguments":["Object object"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java","implementation":"itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_attributes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_attributes_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__ATTRIBUTES, false, false,\n\t\t\t\tfalse, null, null, null));","signature":"void addAttributesPropertyDescriptor(Object object)"},{"arguments":["Object object"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java","implementation":"itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_DTO_supertype_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_DTO_supertype_feature\", \"_UI_DTO_type\"),\n\t\t\t\tEnvironmentPackage.Literals.DTO__SUPERTYPE, true, false, true,\n\t\t\t\tnull, null, null));","signature":"void addSupertypePropertyDescriptor(Object object)"}],"patch":"@@ -67,105 +67,10 @@ public List getPropertyDescriptors(Object object) {\n \t\tif (itemPropertyDescriptors == null) {\n \t\t\tsuper.getPropertyDescriptors(object);\n \n-\t\t\taddAssociatedTypesPropertyDescriptor(object);\n-\t\t\taddPropertiesPropertyDescriptor(object);\n-\t\t\taddReferencesPropertyDescriptor(object);\n-\t\t\taddAttributesPropertyDescriptor(object);\n-\t\t\taddSupertypePropertyDescriptor(object);\n \t\t}\n \t\treturn itemPropertyDescriptors;\n \t}\n \n-\t/**\n-\t * This adds a property descriptor for the Associated Types feature.\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\tprotected void addAssociatedTypesPropertyDescriptor(Object object) {\n-\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n-\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n-\t\t\t\t\t\t.getRootAdapterFactory(),\n-\t\t\t\tgetResourceLocator(),\n-\t\t\t\tgetString(\"_UI_DTO_associatedTypes_feature\"),\n-\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n-\t\t\t\t\t\t\"_UI_DTO_associatedTypes_feature\", \"_UI_DTO_type\"),\n-\t\t\t\tEnvironmentPackage.Literals.DTO__ASSOCIATED_TYPES, true, false,\n-\t\t\t\ttrue, null, null, null));\n-\t}\n-\n-\t/**\n-\t * This adds a property descriptor for the Properties feature.\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\tprotected void addPropertiesPropertyDescriptor(Object object) {\n-\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n-\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n-\t\t\t\t\t\t.getRootAdapterFactory(),\n-\t\t\t\tgetResourceLocator(),\n-\t\t\t\tgetString(\"_UI_DTO_properties_feature\"),\n-\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n-\t\t\t\t\t\t\"_UI_DTO_properties_feature\", \"_UI_DTO_type\"),\n-\t\t\t\tEnvironmentPackage.Literals.DTO__PROPERTIES, false, false,\n-\t\t\t\tfalse, null, null, null));\n-\t}\n-\n-\t/**\n-\t * This adds a property descriptor for the References feature.\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\tprotected void addReferencesPropertyDescriptor(Object object) {\n-\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n-\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n-\t\t\t\t\t\t.getRootAdapterFactory(),\n-\t\t\t\tgetResourceLocator(),\n-\t\t\t\tgetString(\"_UI_DTO_references_feature\"),\n-\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n-\t\t\t\t\t\t\"_UI_DTO_references_feature\", \"_UI_DTO_type\"),\n-\t\t\t\tEnvironmentPackage.Literals.DTO__REFERENCES, false, false,\n-\t\t\t\tfalse, null, null, null));\n-\t}\n-\n-\t/**\n-\t * This adds a property descriptor for the Attributes feature.\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\tprotected void addAttributesPropertyDescriptor(Object object) {\n-\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n-\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n-\t\t\t\t\t\t.getRootAdapterFactory(),\n-\t\t\t\tgetResourceLocator(),\n-\t\t\t\tgetString(\"_UI_DTO_attributes_feature\"),\n-\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n-\t\t\t\t\t\t\"_UI_DTO_attributes_feature\", \"_UI_DTO_type\"),\n-\t\t\t\tEnvironmentPackage.Literals.DTO__ATTRIBUTES, false, false,\n-\t\t\t\tfalse, null, null, null));\n-\t}\n-\n-\t/**\n-\t * This adds a property descriptor for the Supertype feature.\n-\t * \n-\t * \n-\t * @generated\n-\t */\n-\tprotected void addSupertypePropertyDescriptor(Object object) {\n-\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n-\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n-\t\t\t\t\t\t.getRootAdapterFactory(),\n-\t\t\t\tgetResourceLocator(),\n-\t\t\t\tgetString(\"_UI_DTO_supertype_feature\"),\n-\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n-\t\t\t\t\t\t\"_UI_DTO_supertype_feature\", \"_UI_DTO_type\"),\n-\t\t\t\tEnvironmentPackage.Literals.DTO__SUPERTYPE, true, false, true,\n-\t\t\t\tnull, null, null));\n-\t}\n-\n \t/**\n \t * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an\n \t * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or\n@@ -181,10 +86,6 @@ public Collection getChildrenFeatures(\n \t\t\tsuper.getChildrenFeatures(object);\n \t\t\tchildrenFeatures\n \t\t\t\t\t.add(EnvironmentPackage.Literals.DTO__OWNED_CONTAINER);\n-\t\t\tchildrenFeatures\n-\t\t\t\t\t.add(EnvironmentPackage.Literals.DTO__OWNED_REFERENCES);\n-\t\t\tchildrenFeatures\n-\t\t\t\t\t.add(EnvironmentPackage.Literals.DTO__OWNED_ATTRIBUTES);\n \t\t}\n \t\treturn childrenFeatures;\n \t}\n@@ -250,8 +151,6 @@ public void notifyChanged(Notification notification) {\n \n \t\tswitch (notification.getFeatureID(DTO.class)) {\n \t\tcase EnvironmentPackage.DTO__OWNED_CONTAINER:\n-\t\tcase EnvironmentPackage.DTO__OWNED_REFERENCES:\n-\t\tcase EnvironmentPackage.DTO__OWNED_ATTRIBUTES:\n \t\t\tfireNotifyChanged(new ViewerNotification(notification,\n \t\t\t\t\tnotification.getNotifier(), true, false));\n \t\t\treturn;\n@@ -274,14 +173,6 @@ protected void collectNewChildDescriptors(\n \t\tnewChildDescriptors.add(createChildParameter(\n \t\t\t\tEnvironmentPackage.Literals.DTO__OWNED_CONTAINER,\n \t\t\t\tEnvironmentFactory.eINSTANCE.createFilterContainer()));\n-\n-\t\tnewChildDescriptors.add(createChildParameter(\n-\t\t\t\tEnvironmentPackage.Literals.DTO__OWNED_REFERENCES,\n-\t\t\t\tEnvironmentFactory.eINSTANCE.createReference()));\n-\n-\t\tnewChildDescriptors.add(createChildParameter(\n-\t\t\t\tEnvironmentPackage.Literals.DTO__OWNED_ATTRIBUTES,\n-\t\t\t\tEnvironmentFactory.eINSTANCE.createAttribute()));\n \t}\n \n }","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FDTOItemProvider.java","sha":"0194d6e73db3792fe3e091265b8aeb5baaa58ee7","status":"modified"},{"additions":34,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FEnvironmentItemProvider.java","changes":34,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FEnvironmentItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/EnvironmentItemProvider.java","new_code":"\t\t\tchildrenFeatures\n\t\t\t\t\t.add(EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES);\n\t\tcase EnvironmentPackage.ENVIRONMENT__NAMESPACES:\n\n\t\tnewChildDescriptors.add(createChildParameter(\n\t\t\t\tEnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION,\n\t\t\t\tEnvironmentFactory.eINSTANCE.createNamespace()));\n\n\t\tnewChildDescriptors.add(createChildParameter(\n\t\t\t\tEnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES,\n\t\t\t\tEnvironmentFactory.eINSTANCE.createNamespace()));\n\t}\n\n\t/**\n\t * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.\n\t * \n\t * \n\t * @generated\n\t */\n\t@Override\n\tpublic String getCreateChildText(Object owner, Object feature,\n\t\t\tObject child, Collection selection) {\n\t\tObject childFeature = feature;\n\t\tObject childObject = child;\n\n\t\tboolean qualify = childFeature == EnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION\n\t\t\t\t|| childFeature == EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES;\n\n\t\tif (qualify) {\n\t\t\treturn getString(\"_UI_CreateChild_text2\", new Object[] {\n\t\t\t\t\tgetTypeText(childObject), getFeatureText(childFeature),\n\t\t\t\t\tgetTypeText(owner) });\n\t\t}\n\t\treturn super.getCreateChildText(owner, feature, child, selection);","new_methods":[{"arguments":["Object owner"," Object feature","\n\t\t\tObject child"," Collection selection"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/EnvironmentItemProvider.java","implementation":"Object childFeature = feature;\n\t\tObject childObject = child;\n\n\t\tboolean qualify = childFeature == EnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION\n\t\t\t\t|| childFeature == EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES;\n\n\t\tif (qualify) {\n\t\t\treturn getString(\"_UI_CreateChild_text2\", new Object[] {\n\t\t\t\t\tgetTypeText(childObject), getFeatureText(childFeature),\n\t\t\t\t\tgetTypeText(owner)","signature":"String getCreateChildText(Object owner, Object feature,\n\t\t\tObject child, Collection selection)"}],"old_code":"","old_methods":[],"patch":"@@ -115,6 +115,8 @@ public Collection getChildrenFeatures(\n \t\t\t\t\t.add(EnvironmentPackage.Literals.ENVIRONMENT__PRIORITY_DEFINITIONS);\n \t\t\tchildrenFeatures\n \t\t\t\t\t.add(EnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION);\n+\t\t\tchildrenFeatures\n+\t\t\t\t\t.add(EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES);\n \t\t}\n \t\treturn childrenFeatures;\n \t}\n@@ -187,6 +189,7 @@ public void notifyChanged(Notification notification) {\n \t\tcase EnvironmentPackage.ENVIRONMENT__LINKS:\n \t\tcase EnvironmentPackage.ENVIRONMENT__PRIORITY_DEFINITIONS:\n \t\tcase EnvironmentPackage.ENVIRONMENT__TYPES_DEFINITION:\n+\t\tcase EnvironmentPackage.ENVIRONMENT__NAMESPACES:\n \t\t\tfireNotifyChanged(new ViewerNotification(notification,\n \t\t\t\t\tnotification.getNotifier(), true, false));\n \t\t\treturn;\n@@ -217,6 +220,37 @@ protected void collectNewChildDescriptors(\n \t\tnewChildDescriptors.add(createChildParameter(\n \t\t\t\tEnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION,\n \t\t\t\tEnvironmentFactory.eINSTANCE.createTypesDefinition()));\n+\n+\t\tnewChildDescriptors.add(createChildParameter(\n+\t\t\t\tEnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION,\n+\t\t\t\tEnvironmentFactory.eINSTANCE.createNamespace()));\n+\n+\t\tnewChildDescriptors.add(createChildParameter(\n+\t\t\t\tEnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES,\n+\t\t\t\tEnvironmentFactory.eINSTANCE.createNamespace()));\n+\t}\n+\n+\t/**\n+\t * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.\n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\t@Override\n+\tpublic String getCreateChildText(Object owner, Object feature,\n+\t\t\tObject child, Collection selection) {\n+\t\tObject childFeature = feature;\n+\t\tObject childObject = child;\n+\n+\t\tboolean qualify = childFeature == EnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION\n+\t\t\t\t|| childFeature == EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES;\n+\n+\t\tif (qualify) {\n+\t\t\treturn getString(\"_UI_CreateChild_text2\", new Object[] {\n+\t\t\t\t\tgetTypeText(childObject), getFeatureText(childFeature),\n+\t\t\t\t\tgetTypeText(owner) });\n+\t\t}\n+\t\treturn super.getCreateChildText(owner, feature, child, selection);\n \t}\n \n }","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FEnvironmentItemProvider.java","sha":"151eb2014526605c87883bc9e12e8c5fd89232f8","status":"modified"},{"additions":3,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FNamespaceItemProvider.java","changes":6,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FNamespaceItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":3,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/NamespaceItemProvider.java","new_code":"public class NamespaceItemProvider extends TypesDefinitionItemProvider\n\t\timplements IEditingDomainItemProvider, IStructuredItemContentProvider,\n\t\t\tif (ns.getOwnedNamespaces().isEmpty() && ns.getTypes().isEmpty()) {","new_methods":[],"old_code":"public class NamespaceItemProvider extends ObeoDSMObjectItemProvider implements\n\t\tIEditingDomainItemProvider, IStructuredItemContentProvider,\n\t\t\tif (ns.getOwnedNamespaces().size() == 0) {","old_methods":[],"patch":"@@ -37,8 +37,8 @@\n * \n * @generated\n */\n-public class NamespaceItemProvider extends ObeoDSMObjectItemProvider implements\n-\t\tIEditingDomainItemProvider, IStructuredItemContentProvider,\n+public class NamespaceItemProvider extends TypesDefinitionItemProvider\n+\t\timplements IEditingDomainItemProvider, IStructuredItemContentProvider,\n \t\tITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {\n \t/**\n \t * \n@@ -133,7 +133,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) {\n \tpublic Object getImage(Object object) {\n \t\tif (object instanceof Namespace) {\n \t\t\tNamespace ns = (Namespace) object;\n-\t\t\tif (ns.getOwnedNamespaces().size() == 0) {\n+\t\t\tif (ns.getOwnedNamespaces().isEmpty() && ns.getTypes().isEmpty()) {\n \t\t\t\treturn overlayImage(\n \t\t\t\t\t\tobject,\n \t\t\t\t\t\tgetResourceLocator().getImage(","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FNamespaceItemProvider.java","sha":"9b0dd19622538e630caefefe0417fb4388831c3d","status":"modified"},{"additions":22,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FPropertyItemProvider.java","changes":22,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FPropertyItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/PropertyItemProvider.java","new_code":"\t\t\taddIsIdentifierPropertyDescriptor(object);\n\t/**\n\t * This adds a property descriptor for the Is Identifier feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addIsIdentifierPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_Property_isIdentifier_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_Property_isIdentifier_feature\",\n\t\t\t\t\t\t\"_UI_Property_type\"),\n\t\t\t\tEnvironmentPackage.Literals.PROPERTY__IS_IDENTIFIER, true,\n\t\t\t\tfalse, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,\n\t\t\t\tnull));\n\t}\n\n\t\tcase EnvironmentPackage.PROPERTY__IS_IDENTIFIER:","new_methods":[{"arguments":["Object object"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/PropertyItemProvider.java","implementation":"itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_Property_isIdentifier_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_Property_isIdentifier_feature\",\n\t\t\t\t\t\t\"_UI_Property_type\"),\n\t\t\t\tEnvironmentPackage.Literals.PROPERTY__IS_IDENTIFIER, true,\n\t\t\t\tfalse, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,\n\t\t\t\tnull));","signature":"void addIsIdentifierPropertyDescriptor(Object object)"}],"old_code":"","old_methods":[],"patch":"@@ -68,6 +68,7 @@ public List getPropertyDescriptors(Object object) {\n \n \t\t\taddNamePropertyDescriptor(object);\n \t\t\taddMultiplicityPropertyDescriptor(object);\n+\t\t\taddIsIdentifierPropertyDescriptor(object);\n \t\t}\n \t\treturn itemPropertyDescriptors;\n \t}\n@@ -110,6 +111,26 @@ protected void addMultiplicityPropertyDescriptor(Object object) {\n \t\t\t\tnull));\n \t}\n \n+\t/**\n+\t * This adds a property descriptor for the Is Identifier feature.\n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\tprotected void addIsIdentifierPropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n+\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n+\t\t\t\t\t\t.getRootAdapterFactory(),\n+\t\t\t\tgetResourceLocator(),\n+\t\t\t\tgetString(\"_UI_Property_isIdentifier_feature\"),\n+\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n+\t\t\t\t\t\t\"_UI_Property_isIdentifier_feature\",\n+\t\t\t\t\t\t\"_UI_Property_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.PROPERTY__IS_IDENTIFIER, true,\n+\t\t\t\tfalse, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,\n+\t\t\t\tnull));\n+\t}\n+\n \t/**\n \t * \n \t * \n@@ -147,6 +168,7 @@ public void notifyChanged(Notification notification) {\n \t\tswitch (notification.getFeatureID(Property.class)) {\n \t\tcase EnvironmentPackage.PROPERTY__NAME:\n \t\tcase EnvironmentPackage.PROPERTY__MULTIPLICITY:\n+\t\tcase EnvironmentPackage.PROPERTY__IS_IDENTIFIER:\n \t\t\tfireNotifyChanged(new ViewerNotification(notification,\n \t\t\t\t\tnotification.getNotifier(), false, true));\n \t\t\treturn;","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FPropertyItemProvider.java","sha":"a61e66ba718b9fbf660e3c431e3bc595f7733831","status":"modified"},{"additions":15,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FReferenceItemProvider.java","changes":32,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FReferenceItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":17,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/ReferenceItemProvider.java","new_code":"\t\t\taddReferencedTypePropertyDescriptor(object);\n\t\t\tprotected Collection getComboBoxObjects(Object object) {\n\t\t\t\tCollection result = new ArrayList();\n\t\t\t\t\tCollection collection = super.getComboBoxObjects(object);\n\t\t\t\t\tfor (Object object2 : collection) {\n\t\t\t\t\t\tEObject elem = (EObject)object2;\n\t\t\t\t\t\tif (elem != null && elem instanceof Reference && ((Reference) elem).canBeOppositeOf((Reference) object)) {\n\t\t\t\t\t\t\tresult.add((Reference)elem);\n\t * This adds a property descriptor for the Referenced Type feature.\n\tprotected void addReferencedTypePropertyDescriptor(Object object) {\n\t\t\t\tgetString(\"_UI_Reference_referencedType_feature\"),\n\t\t\t\t\t\t\"_UI_Reference_referencedType_feature\",\n\t\t\t\t\t\t\"_UI_Reference_type\"),\n\t\t\t\tEnvironmentPackage.Literals.REFERENCE__REFERENCED_TYPE, true,\n\t\t\t\tfalse, true, null, null, null));","new_methods":[],"old_code":"\t\t\taddTypePropertyDescriptor(object);\n\t\t\tprotected Collection getComboBoxObjects(Object object) {\n\t\t\t\tCollection result = new ArrayList();\n\t\t\t\t\tCollection collection = super.getComboBoxObjects(object);\n\t\t\t\t\tfor (Iterator iter = collection.iterator(); iter.hasNext();) {\n\t\t\t\t\t\tEObject elem = (EObject) iter.next();\n\t\t\t\t\t\tif (elem != null\n\t\t\t\t\t\t\t\t&& elem instanceof Reference\n\t\t\t\t\t\t\t\t&& ((Reference) elem)\n\t\t\t\t\t\t\t\t\t\t.canBeOppositeOf((Reference) object)) {\n\t\t\t\t\t\t\tresult.add(elem);\n\t * This adds a property descriptor for the Type feature.\n\tprotected void addTypePropertyDescriptor(Object object) {\n\t\t\t\tgetString(\"_UI_Reference_type_feature\"),\n\t\t\t\t\t\t\"_UI_Reference_type_feature\", \"_UI_Reference_type\"),\n\t\t\t\tEnvironmentPackage.Literals.REFERENCE__TYPE, true, false, true,\n\t\t\t\tnull, null, null));","old_methods":[],"patch":"@@ -72,7 +72,7 @@ public List getPropertyDescriptors(Object object) {\n \t\t\taddIsCompositePropertyDescriptor(object);\n \t\t\taddNavigablePropertyDescriptor(object);\n \t\t\taddOppositeOfPropertyDescriptor(object);\n-\t\t\taddTypePropertyDescriptor(object);\n+\t\t\taddReferencedTypePropertyDescriptor(object);\n \t\t}\n \t\treturn itemPropertyDescriptors;\n \t}\n@@ -135,20 +135,17 @@ protected void addOppositeOfPropertyDescriptor(Object object) {\n \t\t\t\tEnvironmentPackage.Literals.REFERENCE__OPPOSITE_OF, true,\n \t\t\t\tfalse, true, null, null, null) {\n \n-\t\t\tprotected Collection getComboBoxObjects(Object object) {\n+\t\t\tprotected Collection getComboBoxObjects(Object object) {\n \n-\t\t\t\tCollection result = new ArrayList();\n+\t\t\t\tCollection result = new ArrayList();\n \t\t\t\t// We always offer an empty choice\n \t\t\t\tresult.add(null);\n \t\t\t\tif (object instanceof Reference) {\n-\t\t\t\t\tCollection collection = super.getComboBoxObjects(object);\n-\t\t\t\t\tfor (Iterator iter = collection.iterator(); iter.hasNext();) {\n-\t\t\t\t\t\tEObject elem = (EObject) iter.next();\n-\t\t\t\t\t\tif (elem != null\n-\t\t\t\t\t\t\t\t&& elem instanceof Reference\n-\t\t\t\t\t\t\t\t&& ((Reference) elem)\n-\t\t\t\t\t\t\t\t\t\t.canBeOppositeOf((Reference) object)) {\n-\t\t\t\t\t\t\tresult.add(elem);\n+\t\t\t\t\tCollection collection = super.getComboBoxObjects(object);\n+\t\t\t\t\tfor (Object object2 : collection) {\n+\t\t\t\t\t\tEObject elem = (EObject)object2;\n+\t\t\t\t\t\tif (elem != null && elem instanceof Reference && ((Reference) elem).canBeOppositeOf((Reference) object)) {\n+\t\t\t\t\t\t\tresult.add((Reference)elem);\n \t\t\t\t\t\t}\n \t\t\t\t\t}\n \t\t\t\t}\n@@ -159,21 +156,22 @@ protected Collection getComboBoxObjects(Object object) {\n \t}\n \n \t/**\n-\t * This adds a property descriptor for the Type feature.\n+\t * This adds a property descriptor for the Referenced Type feature.\n \t * \n \t * \n \t * @generated\n \t */\n-\tprotected void addTypePropertyDescriptor(Object object) {\n+\tprotected void addReferencedTypePropertyDescriptor(Object object) {\n \t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n \t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n \t\t\t\t\t\t.getRootAdapterFactory(),\n \t\t\t\tgetResourceLocator(),\n-\t\t\t\tgetString(\"_UI_Reference_type_feature\"),\n+\t\t\t\tgetString(\"_UI_Reference_referencedType_feature\"),\n \t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n-\t\t\t\t\t\t\"_UI_Reference_type_feature\", \"_UI_Reference_type\"),\n-\t\t\t\tEnvironmentPackage.Literals.REFERENCE__TYPE, true, false, true,\n-\t\t\t\tnull, null, null));\n+\t\t\t\t\t\t\"_UI_Reference_referencedType_feature\",\n+\t\t\t\t\t\t\"_UI_Reference_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.REFERENCE__REFERENCED_TYPE, true,\n+\t\t\t\tfalse, true, null, null, null));\n \t}\n \n \t/**","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FReferenceItemProvider.java","sha":"8590de77ed3d19187bac61f0dc23e52f9e8283e7","status":"modified"},{"additions":155,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FStructuredTypeItemProvider.java","changes":155,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FStructuredTypeItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java","new_code":"import org.eclipse.emf.ecore.EStructuralFeature;\nimport org.eclipse.emf.edit.provider.ComposeableAdapterFactory;\nimport org.eclipse.emf.edit.provider.ViewerNotification;\nimport org.obeonetwork.dsl.environment.EnvironmentFactory;\nimport org.obeonetwork.dsl.environment.EnvironmentPackage;\n\t\t\taddSupertypePropertyDescriptor(object);\n\t\t\taddAssociatedTypesPropertyDescriptor(object);\n\t\t\taddAttributesPropertyDescriptor(object);\n\t\t\taddReferencesPropertyDescriptor(object);\n\t\t\taddPropertiesPropertyDescriptor(object);\n\t/**\n\t * This adds a property descriptor for the Supertype feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addSupertypePropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_supertype_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_supertype_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__SUPERTYPE, true,\n\t\t\t\tfalse, true, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the Associated Types feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addAssociatedTypesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_associatedTypes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_associatedTypes_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ASSOCIATED_TYPES,\n\t\t\t\ttrue, false, true, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the Attributes feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addAttributesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_attributes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_attributes_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ATTRIBUTES, false,\n\t\t\t\tfalse, false, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the References feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addReferencesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_references_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_references_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__REFERENCES, false,\n\t\t\t\tfalse, false, null, null, null));\n\t}\n\n\t/**\n\t * This adds a property descriptor for the Properties feature.\n\t * \n\t * \n\t * @generated\n\t */\n\tprotected void addPropertiesPropertyDescriptor(Object object) {\n\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_properties_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_properties_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__PROPERTIES, false,\n\t\t\t\tfalse, false, null, null, null));\n\t}\n\n\t/**\n\t * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an\n\t * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or\n\t * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.\n\t * \n\t * \n\t * @generated\n\t */\n\t@Override\n\tpublic Collection getChildrenFeatures(\n\t\t\tObject object) {\n\t\tif (childrenFeatures == null) {\n\t\t\tsuper.getChildrenFeatures(object);\n\t\t\tchildrenFeatures\n\t\t\t\t\t.add(EnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_ATTRIBUTES);\n\t\t\tchildrenFeatures\n\t\t\t\t\t.add(EnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_REFERENCES);\n\t\t}\n\t\treturn childrenFeatures;\n\t}\n\n\t/**\n\t * \n\t * \n\t * @generated\n\t */\n\t@Override\n\tprotected EStructuralFeature getChildFeature(Object object, Object child) {\n\t\t// Check the type of the specified child object and return the proper feature to use for\n\t\t// adding (see {@link AddCommand}) it as a child.\n\n\t\treturn super.getChildFeature(object, child);\n\t}\n\n\n\t\tswitch (notification.getFeatureID(StructuredType.class)) {\n\t\tcase EnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES:\n\t\tcase EnvironmentPackage.STRUCTURED_TYPE__OWNED_REFERENCES:\n\t\t\tfireNotifyChanged(new ViewerNotification(notification,\n\t\t\t\t\tnotification.getNotifier(), true, false));\n\t\t\treturn;\n\t\t}\n\n\t\tnewChildDescriptors.add(createChildParameter(\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_ATTRIBUTES,\n\t\t\t\tEnvironmentFactory.eINSTANCE.createAttribute()));\n\n\t\tnewChildDescriptors.add(createChildParameter(\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_REFERENCES,\n\t\t\t\tEnvironmentFactory.eINSTANCE.createReference()));","new_methods":[{"arguments":["Object object"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java","implementation":"itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_supertype_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_supertype_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__SUPERTYPE, true,\n\t\t\t\tfalse, true, null, null, null));","signature":"void addSupertypePropertyDescriptor(Object object)"},{"arguments":["Object object"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java","implementation":"itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_associatedTypes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_associatedTypes_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ASSOCIATED_TYPES,\n\t\t\t\ttrue, false, true, null, null, null));","signature":"void addAssociatedTypesPropertyDescriptor(Object object)"},{"arguments":["Object object"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java","implementation":"itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_attributes_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_attributes_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ATTRIBUTES, false,\n\t\t\t\tfalse, false, null, null, null));","signature":"void addAttributesPropertyDescriptor(Object object)"},{"arguments":["Object object"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java","implementation":"itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_references_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_references_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__REFERENCES, false,\n\t\t\t\tfalse, false, null, null, null));","signature":"void addReferencesPropertyDescriptor(Object object)"},{"arguments":["Object object"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java","implementation":"itemPropertyDescriptors.add(createItemPropertyDescriptor(\n\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n\t\t\t\t\t\t.getRootAdapterFactory(),\n\t\t\t\tgetResourceLocator(),\n\t\t\t\tgetString(\"_UI_StructuredType_properties_feature\"),\n\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n\t\t\t\t\t\t\"_UI_StructuredType_properties_feature\",\n\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__PROPERTIES, false,\n\t\t\t\tfalse, false, null, null, null));","signature":"void addPropertiesPropertyDescriptor(Object object)"},{"arguments":["Object object"," Object child"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java","implementation":"// Check the type of the specified child object and return the proper feature to use for\n\t\t// adding (see {@link AddCommand","signature":"EStructuralFeature getChildFeature(Object object, Object child)"}],"old_code":"","old_methods":[],"patch":"@@ -17,12 +17,17 @@\n \n import org.eclipse.emf.common.notify.AdapterFactory;\n import org.eclipse.emf.common.notify.Notification;\n+import org.eclipse.emf.ecore.EStructuralFeature;\n+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;\n import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;\n import org.eclipse.emf.edit.provider.IItemLabelProvider;\n import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;\n import org.eclipse.emf.edit.provider.IItemPropertySource;\n import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;\n import org.eclipse.emf.edit.provider.ITreeItemContentProvider;\n+import org.eclipse.emf.edit.provider.ViewerNotification;\n+import org.obeonetwork.dsl.environment.EnvironmentFactory;\n+import org.obeonetwork.dsl.environment.EnvironmentPackage;\n import org.obeonetwork.dsl.environment.StructuredType;\n \n /**\n@@ -62,10 +67,144 @@ public List getPropertyDescriptors(Object object) {\n \t\tif (itemPropertyDescriptors == null) {\n \t\t\tsuper.getPropertyDescriptors(object);\n \n+\t\t\taddSupertypePropertyDescriptor(object);\n+\t\t\taddAssociatedTypesPropertyDescriptor(object);\n+\t\t\taddAttributesPropertyDescriptor(object);\n+\t\t\taddReferencesPropertyDescriptor(object);\n+\t\t\taddPropertiesPropertyDescriptor(object);\n \t\t}\n \t\treturn itemPropertyDescriptors;\n \t}\n \n+\t/**\n+\t * This adds a property descriptor for the Supertype feature.\n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\tprotected void addSupertypePropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n+\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n+\t\t\t\t\t\t.getRootAdapterFactory(),\n+\t\t\t\tgetResourceLocator(),\n+\t\t\t\tgetString(\"_UI_StructuredType_supertype_feature\"),\n+\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n+\t\t\t\t\t\t\"_UI_StructuredType_supertype_feature\",\n+\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__SUPERTYPE, true,\n+\t\t\t\tfalse, true, null, null, null));\n+\t}\n+\n+\t/**\n+\t * This adds a property descriptor for the Associated Types feature.\n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\tprotected void addAssociatedTypesPropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n+\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n+\t\t\t\t\t\t.getRootAdapterFactory(),\n+\t\t\t\tgetResourceLocator(),\n+\t\t\t\tgetString(\"_UI_StructuredType_associatedTypes_feature\"),\n+\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n+\t\t\t\t\t\t\"_UI_StructuredType_associatedTypes_feature\",\n+\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ASSOCIATED_TYPES,\n+\t\t\t\ttrue, false, true, null, null, null));\n+\t}\n+\n+\t/**\n+\t * This adds a property descriptor for the Attributes feature.\n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\tprotected void addAttributesPropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n+\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n+\t\t\t\t\t\t.getRootAdapterFactory(),\n+\t\t\t\tgetResourceLocator(),\n+\t\t\t\tgetString(\"_UI_StructuredType_attributes_feature\"),\n+\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n+\t\t\t\t\t\t\"_UI_StructuredType_attributes_feature\",\n+\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ATTRIBUTES, false,\n+\t\t\t\tfalse, false, null, null, null));\n+\t}\n+\n+\t/**\n+\t * This adds a property descriptor for the References feature.\n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\tprotected void addReferencesPropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n+\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n+\t\t\t\t\t\t.getRootAdapterFactory(),\n+\t\t\t\tgetResourceLocator(),\n+\t\t\t\tgetString(\"_UI_StructuredType_references_feature\"),\n+\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n+\t\t\t\t\t\t\"_UI_StructuredType_references_feature\",\n+\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__REFERENCES, false,\n+\t\t\t\tfalse, false, null, null, null));\n+\t}\n+\n+\t/**\n+\t * This adds a property descriptor for the Properties feature.\n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\tprotected void addPropertiesPropertyDescriptor(Object object) {\n+\t\titemPropertyDescriptors.add(createItemPropertyDescriptor(\n+\t\t\t\t((ComposeableAdapterFactory) adapterFactory)\n+\t\t\t\t\t\t.getRootAdapterFactory(),\n+\t\t\t\tgetResourceLocator(),\n+\t\t\t\tgetString(\"_UI_StructuredType_properties_feature\"),\n+\t\t\t\tgetString(\"_UI_PropertyDescriptor_description\",\n+\t\t\t\t\t\t\"_UI_StructuredType_properties_feature\",\n+\t\t\t\t\t\t\"_UI_StructuredType_type\"),\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__PROPERTIES, false,\n+\t\t\t\tfalse, false, null, null, null));\n+\t}\n+\n+\t/**\n+\t * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an\n+\t * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or\n+\t * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.\n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\t@Override\n+\tpublic Collection getChildrenFeatures(\n+\t\t\tObject object) {\n+\t\tif (childrenFeatures == null) {\n+\t\t\tsuper.getChildrenFeatures(object);\n+\t\t\tchildrenFeatures\n+\t\t\t\t\t.add(EnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_ATTRIBUTES);\n+\t\t\tchildrenFeatures\n+\t\t\t\t\t.add(EnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_REFERENCES);\n+\t\t}\n+\t\treturn childrenFeatures;\n+\t}\n+\n+\t/**\n+\t * \n+\t * \n+\t * @generated\n+\t */\n+\t@Override\n+\tprotected EStructuralFeature getChildFeature(Object object, Object child) {\n+\t\t// Check the type of the specified child object and return the proper feature to use for\n+\t\t// adding (see {@link AddCommand}) it as a child.\n+\n+\t\treturn super.getChildFeature(object, child);\n+\t}\n+\n \t/**\n \t * \n \t * \n@@ -99,6 +238,14 @@ public String getText(Object object) {\n \t@Override\n \tpublic void notifyChanged(Notification notification) {\n \t\tupdateChildren(notification);\n+\n+\t\tswitch (notification.getFeatureID(StructuredType.class)) {\n+\t\tcase EnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES:\n+\t\tcase EnvironmentPackage.STRUCTURED_TYPE__OWNED_REFERENCES:\n+\t\t\tfireNotifyChanged(new ViewerNotification(notification,\n+\t\t\t\t\tnotification.getNotifier(), true, false));\n+\t\t\treturn;\n+\t\t}\n \t\tsuper.notifyChanged(notification);\n \t}\n \n@@ -113,6 +260,14 @@ public void notifyChanged(Notification notification) {\n \tprotected void collectNewChildDescriptors(\n \t\t\tCollection newChildDescriptors, Object object) {\n \t\tsuper.collectNewChildDescriptors(newChildDescriptors, object);\n+\n+\t\tnewChildDescriptors.add(createChildParameter(\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_ATTRIBUTES,\n+\t\t\t\tEnvironmentFactory.eINSTANCE.createAttribute()));\n+\n+\t\tnewChildDescriptors.add(createChildParameter(\n+\t\t\t\tEnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_REFERENCES,\n+\t\t\t\tEnvironmentFactory.eINSTANCE.createReference()));\n \t}\n \n }","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FStructuredTypeItemProvider.java","sha":"bc9f903f86fcda28325fb3e1c84f9899fbc7eb02","status":"modified"},{"additions":1,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2FMETA-INF%2FMANIFEST.MF","changes":2,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":1,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.editor/META-INF/MANIFEST.MF","new_code":"Bundle-SymbolicName: org.obeonetwork.dsl.environment.editor;singleton:=true","new_methods":[],"old_code":"Bundle-SymbolicName: org.obeonetwork.dsl.environment.editor; singleton:=true","old_methods":[],"patch":"@@ -1,7 +1,7 @@\n Manifest-Version: 1.0\n Bundle-ManifestVersion: 2\n Bundle-Name: %pluginName\n-Bundle-SymbolicName: org.obeonetwork.dsl.environment.editor; singleton:=true\n+Bundle-SymbolicName: org.obeonetwork.dsl.environment.editor;singleton:=true\n Bundle-Version: 2.4.0.qualifier\n Bundle-ClassPath: .\n Bundle-Activator: org.obeonetwork.dsl.environment.presentation.EnvironmentEditorPlugin$Implementation","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2FMETA-INF%2FMANIFEST.MF","sha":"4ba287555cb7d3a0fad0fcb8b4b097a7e1727879","status":"modified"},{"additions":27,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fplugin.xml","changes":27,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fplugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.editor/plugin.xml","new_code":" \n \n \n \n %_UI_EnvironmentModelWizard_description\n \n \n \n\n \n \n \n \n ","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -40,4 +40,31 @@\n contributorClass=\"org.obeonetwork.dsl.environment.presentation.EnvironmentActionBarContributor\" >\n \n \n+ \n+ \n+ \n+ \n+ %_UI_EnvironmentModelWizard_description\n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fplugin.xml","sha":"118aa00d067d98a3d366b70513e85176369623a4","status":"modified"},{"additions":43,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fpresentation%2FEnvironmentEditor.java","changes":84,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fpresentation%2FEnvironmentEditor.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":41,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java","new_code":"\tprotected List propertySheetPages = new ArrayList();\n\t\t\t\tif (propertySheetPages.contains(((PropertySheet) p)\n\t\t\t\t\t\t.getCurrentPage())) {\n\t\t\tresourceToDiagnosticMap.remove(target);\n\t\t\tif (updateProblemIndication) {\n\t\t\t\tgetSite().getShell().getDisplay().asyncExec(new Runnable() {\n\t\t\t\t\tpublic void run() {\n\t\t\t\t\t\tupdateProblemIndication();\n\t\t\t\t\t}\n\t\t\t\t});\n\t\t\t}\n\t\t\t\t\t\t\treturn false;\n\t\t\t\t\t\tfor (Iterator i = propertySheetPages\n\t\t\t\t\t\t\t\t.iterator(); i.hasNext();) {\n\t\t\t\t\t\t\tPropertySheetPage propertySheetPage = i.next();\n\t\t\t\t\t\t\tif (propertySheetPage.getControl().isDisposed()) {\n\t\t\t\t\t\t\t\ti.remove();\n\t\t\t\t\t\t\t} else {\n\t\t\t\t\t\t\t\tpropertySheetPage.refresh();\n\t\t\t\t\t\t\t}\n\t\tPropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(\n\t\t\t\teditingDomain) {\n\t\t\t@Override\n\t\t\tpublic void setSelectionToViewer(List selection) {\n\t\t\t\tEnvironmentEditor.this.setSelectionToViewer(selection);\n\t\t\t\tEnvironmentEditor.this.setFocus();\n\t\t\t}\n\t\t\t@Override\n\t\t\tpublic void setActionBars(IActionBars actionBars) {\n\t\t\t\tsuper.setActionBars(actionBars);\n\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);\n\t\t\t}\n\t\t};\n\t\tpropertySheetPage\n\t\t\t\t.setPropertySourceProvider(new AdapterFactoryContentProvider(\n\t\t\t\t\t\tadapterFactory));\n\t\tpropertySheetPages.add(propertySheetPage);\n\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\n\t\tList targetObjects = markerHelper.getTargetObjects(editingDomain,\n\t\t\t\tmarker);\n\t\tif (!targetObjects.isEmpty()) {\n\t\t\tsetSelectionToViewer(targetObjects);\n\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {","new_methods":[{"arguments":[],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java","implementation":"public void run() {\n\t\t\t\t\t\tupdateProblemIndication();","signature":"new Runnable()"},{"arguments":["\n\t\t\t\teditingDomain"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java","implementation":"@Override\n\t\t\tpublic void setSelectionToViewer(List selection) {\n\t\t\t\tEnvironmentEditor.this.setSelectionToViewer(selection);\n\t\t\t\tEnvironmentEditor.this.setFocus();","signature":"new ExtendedPropertySheetPage(\n\t\t\t\teditingDomain)"},{"arguments":["IActionBars actionBars"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java","implementation":"super.setActionBars(actionBars);\n\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);","signature":"void setActionBars(IActionBars actionBars)"}],"old_code":"\tprotected PropertySheetPage propertySheetPage;\n\t\t\t\tif (((PropertySheet) p).getCurrentPage() == propertySheetPage) {\n\t\t\t\t\t\tif (propertySheetPage != null\n\t\t\t\t\t\t\t\t&& !propertySheetPage.getControl().isDisposed()) {\n\t\t\t\t\t\t\tpropertySheetPage.refresh();\n\t\tif (propertySheetPage == null) {\n\t\t\tpropertySheetPage = new ExtendedPropertySheetPage(editingDomain) {\n\t\t\t\t@Override\n\t\t\t\tpublic void setSelectionToViewer(List selection) {\n\t\t\t\t\tEnvironmentEditor.this.setSelectionToViewer(selection);\n\t\t\t\t\tEnvironmentEditor.this.setFocus();\n\t\t\t\t}\n\t\t\t\t@Override\n\t\t\t\tpublic void setActionBars(IActionBars actionBars) {\n\t\t\t\t\tsuper.setActionBars(actionBars);\n\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this,\n\t\t\t\t\t\t\tactionBars);\n\t\t\t\t}\n\t\t\t};\n\t\t\tpropertySheetPage\n\t\t\t\t\t.setPropertySourceProvider(new AdapterFactoryContentProvider(\n\t\t\t\t\t\t\tadapterFactory));\n\t\t}\n\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \n\t\ttry {\n\t\t\tif (marker.getType().equals(EValidator.MARKER)) {\n\t\t\t\tString uriAttribute = marker.getAttribute(\n\t\t\t\t\t\tEValidator.URI_ATTRIBUTE, null);\n\t\t\t\tif (uriAttribute != null) {\n\t\t\t\t\tURI uri = URI.createURI(uriAttribute);\n\t\t\t\t\tEObject eObject = editingDomain.getResourceSet()\n\t\t\t\t\t\t\t.getEObject(uri, true);\n\t\t\t\t\tif (eObject != null) {\n\t\t\t\t\t\tsetSelectionToViewer(Collections\n\t\t\t\t\t\t\t\t.singleton(editingDomain.getWrapper(eObject)));\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (CoreException exception) {\n\t\t\tEnvironmentEditorPlugin.INSTANCE.log(exception);\n\t\tif (propertySheetPage != null) {","old_methods":[{"arguments":["editingDomain"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java","implementation":"@Override\n\t\t\t\tpublic void setSelectionToViewer(List selection) {\n\t\t\t\t\tEnvironmentEditor.this.setSelectionToViewer(selection);\n\t\t\t\t\tEnvironmentEditor.this.setFocus();","signature":"new ExtendedPropertySheetPage(editingDomain)"},{"arguments":["IActionBars actionBars"],"filename":"models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java","implementation":"super.setActionBars(actionBars);\n\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this,\n\t\t\t\t\t\t\tactionBars);","signature":"void setActionBars(IActionBars actionBars)"}],"patch":"@@ -190,7 +190,7 @@ public class EnvironmentEditor extends MultiPageEditorPart implements\n \t * \n \t * @generated\n \t */\n-\tprotected PropertySheetPage propertySheetPage;\n+\tprotected List propertySheetPages = new ArrayList();\n \n \t/**\n \t * This is the viewer that shadows the selection in the content outline.\n@@ -308,7 +308,8 @@ public void partActivated(IWorkbenchPart p) {\n \t\t\t\t\tsetCurrentViewer(contentOutlineViewer);\n \t\t\t\t}\n \t\t\t} else if (p instanceof PropertySheet) {\n-\t\t\t\tif (((PropertySheet) p).getCurrentPage() == propertySheetPage) {\n+\t\t\t\tif (propertySheetPages.contains(((PropertySheet) p)\n+\t\t\t\t\t\t.getCurrentPage())) {\n \t\t\t\t\tgetActionBarContributor().setActiveEditor(\n \t\t\t\t\t\t\tEnvironmentEditor.this);\n \t\t\t\t\thandleActivate();\n@@ -422,6 +423,14 @@ protected void setTarget(Resource target) {\n \t\t@Override\n \t\tprotected void unsetTarget(Resource target) {\n \t\t\tbasicUnsetTarget(target);\n+\t\t\tresourceToDiagnosticMap.remove(target);\n+\t\t\tif (updateProblemIndication) {\n+\t\t\t\tgetSite().getShell().getDisplay().asyncExec(new Runnable() {\n+\t\t\t\t\tpublic void run() {\n+\t\t\t\t\t\tupdateProblemIndication();\n+\t\t\t\t\t}\n+\t\t\t\t});\n+\t\t\t}\n \t\t}\n \t};\n \n@@ -460,6 +469,7 @@ public boolean visit(IResourceDelta delta) {\n \t\t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t\t}\n \t\t\t\t\t\t\t}\n+\t\t\t\t\t\t\treturn false;\n \t\t\t\t\t\t}\n \n \t\t\t\t\t\treturn true;\n@@ -696,9 +706,14 @@ public void run() {\n \t\t\t\t\t\t\tsetSelectionToViewer(mostRecentCommand\n \t\t\t\t\t\t\t\t\t.getAffectedObjects());\n \t\t\t\t\t\t}\n-\t\t\t\t\t\tif (propertySheetPage != null\n-\t\t\t\t\t\t\t\t&& !propertySheetPage.getControl().isDisposed()) {\n-\t\t\t\t\t\t\tpropertySheetPage.refresh();\n+\t\t\t\t\t\tfor (Iterator i = propertySheetPages\n+\t\t\t\t\t\t\t\t.iterator(); i.hasNext();) {\n+\t\t\t\t\t\t\tPropertySheetPage propertySheetPage = i.next();\n+\t\t\t\t\t\t\tif (propertySheetPage.getControl().isDisposed()) {\n+\t\t\t\t\t\t\t\ti.remove();\n+\t\t\t\t\t\t\t} else {\n+\t\t\t\t\t\t\t\tpropertySheetPage.refresh();\n+\t\t\t\t\t\t\t}\n \t\t\t\t\t\t}\n \t\t\t\t\t}\n \t\t\t\t});\n@@ -1382,25 +1397,24 @@ public void selectionChanged(SelectionChangedEvent event) {\n \t * @generated\n \t */\n \tpublic IPropertySheetPage getPropertySheetPage() {\n-\t\tif (propertySheetPage == null) {\n-\t\t\tpropertySheetPage = new ExtendedPropertySheetPage(editingDomain) {\n-\t\t\t\t@Override\n-\t\t\t\tpublic void setSelectionToViewer(List selection) {\n-\t\t\t\t\tEnvironmentEditor.this.setSelectionToViewer(selection);\n-\t\t\t\t\tEnvironmentEditor.this.setFocus();\n-\t\t\t\t}\n+\t\tPropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(\n+\t\t\t\teditingDomain) {\n+\t\t\t@Override\n+\t\t\tpublic void setSelectionToViewer(List selection) {\n+\t\t\t\tEnvironmentEditor.this.setSelectionToViewer(selection);\n+\t\t\t\tEnvironmentEditor.this.setFocus();\n+\t\t\t}\n \n-\t\t\t\t@Override\n-\t\t\t\tpublic void setActionBars(IActionBars actionBars) {\n-\t\t\t\t\tsuper.setActionBars(actionBars);\n-\t\t\t\t\tgetActionBarContributor().shareGlobalActions(this,\n-\t\t\t\t\t\t\tactionBars);\n-\t\t\t\t}\n-\t\t\t};\n-\t\t\tpropertySheetPage\n-\t\t\t\t\t.setPropertySourceProvider(new AdapterFactoryContentProvider(\n-\t\t\t\t\t\t\tadapterFactory));\n-\t\t}\n+\t\t\t@Override\n+\t\t\tpublic void setActionBars(IActionBars actionBars) {\n+\t\t\t\tsuper.setActionBars(actionBars);\n+\t\t\t\tgetActionBarContributor().shareGlobalActions(this, actionBars);\n+\t\t\t}\n+\t\t};\n+\t\tpropertySheetPage\n+\t\t\t\t.setPropertySourceProvider(new AdapterFactoryContentProvider(\n+\t\t\t\t\t\tadapterFactory));\n+\t\tpropertySheetPages.add(propertySheetPage);\n \n \t\treturn propertySheetPage;\n \t}\n@@ -1526,7 +1540,7 @@ public void execute(IProgressMonitor monitor) {\n \n \t/**\n \t * This returns whether something has been persisted to the URI of the specified resource.\n-\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \n+\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\n \t * \n \t * \n \t * @generated\n@@ -1599,22 +1613,10 @@ protected void doSaveAs(URI uri, IEditorInput editorInput) {\n \t * @generated\n \t */\n \tpublic void gotoMarker(IMarker marker) {\n-\t\ttry {\n-\t\t\tif (marker.getType().equals(EValidator.MARKER)) {\n-\t\t\t\tString uriAttribute = marker.getAttribute(\n-\t\t\t\t\t\tEValidator.URI_ATTRIBUTE, null);\n-\t\t\t\tif (uriAttribute != null) {\n-\t\t\t\t\tURI uri = URI.createURI(uriAttribute);\n-\t\t\t\t\tEObject eObject = editingDomain.getResourceSet()\n-\t\t\t\t\t\t\t.getEObject(uri, true);\n-\t\t\t\t\tif (eObject != null) {\n-\t\t\t\t\t\tsetSelectionToViewer(Collections\n-\t\t\t\t\t\t\t\t.singleton(editingDomain.getWrapper(eObject)));\n-\t\t\t\t\t}\n-\t\t\t\t}\n-\t\t\t}\n-\t\t} catch (CoreException exception) {\n-\t\t\tEnvironmentEditorPlugin.INSTANCE.log(exception);\n+\t\tList targetObjects = markerHelper.getTargetObjects(editingDomain,\n+\t\t\t\tmarker);\n+\t\tif (!targetObjects.isEmpty()) {\n+\t\t\tsetSelectionToViewer(targetObjects);\n \t\t}\n \t}\n \n@@ -1817,7 +1819,7 @@ public void dispose() {\n \t\t\tgetActionBarContributor().setActiveEditor(null);\n \t\t}\n \n-\t\tif (propertySheetPage != null) {\n+\t\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {\n \t\t\tpropertySheetPage.dispose();\n \t\t}\n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fpresentation%2FEnvironmentEditor.java","sha":"7d1af48e7b8bef10e75163f30933183c5ba25098","status":"modified"},{"additions":11,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.ecore","changes":20,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.ecore?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":9,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment/model/environment.ecore","new_code":" \n \n \n \n \n ","new_methods":[],"old_code":" \n \n \n \n ","old_methods":[],"patch":"@@ -73,18 +73,18 @@\n \n \n \n- \n+ \n \n \n \n \n- \n+ \n \n- \n+ \n \n \n \n \n- \n+ \n \n \n \n@@ -126,8 +126,10 @@\n \n \n- \n+ \n+ \n \n \n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.ecore","sha":"4d057bfbe3d1320d48245aa0b482b7b6183fecf2","status":"modified"},{"additions":17,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.genmodel","changes":31,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.genmodel?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":14,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment/model/environment.genmodel","new_code":" \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n ","new_methods":[],"old_code":" \n \n \n \n \n \n \n \n \n \n \n \n \n ","old_methods":[],"patch":"@@ -25,6 +25,7 @@\n \n \n \n+ \n \n \n \n@@ -72,19 +73,20 @@\n \n \n \n- \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n \n \n- \n- \n- \n- \n- \n- \n- \n- \n- \n- \n \n \n \n@@ -97,21 +99,22 @@\n \n \n \n- \n+ \n \n \n \n \n \n- \n- \n+ \n+ \n \n \n \n \n \n \n \n+ \n \n \n ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.genmodel","sha":"21ccc37ace974b8cc0106e761e2045f8cae15448","status":"modified"},{"additions":13,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FAttribute.java","changes":26,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FAttribute.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":13,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Attribute.java","new_code":" *
  • {@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}
    • \n\t * Returns the value of the 'Containing Type' container reference.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes Owned Attributes}'.\n\t * If the meaning of the 'Containing Type' container reference isn't clear,\n\t * @return the value of the 'Containing Type' container reference.\n\t * @see #setContainingType(StructuredType)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getAttribute_ContainingType()\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes\n\tStructuredType getContainingType();\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}' container reference.\n\t * @param value the new value of the 'Containing Type' container reference.\n\t * @see #getContainingType()\n\tvoid setContainingType(StructuredType value);","new_methods":[],"old_code":" *
  • {@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}
    • \n\t * Returns the value of the 'Dto' container reference.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes Owned Attributes}'.\n\t * If the meaning of the 'Dto' container reference isn't clear,\n\t * @return the value of the 'Dto' container reference.\n\t * @see #setDto(DTO)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getAttribute_Dto()\n\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedAttributes\n\tDTO getDto();\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}' container reference.\n\t * @param value the new value of the 'Dto' container reference.\n\t * @see #getDto()\n\tvoid setDto(DTO value);","old_methods":[],"patch":"@@ -21,7 +21,7 @@\n * The following features are supported:\n *
      \n *
    • {@link org.obeonetwork.dsl.environment.Attribute#getType Type}
      • \n- *
    • {@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}
      • \n+ *
    • {@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}
      • \n *
    \n *

    \n *\n@@ -64,31 +64,31 @@ public interface Attribute extends Property {\n \tvoid setType(PrimitiveType value);\n \n \t/**\n-\t * Returns the value of the 'Dto' container reference.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes Owned Attributes}'.\n+\t * Returns the value of the 'Containing Type' container reference.\n+\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes Owned Attributes}'.\n \t * \n \t *

    \n-\t * If the meaning of the 'Dto' container reference isn't clear,\n+\t * If the meaning of the 'Containing Type' container reference isn't clear,\n \t * there really should be more of a description here...\n \t *

    \n \t * \n-\t * @return the value of the 'Dto' container reference.\n-\t * @see #setDto(DTO)\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getAttribute_Dto()\n-\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedAttributes\n+\t * @return the value of the 'Containing Type' container reference.\n+\t * @see #setContainingType(StructuredType)\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getAttribute_ContainingType()\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes\n \t * @model opposite=\"ownedAttributes\" required=\"true\" transient=\"false\"\n \t * @generated\n \t */\n-\tDTO getDto();\n+\tStructuredType getContainingType();\n \n \t/**\n-\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}' container reference.\n+\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}' container reference.\n \t * \n \t * \n-\t * @param value the new value of the 'Dto' container reference.\n-\t * @see #getDto()\n+\t * @param value the new value of the 'Containing Type' container reference.\n+\t * @see #getContainingType()\n \t * @generated\n \t */\n-\tvoid setDto(DTO value);\n+\tvoid setContainingType(StructuredType value);\n \n } // Attribute","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FAttribute.java","sha":"55797de58d7d8ca444325cb71f9d9b884bd62bb7","status":"modified"},{"additions":0,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FDTO.java","changes":143,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FDTO.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":143,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/DTO.java","new_code":"","new_methods":[],"old_code":"import org.eclipse.emf.common.util.EList;\n\n *
  • {@link org.obeonetwork.dsl.environment.DTO#getAssociatedTypes Associated Types}
    • \n *
  • {@link org.obeonetwork.dsl.environment.DTO#getProperties Properties}
    • \n *
  • {@link org.obeonetwork.dsl.environment.DTO#getReferences References}
    • \n *
  • {@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences Owned References}
    • \n *
  • {@link org.obeonetwork.dsl.environment.DTO#getAttributes Attributes}
    • \n *
  • {@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes Owned Attributes}
    • \n *
  • {@link org.obeonetwork.dsl.environment.DTO#getSupertype Supertype}
    • \n\t/**\n\t * Returns the value of the 'Associated Types' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.StructuredType}.\n\t * \n\t *

    \n\t * If the meaning of the 'Associated Types' reference list isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Associated Types' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_AssociatedTypes()\n\t * @model\n\t * @generated\n\t */\n\tEList getAssociatedTypes();\n\n\t/**\n\t * Returns the value of the 'Properties' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\n\t * \n\t *

    \n\t * If the meaning of the 'Properties' reference list isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Properties' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Properties()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList getProperties();\n\n\t/**\n\t * Returns the value of the 'References' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n\t * \n\t *

    \n\t * If the meaning of the 'References' reference list isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'References' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_References()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList getReferences();\n\n\t/**\n\t * Returns the value of the 'Owned References' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Reference#getDto Dto}'.\n\t * \n\t *

    \n\t * If the meaning of the 'Owned References' containment reference list isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Owned References' containment reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_OwnedReferences()\n\t * @see org.obeonetwork.dsl.environment.Reference#getDto\n\t * @model opposite=\"dto\" containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList getOwnedReferences();\n\n\t/**\n\t * Returns the value of the 'Attributes' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n\t * \n\t *

    \n\t * If the meaning of the 'Attributes' reference list isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Attributes' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Attributes()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList getAttributes();\n\n\t/**\n\t * Returns the value of the 'Owned Attributes' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}'.\n\t * \n\t *

    \n\t * If the meaning of the 'Owned Attributes' containment reference list isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Owned Attributes' containment reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_OwnedAttributes()\n\t * @see org.obeonetwork.dsl.environment.Attribute#getDto\n\t * @model opposite=\"dto\" containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList getOwnedAttributes();\n\n\t/**\n\t * Returns the value of the 'Supertype' reference.\n\t * \n\t *

    \n\t * If the meaning of the 'Supertype' reference isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Supertype' reference.\n\t * @see #setSupertype(DTO)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Supertype()\n\t * @model\n\t * @generated\n\t */\n\tDTO getSupertype();\n\n\t/**\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.DTO#getSupertype Supertype}' reference.\n\t * \n\t * \n\t * @param value the new value of the 'Supertype' reference.\n\t * @see #getSupertype()\n\t * @generated\n\t */\n\tvoid setSupertype(DTO value);\n\n\t/**\n\t * \n\t * \n\t * @model required=\"true\"\n\t * @generated\n\t */\n\tboolean isSubtypeOf(DTO dto);\n","old_methods":[],"patch":"@@ -12,8 +12,6 @@\n */\n package org.obeonetwork.dsl.environment;\n \n-import org.eclipse.emf.common.util.EList;\n-\n /**\n * \n * A representation of the model object 'DTO'.\n@@ -23,13 +21,6 @@\n * The following features are supported:\n *
      \n *
    • {@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer Owned Container}
      • \n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getAssociatedTypes Associated Types}
      • \n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getProperties Properties}
      • \n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getReferences References}
      • \n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences Owned References}
      • \n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getAttributes Attributes}
      • \n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes Owned Attributes}
      • \n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getSupertype Supertype}
      • \n *
    \n *

    \n *\n@@ -71,138 +62,4 @@ public interface DTO extends StructuredType {\n \t */\n \tvoid setOwnedContainer(FilterContainer value);\n \n-\t/**\n-\t * Returns the value of the 'Associated Types' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.environment.StructuredType}.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'Associated Types' reference list isn't clear,\n-\t * there really should be more of a description here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'Associated Types' reference list.\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_AssociatedTypes()\n-\t * @model\n-\t * @generated\n-\t */\n-\tEList getAssociatedTypes();\n-\n-\t/**\n-\t * Returns the value of the 'Properties' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'Properties' reference list isn't clear,\n-\t * there really should be more of a description here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'Properties' reference list.\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Properties()\n-\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n-\t * @generated\n-\t */\n-\tEList getProperties();\n-\n-\t/**\n-\t * Returns the value of the 'References' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'References' reference list isn't clear,\n-\t * there really should be more of a description here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'References' reference list.\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_References()\n-\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n-\t * @generated\n-\t */\n-\tEList getReferences();\n-\n-\t/**\n-\t * Returns the value of the 'Owned References' containment reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Reference#getDto Dto}'.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'Owned References' containment reference list isn't clear,\n-\t * there really should be more of a description here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'Owned References' containment reference list.\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_OwnedReferences()\n-\t * @see org.obeonetwork.dsl.environment.Reference#getDto\n-\t * @model opposite=\"dto\" containment=\"true\" resolveProxies=\"true\"\n-\t * @generated\n-\t */\n-\tEList getOwnedReferences();\n-\n-\t/**\n-\t * Returns the value of the 'Attributes' reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'Attributes' reference list isn't clear,\n-\t * there really should be more of a description here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'Attributes' reference list.\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Attributes()\n-\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n-\t * @generated\n-\t */\n-\tEList getAttributes();\n-\n-\t/**\n-\t * Returns the value of the 'Owned Attributes' containment reference list.\n-\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}'.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'Owned Attributes' containment reference list isn't clear,\n-\t * there really should be more of a description here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'Owned Attributes' containment reference list.\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_OwnedAttributes()\n-\t * @see org.obeonetwork.dsl.environment.Attribute#getDto\n-\t * @model opposite=\"dto\" containment=\"true\" resolveProxies=\"true\"\n-\t * @generated\n-\t */\n-\tEList getOwnedAttributes();\n-\n-\t/**\n-\t * Returns the value of the 'Supertype' reference.\n-\t * \n-\t *

    \n-\t * If the meaning of the 'Supertype' reference isn't clear,\n-\t * there really should be more of a description here...\n-\t *

    \n-\t * \n-\t * @return the value of the 'Supertype' reference.\n-\t * @see #setSupertype(DTO)\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Supertype()\n-\t * @model\n-\t * @generated\n-\t */\n-\tDTO getSupertype();\n-\n-\t/**\n-\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.DTO#getSupertype Supertype}' reference.\n-\t * \n-\t * \n-\t * @param value the new value of the 'Supertype' reference.\n-\t * @see #getSupertype()\n-\t * @generated\n-\t */\n-\tvoid setSupertype(DTO value);\n-\n-\t/**\n-\t * \n-\t * \n-\t * @model required=\"true\"\n-\t * @generated\n-\t */\n-\tboolean isSubtypeOf(DTO dto);\n-\n } // DTO\n\\ No newline at end of file","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FDTO.java","sha":"3116b2339c707b49f0b287a50e851e129e93873c","status":"modified"},{"additions":17,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironment.java","changes":17,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironment.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Environment.java","new_code":" *
  • {@link org.obeonetwork.dsl.environment.Environment#getNamespaces Namespaces}
    • \n\t/**\n\t * Returns the value of the 'Namespaces' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Namespace}.\n\t * \n\t *

    \n\t * If the meaning of the 'Namespaces' containment reference list isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Namespaces' containment reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getEnvironment_Namespaces()\n\t * @model containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList getNamespaces();\n","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -27,6 +27,7 @@\n *
  • {@link org.obeonetwork.dsl.environment.Environment#getLinks Links}
    • \n *
  • {@link org.obeonetwork.dsl.environment.Environment#getPriorityDefinitions Priority Definitions}
    • \n *
  • {@link org.obeonetwork.dsl.environment.Environment#getTypesDefinition Types Definition}
    • \n+ *
  • {@link org.obeonetwork.dsl.environment.Environment#getNamespaces Namespaces}
    • \n * \n *

    \n *\n@@ -152,4 +153,20 @@ public interface Environment extends ObeoDSMObject {\n \t */\n \tvoid setTypesDefinition(TypesDefinition value);\n \n+\t/**\n+\t * Returns the value of the 'Namespaces' containment reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Namespace}.\n+\t * \n+\t *

    \n+\t * If the meaning of the 'Namespaces' containment reference list isn't clear,\n+\t * there really should be more of a description here...\n+\t *

    \n+\t * \n+\t * @return the value of the 'Namespaces' containment reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getEnvironment_Namespaces()\n+\t * @model containment=\"true\" resolveProxies=\"true\"\n+\t * @generated\n+\t */\n+\tEList getNamespaces();\n+\n } // Environment\n\\ No newline at end of file","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironment.java","sha":"d12b9d6b00192c815cdaa2a7d68c3eedad619761","status":"modified"},{"additions":1,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentFactory.java","changes":3,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":2,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/EnvironmentFactory.java","new_code":"","new_methods":[],"old_code":" *\n * $Id$","old_methods":[],"patch":"@@ -7,8 +7,6 @@\n * \n * Contributors:\n * Obeo - initial API and implementation\n- *\n- * $Id$\n */\n package org.obeonetwork.dsl.environment;\n \n@@ -29,6 +27,7 @@ public interface EnvironmentFactory extends EFactory {\n \t * @generated\n \t */\n \tString copyright = \"Copyright (c) 2008-2009 Obeo.\\nAll rights reserved. This program and the accompanying materials\\nare made available under the terms of the Eclipse Public License v1.0\\nwhich accompanies this distribution, and is available at\\nhttp://www.eclipse.org/legal/epl-v10.html\\n\\nContributors:\\n Obeo - initial API and implementation\";\n+\n \t/**\n \t * The singleton instance of the factory.\n \t * ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentFactory.java","sha":"14106c175d69af813b603e9f164035dbac591a3f","status":"modified"},{"additions":346,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentPackage.java","changes":536,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentPackage.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":190,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/EnvironmentPackage.java","new_code":"\tString eNS_URI = \"http://www.obeonetwork.org/dsl/environment/3.0.0\";\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnvironmentImpl Environment}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnvironment()\n\t * @generated\n\t */\n\tint ENVIRONMENT = 0;\n\n\t/**\n\t * The feature id for the 'Namespaces' containment reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint ENVIRONMENT__NAMESPACES = OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n\n\tint ENVIRONMENT_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 6;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl Type}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.TypeImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getType()\n\t * @generated\n\t */\n\tint TYPE = 1;\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl Primitive Type}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getPrimitiveType()\n\t * @generated\n\t */\n\tint PRIMITIVE_TYPE = 2;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnumerationImpl Enumeration}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.EnumerationImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnumeration()\n\t * @generated\n\t */\n\tint ENUMERATION = 3;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FieldImpl Field}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.FieldImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getField()\n\t * @generated\n\t */\n\tint FIELD = 4;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ActionImpl Action}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.ActionImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getAction()\n\t * @generated\n\t */\n\tint ACTION = 5;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl Inter DSM Link}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getInterDSMLink()\n\t * @generated\n\t */\n\tint INTER_DSM_LINK = 6;\n\n\t/**\n\t * The feature id for the 'Supertype' reference.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__SUPERTYPE = TYPE_FEATURE_COUNT + 0;\n\n\t/**\n\t * The feature id for the 'Associated Types' reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__ASSOCIATED_TYPES = TYPE_FEATURE_COUNT + 1;\n\n\t/**\n\t * The feature id for the 'Owned Attributes' containment reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__OWNED_ATTRIBUTES = TYPE_FEATURE_COUNT + 2;\n\n\t/**\n\t * The feature id for the 'Attributes' reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__ATTRIBUTES = TYPE_FEATURE_COUNT + 3;\n\n\t/**\n\t * The feature id for the 'Owned References' containment reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__OWNED_REFERENCES = TYPE_FEATURE_COUNT + 4;\n\n\t/**\n\t * The feature id for the 'References' reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__REFERENCES = TYPE_FEATURE_COUNT + 5;\n\n\t/**\n\t * The feature id for the 'Properties' reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint STRUCTURED_TYPE__PROPERTIES = TYPE_FEATURE_COUNT + 6;\n\n\tint STRUCTURED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 7;\n\t * The feature id for the 'Supertype' reference.\n\tint DTO__SUPERTYPE = STRUCTURED_TYPE__SUPERTYPE;\n\tint DTO__ASSOCIATED_TYPES = STRUCTURED_TYPE__ASSOCIATED_TYPES;\n\t * The feature id for the 'Owned Attributes' containment reference list.\n\tint DTO__OWNED_ATTRIBUTES = STRUCTURED_TYPE__OWNED_ATTRIBUTES;\n\t * The feature id for the 'Attributes' reference list.\n\tint DTO__ATTRIBUTES = STRUCTURED_TYPE__ATTRIBUTES;\n\tint DTO__OWNED_REFERENCES = STRUCTURED_TYPE__OWNED_REFERENCES;\n\t * The feature id for the 'References' reference list.\n\tint DTO__REFERENCES = STRUCTURED_TYPE__REFERENCES;\n\t * The feature id for the 'Properties' reference list.\n\tint DTO__PROPERTIES = STRUCTURED_TYPE__PROPERTIES;\n\t * The feature id for the 'Owned Container' containment reference.\n\tint DTO__OWNED_CONTAINER = STRUCTURED_TYPE_FEATURE_COUNT + 0;\n\tint DTO_FEATURE_COUNT = STRUCTURED_TYPE_FEATURE_COUNT + 1;\n\tint NAMESPACE__METADATAS = TYPES_DEFINITION__METADATAS;\n\tint NAMESPACE__DESCRIPTION = TYPES_DEFINITION__DESCRIPTION;\n\tint NAMESPACE__KEYWORDS = TYPES_DEFINITION__KEYWORDS;\n\tint NAMESPACE__BEHAVIOURS = TYPES_DEFINITION__BEHAVIOURS;\n\tint NAMESPACE__BINDING_REGISTRIES = TYPES_DEFINITION__BINDING_REGISTRIES;\n\tint NAMESPACE__VERSION = TYPES_DEFINITION__VERSION;\n\tint NAMESPACE__CREATED_ON = TYPES_DEFINITION__CREATED_ON;\n\tint NAMESPACE__MODIFIED_ON = TYPES_DEFINITION__MODIFIED_ON;\n\n\t/**\n\t * The feature id for the 'Types' containment reference list.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint NAMESPACE__TYPES = TYPES_DEFINITION__TYPES;\n\tint NAMESPACE__OWNED_NAMESPACES = TYPES_DEFINITION_FEATURE_COUNT + 0;\n\tint NAMESPACE__OWNER = TYPES_DEFINITION_FEATURE_COUNT + 1;\n\tint NAMESPACE__NAME = TYPES_DEFINITION_FEATURE_COUNT + 2;\n\tint NAMESPACE_FEATURE_COUNT = TYPES_DEFINITION_FEATURE_COUNT + 3;\n\t/**\n\t * The feature id for the 'Is Identifier' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint PROPERTY__IS_IDENTIFIER = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\n\tint PROPERTY_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n\t/**\n\t * The feature id for the 'Is Identifier' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint ATTRIBUTE__IS_IDENTIFIER = PROPERTY__IS_IDENTIFIER;\n\n\t * The feature id for the 'Containing Type' container reference.\n\tint ATTRIBUTE__CONTAINING_TYPE = PROPERTY_FEATURE_COUNT + 1;\n\t/**\n\t * The feature id for the 'Is Identifier' attribute.\n\t * \n\t * \n\t * @generated\n\t * @ordered\n\t */\n\tint REFERENCE__IS_IDENTIFIER = PROPERTY__IS_IDENTIFIER;\n\n\t * The feature id for the 'Containing Type' container reference.\n\tint REFERENCE__CONTAINING_TYPE = PROPERTY_FEATURE_COUNT + 3;\n\t * The feature id for the 'Referenced Type' reference.\n\tint REFERENCE__REFERENCED_TYPE = PROPERTY_FEATURE_COUNT + 4;\n\t/**\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.Environment#getNamespaces Namespaces}'.\n\t * \n\t * \n\t * @return the meta object for the containment reference list 'Namespaces'.\n\t * @see org.obeonetwork.dsl.environment.Environment#getNamespaces()\n\t * @see #getEnvironment()\n\t * @generated\n\t */\n\tEReference getEnvironment_Namespaces();\n\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype Supertype}'.\n\t * @return the meta object for the reference 'Supertype'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getSupertype()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_Supertype();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes Associated Types}'.\n\t * @return the meta object for the reference list 'Associated Types'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_AssociatedTypes();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes Owned Attributes}'.\n\t * @return the meta object for the containment reference list 'Owned Attributes'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_OwnedAttributes();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getAttributes Attributes}'.\n\t * @return the meta object for the reference list 'Attributes'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getAttributes()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_Attributes();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences Owned References}'.\n\t * @return the meta object for the containment reference list 'Owned References'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_OwnedReferences();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getReferences References}'.\n\t * @return the meta object for the reference list 'References'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getReferences()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_References();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getProperties Properties}'.\n\t * @return the meta object for the reference list 'Properties'.\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getProperties()\n\t * @see #getStructuredType()\n\tEReference getStructuredType_Properties();\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.DTO DTO}'.\n\t * @return the meta object for class 'DTO'.\n\t * @see org.obeonetwork.dsl.environment.DTO\n\tEClass getDTO();\n\t * Returns the meta object for the containment reference '{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer Owned Container}'.\n\t * @return the meta object for the containment reference 'Owned Container'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedContainer()\n\tEReference getDTO_OwnedContainer();\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}'.\n\t * @return the meta object for the container reference 'Containing Type'.\n\t * @see org.obeonetwork.dsl.environment.Attribute#getContainingType()\n\tEReference getAttribute_ContainingType();\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}'.\n\t * @return the meta object for the container reference 'Containing Type'.\n\t * @see org.obeonetwork.dsl.environment.Reference#getContainingType()\n\tEReference getReference_ContainingType();\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.Reference#getReferencedType Referenced Type}'.\n\t * @return the meta object for the reference 'Referenced Type'.\n\t * @see org.obeonetwork.dsl.environment.Reference#getReferencedType()\n\tEReference getReference_ReferencedType();\n\t/**\n\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier Is Identifier}'.\n\t * \n\t * \n\t * @return the meta object for the attribute 'Is Identifier'.\n\t * @see org.obeonetwork.dsl.environment.Property#isIsIdentifier()\n\t * @see #getProperty()\n\t * @generated\n\t */\n\tEAttribute getProperty_IsIdentifier();\n\n\t\t/**\n\t\t * The meta object literal for the 'Namespaces' containment reference list feature.\n\t\t * \n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEReference ENVIRONMENT__NAMESPACES = eINSTANCE\n\t\t\t\t.getEnvironment_Namespaces();\n\n\t\t * The meta object literal for the 'Supertype' reference feature.\n\t\tEReference STRUCTURED_TYPE__SUPERTYPE = eINSTANCE\n\t\t\t\t.getStructuredType_Supertype();\n\t\t * The meta object literal for the 'Associated Types' reference list feature.\n\t\tEReference STRUCTURED_TYPE__ASSOCIATED_TYPES = eINSTANCE\n\t\t\t\t.getStructuredType_AssociatedTypes();\n\t\t * The meta object literal for the 'Owned Attributes' containment reference list feature.\n\t\tEReference STRUCTURED_TYPE__OWNED_ATTRIBUTES = eINSTANCE\n\t\t\t\t.getStructuredType_OwnedAttributes();\n\t\t * The meta object literal for the 'Attributes' reference list feature.\n\t\tEReference STRUCTURED_TYPE__ATTRIBUTES = eINSTANCE\n\t\t\t\t.getStructuredType_Attributes();\n\t\t * The meta object literal for the 'Owned References' containment reference list feature.\n\t\tEReference STRUCTURED_TYPE__OWNED_REFERENCES = eINSTANCE\n\t\t\t\t.getStructuredType_OwnedReferences();\n\t\t * The meta object literal for the 'References' reference list feature.\n\t\tEReference STRUCTURED_TYPE__REFERENCES = eINSTANCE\n\t\t\t\t.getStructuredType_References();\n\t\t * The meta object literal for the 'Properties' reference list feature.\n\t\tEReference STRUCTURED_TYPE__PROPERTIES = eINSTANCE\n\t\t\t\t.getStructuredType_Properties();\n\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl DTO}' class.\n\t\t * @see org.obeonetwork.dsl.environment.impl.DTOImpl\n\t\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getDTO()\n\t\tEClass DTO = eINSTANCE.getDTO();\n\t\t * The meta object literal for the 'Owned Container' containment reference feature.\n\t\tEReference DTO__OWNED_CONTAINER = eINSTANCE.getDTO_OwnedContainer();\n\t\t * The meta object literal for the 'Containing Type' container reference feature.\n\t\tEReference ATTRIBUTE__CONTAINING_TYPE = eINSTANCE\n\t\t\t\t.getAttribute_ContainingType();\n\t\t * The meta object literal for the 'Containing Type' container reference feature.\n\t\tEReference REFERENCE__CONTAINING_TYPE = eINSTANCE\n\t\t\t\t.getReference_ContainingType();\n\t\t * The meta object literal for the 'Referenced Type' reference feature.\n\t\tEReference REFERENCE__REFERENCED_TYPE = eINSTANCE\n\t\t\t\t.getReference_ReferencedType();\n\t\t/**\n\t\t * The meta object literal for the 'Is Identifier' attribute feature.\n\t\t * \n\t\t * \n\t\t * @generated\n\t\t */\n\t\tEAttribute PROPERTY__IS_IDENTIFIER = eINSTANCE\n\t\t\t\t.getProperty_IsIdentifier();\n","new_methods":[],"old_code":" *\n * $Id$\n\tString eNS_URI = \"http://www.obeonetwork.org/dsl/environment/2.0.0\";\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnvironmentImpl Environment}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnvironment()\n\t * @generated\n\t */\n\tint ENVIRONMENT = 0;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl Type}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.TypeImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getType()\n\t * @generated\n\t */\n\tint TYPE = 1;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl Primitive Type}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getPrimitiveType()\n\t * @generated\n\t */\n\tint PRIMITIVE_TYPE = 2;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnumerationImpl Enumeration}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.EnumerationImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnumeration()\n\t * @generated\n\t */\n\tint ENUMERATION = 3;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FieldImpl Field}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.FieldImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getField()\n\t * @generated\n\t */\n\tint FIELD = 4;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ActionImpl Action}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.ActionImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getAction()\n\t * @generated\n\t */\n\tint ACTION = 5;\n\n\t/**\n\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl Inter DSM Link}' class.\n\t * \n\t * \n\t * @see org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl\n\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getInterDSMLink()\n\t * @generated\n\t */\n\tint INTER_DSM_LINK = 6;\n\n\tint ENVIRONMENT_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n\tint STRUCTURED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 0;\n\t * The feature id for the 'Owned Container' containment reference.\n\tint DTO__OWNED_CONTAINER = STRUCTURED_TYPE_FEATURE_COUNT + 0;\n\tint DTO__ASSOCIATED_TYPES = STRUCTURED_TYPE_FEATURE_COUNT + 1;\n\t * The feature id for the 'Properties' reference list.\n\tint DTO__PROPERTIES = STRUCTURED_TYPE_FEATURE_COUNT + 2;\n\t * The feature id for the 'References' reference list.\n\tint DTO__REFERENCES = STRUCTURED_TYPE_FEATURE_COUNT + 3;\n\tint DTO__OWNED_REFERENCES = STRUCTURED_TYPE_FEATURE_COUNT + 4;\n\t * The feature id for the 'Attributes' reference list.\n\tint DTO__ATTRIBUTES = STRUCTURED_TYPE_FEATURE_COUNT + 5;\n\t * The feature id for the 'Owned Attributes' containment reference list.\n\tint DTO__OWNED_ATTRIBUTES = STRUCTURED_TYPE_FEATURE_COUNT + 6;\n\t * The feature id for the 'Supertype' reference.\n\tint DTO__SUPERTYPE = STRUCTURED_TYPE_FEATURE_COUNT + 7;\n\tint DTO_FEATURE_COUNT = STRUCTURED_TYPE_FEATURE_COUNT + 8;\n\tint NAMESPACE__METADATAS = OBEO_DSM_OBJECT__METADATAS;\n\tint NAMESPACE__DESCRIPTION = OBEO_DSM_OBJECT__DESCRIPTION;\n\tint NAMESPACE__KEYWORDS = OBEO_DSM_OBJECT__KEYWORDS;\n\tint NAMESPACE__BEHAVIOURS = OBEO_DSM_OBJECT__BEHAVIOURS;\n\tint NAMESPACE__BINDING_REGISTRIES = OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n\tint NAMESPACE__VERSION = OBEO_DSM_OBJECT__VERSION;\n\tint NAMESPACE__CREATED_ON = OBEO_DSM_OBJECT__CREATED_ON;\n\tint NAMESPACE__MODIFIED_ON = OBEO_DSM_OBJECT__MODIFIED_ON;\n\tint NAMESPACE__OWNED_NAMESPACES = OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n\tint NAMESPACE__OWNER = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n\tint NAMESPACE__NAME = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\tint NAMESPACE_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n\tint PROPERTY_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n\t * The feature id for the 'Dto' container reference.\n\tint ATTRIBUTE__DTO = PROPERTY_FEATURE_COUNT + 1;\n\t * The feature id for the 'Type' reference.\n\tint REFERENCE__TYPE = PROPERTY_FEATURE_COUNT + 3;\n\t * The feature id for the 'Dto' container reference.\n\tint REFERENCE__DTO = PROPERTY_FEATURE_COUNT + 4;\n\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.DTO DTO}'.\n\t * @return the meta object for class 'DTO'.\n\t * @see org.obeonetwork.dsl.environment.DTO\n\tEClass getDTO();\n\t * Returns the meta object for the containment reference '{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer Owned Container}'.\n\t * @return the meta object for the containment reference 'Owned Container'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedContainer()\n\t * @see #getDTO()\n\tEReference getDTO_OwnedContainer();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getAssociatedTypes Associated Types}'.\n\t * @return the meta object for the reference list 'Associated Types'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getAssociatedTypes()\n\t * @see #getDTO()\n\tEReference getDTO_AssociatedTypes();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getProperties Properties}'.\n\t * @return the meta object for the reference list 'Properties'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getProperties()\n\t * @see #getDTO()\n\tEReference getDTO_Properties();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getReferences References}'.\n\t * @return the meta object for the reference list 'References'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getReferences()\n\t * @see #getDTO()\n\tEReference getDTO_References();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences Owned References}'.\n\t * @return the meta object for the containment reference list 'Owned References'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedReferences()\n\t * @see #getDTO()\n\tEReference getDTO_OwnedReferences();\n\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getAttributes Attributes}'.\n\t * @return the meta object for the reference list 'Attributes'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getAttributes()\n\t * @see #getDTO()\n\tEReference getDTO_Attributes();\n\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes Owned Attributes}'.\n\t * @return the meta object for the containment reference list 'Owned Attributes'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedAttributes()\n\t * @see #getDTO()\n\tEReference getDTO_OwnedAttributes();\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.DTO#getSupertype Supertype}'.\n\t * @return the meta object for the reference 'Supertype'.\n\t * @see org.obeonetwork.dsl.environment.DTO#getSupertype()\n\tEReference getDTO_Supertype();\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}'.\n\t * @return the meta object for the container reference 'Dto'.\n\t * @see org.obeonetwork.dsl.environment.Attribute#getDto()\n\tEReference getAttribute_Dto();\n\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.Reference#getType Type}'.\n\t * @return the meta object for the reference 'Type'.\n\t * @see org.obeonetwork.dsl.environment.Reference#getType()\n\tEReference getReference_Type();\n\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Reference#getDto Dto}'.\n\t * @return the meta object for the container reference 'Dto'.\n\t * @see org.obeonetwork.dsl.environment.Reference#getDto()\n\tEReference getReference_Dto();\n\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl DTO}' class.\n\t\t * @see org.obeonetwork.dsl.environment.impl.DTOImpl\n\t\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getDTO()\n\t\tEClass DTO = eINSTANCE.getDTO();\n\t\t * The meta object literal for the 'Owned Container' containment reference feature.\n\t\tEReference DTO__OWNED_CONTAINER = eINSTANCE.getDTO_OwnedContainer();\n\t\t * The meta object literal for the 'Associated Types' reference list feature.\n\t\tEReference DTO__ASSOCIATED_TYPES = eINSTANCE.getDTO_AssociatedTypes();\n\t\t * The meta object literal for the 'Properties' reference list feature.\n\t\tEReference DTO__PROPERTIES = eINSTANCE.getDTO_Properties();\n\t\t * The meta object literal for the 'References' reference list feature.\n\t\tEReference DTO__REFERENCES = eINSTANCE.getDTO_References();\n\t\t * The meta object literal for the 'Owned References' containment reference list feature.\n\t\tEReference DTO__OWNED_REFERENCES = eINSTANCE.getDTO_OwnedReferences();\n\t\t * The meta object literal for the 'Attributes' reference list feature.\n\t\tEReference DTO__ATTRIBUTES = eINSTANCE.getDTO_Attributes();\n\t\t * The meta object literal for the 'Owned Attributes' containment reference list feature.\n\t\tEReference DTO__OWNED_ATTRIBUTES = eINSTANCE.getDTO_OwnedAttributes();\n\t\t * The meta object literal for the 'Supertype' reference feature.\n\t\tEReference DTO__SUPERTYPE = eINSTANCE.getDTO_Supertype();\n\t\t * The meta object literal for the 'Dto' container reference feature.\n\t\tEReference ATTRIBUTE__DTO = eINSTANCE.getAttribute_Dto();\n\t\t * The meta object literal for the 'Type' reference feature.\n\t\tEReference REFERENCE__TYPE = eINSTANCE.getReference_Type();\n\t\t * The meta object literal for the 'Dto' container reference feature.\n\t\tEReference REFERENCE__DTO = eINSTANCE.getReference_Dto();","old_methods":[],"patch":"@@ -7,8 +7,6 @@\n * \n * Contributors:\n * Obeo - initial API and implementation\n- *\n- * $Id$\n */\n package org.obeonetwork.dsl.environment;\n \n@@ -55,7 +53,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * \n \t * @generated\n \t */\n-\tString eNS_URI = \"http://www.obeonetwork.org/dsl/environment/2.0.0\";\n+\tString eNS_URI = \"http://www.obeonetwork.org/dsl/environment/3.0.0\";\n \n \t/**\n \t * The package namespace name.\n@@ -74,76 +72,6 @@ public interface EnvironmentPackage extends EPackage {\n \tEnvironmentPackage eINSTANCE = org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl\n \t\t\t.init();\n \n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnvironmentImpl Environment}' class.\n-\t * \n-\t * \n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnvironment()\n-\t * @generated\n-\t */\n-\tint ENVIRONMENT = 0;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl Type}' class.\n-\t * \n-\t * \n-\t * @see org.obeonetwork.dsl.environment.impl.TypeImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getType()\n-\t * @generated\n-\t */\n-\tint TYPE = 1;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl Primitive Type}' class.\n-\t * \n-\t * \n-\t * @see org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getPrimitiveType()\n-\t * @generated\n-\t */\n-\tint PRIMITIVE_TYPE = 2;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnumerationImpl Enumeration}' class.\n-\t * \n-\t * \n-\t * @see org.obeonetwork.dsl.environment.impl.EnumerationImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnumeration()\n-\t * @generated\n-\t */\n-\tint ENUMERATION = 3;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FieldImpl Field}' class.\n-\t * \n-\t * \n-\t * @see org.obeonetwork.dsl.environment.impl.FieldImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getField()\n-\t * @generated\n-\t */\n-\tint FIELD = 4;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ActionImpl Action}' class.\n-\t * \n-\t * \n-\t * @see org.obeonetwork.dsl.environment.impl.ActionImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getAction()\n-\t * @generated\n-\t */\n-\tint ACTION = 5;\n-\n-\t/**\n-\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl Inter DSM Link}' class.\n-\t * \n-\t * \n-\t * @see org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl\n-\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getInterDSMLink()\n-\t * @generated\n-\t */\n-\tint INTER_DSM_LINK = 6;\n-\n \t/**\n \t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ObeoDSMObjectImpl Obeo DSM Object}' class.\n \t * \n@@ -235,6 +163,16 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint OBEO_DSM_OBJECT_FEATURE_COUNT = 8;\n \n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnvironmentImpl Environment}' class.\n+\t * \n+\t * \n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnvironment()\n+\t * @generated\n+\t */\n+\tint ENVIRONMENT = 0;\n+\n \t/**\n \t * The feature id for the 'Metadatas' containment reference.\n \t * \n@@ -352,14 +290,33 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint ENVIRONMENT__TYPES_DEFINITION = OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\n \n+\t/**\n+\t * The feature id for the 'Namespaces' containment reference list.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint ENVIRONMENT__NAMESPACES = OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n+\n \t/**\n \t * The number of structural features of the 'Environment' class.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ENVIRONMENT_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\n+\tint ENVIRONMENT_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 6;\n+\n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl Type}' class.\n+\t * \n+\t * \n+\t * @see org.obeonetwork.dsl.environment.impl.TypeImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getType()\n+\t * @generated\n+\t */\n+\tint TYPE = 1;\n \n \t/**\n \t * The feature id for the 'Metadatas' containment reference.\n@@ -460,6 +417,16 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint TYPE_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n \n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl Primitive Type}' class.\n+\t * \n+\t * \n+\t * @see org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getPrimitiveType()\n+\t * @generated\n+\t */\n+\tint PRIMITIVE_TYPE = 2;\n+\n \t/**\n \t * The feature id for the 'Metadatas' containment reference.\n \t * \n@@ -559,6 +526,16 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint PRIMITIVE_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 0;\n \n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnumerationImpl Enumeration}' class.\n+\t * \n+\t * \n+\t * @see org.obeonetwork.dsl.environment.impl.EnumerationImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnumeration()\n+\t * @generated\n+\t */\n+\tint ENUMERATION = 3;\n+\n \t/**\n \t * The feature id for the 'Metadatas' containment reference.\n \t * \n@@ -667,6 +644,16 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint ENUMERATION_FEATURE_COUNT = TYPE_FEATURE_COUNT + 1;\n \n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FieldImpl Field}' class.\n+\t * \n+\t * \n+\t * @see org.obeonetwork.dsl.environment.impl.FieldImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getField()\n+\t * @generated\n+\t */\n+\tint FIELD = 4;\n+\n \t/**\n \t * The feature id for the 'Metadatas' containment reference.\n \t * \n@@ -757,6 +744,16 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint FIELD_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n \n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ActionImpl Action}' class.\n+\t * \n+\t * \n+\t * @see org.obeonetwork.dsl.environment.impl.ActionImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getAction()\n+\t * @generated\n+\t */\n+\tint ACTION = 5;\n+\n \t/**\n \t * The feature id for the 'Metadatas' containment reference.\n \t * \n@@ -847,6 +844,16 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint ACTION_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n \n+\t/**\n+\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl Inter DSM Link}' class.\n+\t * \n+\t * \n+\t * @see org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl\n+\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getInterDSMLink()\n+\t * @generated\n+\t */\n+\tint INTER_DSM_LINK = 6;\n+\n \t/**\n \t * The feature id for the 'Metadatas' containment reference.\n \t * \n@@ -1521,14 +1528,77 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint STRUCTURED_TYPE__TYPE_DEFINITION = TYPE__TYPE_DEFINITION;\n \n+\t/**\n+\t * The feature id for the 'Supertype' reference.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__SUPERTYPE = TYPE_FEATURE_COUNT + 0;\n+\n+\t/**\n+\t * The feature id for the 'Associated Types' reference list.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__ASSOCIATED_TYPES = TYPE_FEATURE_COUNT + 1;\n+\n+\t/**\n+\t * The feature id for the 'Owned Attributes' containment reference list.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__OWNED_ATTRIBUTES = TYPE_FEATURE_COUNT + 2;\n+\n+\t/**\n+\t * The feature id for the 'Attributes' reference list.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__ATTRIBUTES = TYPE_FEATURE_COUNT + 3;\n+\n+\t/**\n+\t * The feature id for the 'Owned References' containment reference list.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__OWNED_REFERENCES = TYPE_FEATURE_COUNT + 4;\n+\n+\t/**\n+\t * The feature id for the 'References' reference list.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__REFERENCES = TYPE_FEATURE_COUNT + 5;\n+\n+\t/**\n+\t * The feature id for the 'Properties' reference list.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint STRUCTURED_TYPE__PROPERTIES = TYPE_FEATURE_COUNT + 6;\n+\n \t/**\n \t * The number of structural features of the 'Structured Type' class.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint STRUCTURED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 0;\n+\tint STRUCTURED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 7;\n \n \t/**\n \t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl DTO}' class.\n@@ -1631,13 +1701,13 @@ public interface EnvironmentPackage extends EPackage {\n \tint DTO__TYPE_DEFINITION = STRUCTURED_TYPE__TYPE_DEFINITION;\n \n \t/**\n-\t * The feature id for the 'Owned Container' containment reference.\n+\t * The feature id for the 'Supertype' reference.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__OWNED_CONTAINER = STRUCTURED_TYPE_FEATURE_COUNT + 0;\n+\tint DTO__SUPERTYPE = STRUCTURED_TYPE__SUPERTYPE;\n \n \t/**\n \t * The feature id for the 'Associated Types' reference list.\n@@ -1646,25 +1716,25 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__ASSOCIATED_TYPES = STRUCTURED_TYPE_FEATURE_COUNT + 1;\n+\tint DTO__ASSOCIATED_TYPES = STRUCTURED_TYPE__ASSOCIATED_TYPES;\n \n \t/**\n-\t * The feature id for the 'Properties' reference list.\n+\t * The feature id for the 'Owned Attributes' containment reference list.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__PROPERTIES = STRUCTURED_TYPE_FEATURE_COUNT + 2;\n+\tint DTO__OWNED_ATTRIBUTES = STRUCTURED_TYPE__OWNED_ATTRIBUTES;\n \n \t/**\n-\t * The feature id for the 'References' reference list.\n+\t * The feature id for the 'Attributes' reference list.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__REFERENCES = STRUCTURED_TYPE_FEATURE_COUNT + 3;\n+\tint DTO__ATTRIBUTES = STRUCTURED_TYPE__ATTRIBUTES;\n \n \t/**\n \t * The feature id for the 'Owned References' containment reference list.\n@@ -1673,34 +1743,34 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__OWNED_REFERENCES = STRUCTURED_TYPE_FEATURE_COUNT + 4;\n+\tint DTO__OWNED_REFERENCES = STRUCTURED_TYPE__OWNED_REFERENCES;\n \n \t/**\n-\t * The feature id for the 'Attributes' reference list.\n+\t * The feature id for the 'References' reference list.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__ATTRIBUTES = STRUCTURED_TYPE_FEATURE_COUNT + 5;\n+\tint DTO__REFERENCES = STRUCTURED_TYPE__REFERENCES;\n \n \t/**\n-\t * The feature id for the 'Owned Attributes' containment reference list.\n+\t * The feature id for the 'Properties' reference list.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__OWNED_ATTRIBUTES = STRUCTURED_TYPE_FEATURE_COUNT + 6;\n+\tint DTO__PROPERTIES = STRUCTURED_TYPE__PROPERTIES;\n \n \t/**\n-\t * The feature id for the 'Supertype' reference.\n+\t * The feature id for the 'Owned Container' containment reference.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO__SUPERTYPE = STRUCTURED_TYPE_FEATURE_COUNT + 7;\n+\tint DTO__OWNED_CONTAINER = STRUCTURED_TYPE_FEATURE_COUNT + 0;\n \n \t/**\n \t * The number of structural features of the 'DTO' class.\n@@ -1709,7 +1779,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint DTO_FEATURE_COUNT = STRUCTURED_TYPE_FEATURE_COUNT + 8;\n+\tint DTO_FEATURE_COUNT = STRUCTURED_TYPE_FEATURE_COUNT + 1;\n \n \t/**\n \t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FilterContainerImpl Filter Container}' class.\n@@ -1919,7 +1989,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__METADATAS = OBEO_DSM_OBJECT__METADATAS;\n+\tint NAMESPACE__METADATAS = TYPES_DEFINITION__METADATAS;\n \n \t/**\n \t * The feature id for the 'Description' attribute.\n@@ -1928,7 +1998,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__DESCRIPTION = OBEO_DSM_OBJECT__DESCRIPTION;\n+\tint NAMESPACE__DESCRIPTION = TYPES_DEFINITION__DESCRIPTION;\n \n \t/**\n \t * The feature id for the 'Keywords' attribute list.\n@@ -1937,7 +2007,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__KEYWORDS = OBEO_DSM_OBJECT__KEYWORDS;\n+\tint NAMESPACE__KEYWORDS = TYPES_DEFINITION__KEYWORDS;\n \n \t/**\n \t * The feature id for the 'Behaviours' containment reference list.\n@@ -1946,7 +2016,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__BEHAVIOURS = OBEO_DSM_OBJECT__BEHAVIOURS;\n+\tint NAMESPACE__BEHAVIOURS = TYPES_DEFINITION__BEHAVIOURS;\n \n \t/**\n \t * The feature id for the 'Binding Registries' reference list.\n@@ -1955,7 +2025,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__BINDING_REGISTRIES = OBEO_DSM_OBJECT__BINDING_REGISTRIES;\n+\tint NAMESPACE__BINDING_REGISTRIES = TYPES_DEFINITION__BINDING_REGISTRIES;\n \n \t/**\n \t * The feature id for the 'Version' attribute.\n@@ -1964,7 +2034,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__VERSION = OBEO_DSM_OBJECT__VERSION;\n+\tint NAMESPACE__VERSION = TYPES_DEFINITION__VERSION;\n \n \t/**\n \t * The feature id for the 'Created On' attribute.\n@@ -1973,7 +2043,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__CREATED_ON = OBEO_DSM_OBJECT__CREATED_ON;\n+\tint NAMESPACE__CREATED_ON = TYPES_DEFINITION__CREATED_ON;\n \n \t/**\n \t * The feature id for the 'Modified On' attribute.\n@@ -1982,7 +2052,16 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__MODIFIED_ON = OBEO_DSM_OBJECT__MODIFIED_ON;\n+\tint NAMESPACE__MODIFIED_ON = TYPES_DEFINITION__MODIFIED_ON;\n+\n+\t/**\n+\t * The feature id for the 'Types' containment reference list.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint NAMESPACE__TYPES = TYPES_DEFINITION__TYPES;\n \n \t/**\n \t * The feature id for the 'Owned Namespaces' containment reference list.\n@@ -1991,7 +2070,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__OWNED_NAMESPACES = OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\n+\tint NAMESPACE__OWNED_NAMESPACES = TYPES_DEFINITION_FEATURE_COUNT + 0;\n \n \t/**\n \t * The feature id for the 'Owner' container reference.\n@@ -2000,7 +2079,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__OWNER = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n+\tint NAMESPACE__OWNER = TYPES_DEFINITION_FEATURE_COUNT + 1;\n \n \t/**\n \t * The feature id for the 'Name' attribute.\n@@ -2009,7 +2088,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE__NAME = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n+\tint NAMESPACE__NAME = TYPES_DEFINITION_FEATURE_COUNT + 2;\n \n \t/**\n \t * The number of structural features of the 'Namespace' class.\n@@ -2018,7 +2097,7 @@ public interface EnvironmentPackage extends EPackage {\n \t * @generated\n \t * @ordered\n \t */\n-\tint NAMESPACE_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n+\tint NAMESPACE_FEATURE_COUNT = TYPES_DEFINITION_FEATURE_COUNT + 3;\n \n \t/**\n \t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PropertyImpl Property}' class.\n@@ -2120,14 +2199,23 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint PROPERTY__MULTIPLICITY = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\n \n+\t/**\n+\t * The feature id for the 'Is Identifier' attribute.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint PROPERTY__IS_IDENTIFIER = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n+\n \t/**\n \t * The number of structural features of the 'Property' class.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint PROPERTY_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\n+\tint PROPERTY_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\n \n \t/**\n \t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.AttributeImpl Attribute}' class.\n@@ -2229,6 +2317,15 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint ATTRIBUTE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\n \n+\t/**\n+\t * The feature id for the 'Is Identifier' attribute.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint ATTRIBUTE__IS_IDENTIFIER = PROPERTY__IS_IDENTIFIER;\n+\n \t/**\n \t * The feature id for the 'Type' reference.\n \t * \n@@ -2239,13 +2336,13 @@ public interface EnvironmentPackage extends EPackage {\n \tint ATTRIBUTE__TYPE = PROPERTY_FEATURE_COUNT + 0;\n \n \t/**\n-\t * The feature id for the 'Dto' container reference.\n+\t * The feature id for the 'Containing Type' container reference.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint ATTRIBUTE__DTO = PROPERTY_FEATURE_COUNT + 1;\n+\tint ATTRIBUTE__CONTAINING_TYPE = PROPERTY_FEATURE_COUNT + 1;\n \n \t/**\n \t * The number of structural features of the 'Attribute' class.\n@@ -2356,6 +2453,15 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tint REFERENCE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\n \n+\t/**\n+\t * The feature id for the 'Is Identifier' attribute.\n+\t * \n+\t * \n+\t * @generated\n+\t * @ordered\n+\t */\n+\tint REFERENCE__IS_IDENTIFIER = PROPERTY__IS_IDENTIFIER;\n+\n \t/**\n \t * The feature id for the 'Is Composite' attribute.\n \t * \n@@ -2384,22 +2490,22 @@ public interface EnvironmentPackage extends EPackage {\n \tint REFERENCE__OPPOSITE_OF = PROPERTY_FEATURE_COUNT + 2;\n \n \t/**\n-\t * The feature id for the 'Type' reference.\n+\t * The feature id for the 'Containing Type' container reference.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__TYPE = PROPERTY_FEATURE_COUNT + 3;\n+\tint REFERENCE__CONTAINING_TYPE = PROPERTY_FEATURE_COUNT + 3;\n \n \t/**\n-\t * The feature id for the 'Dto' container reference.\n+\t * The feature id for the 'Referenced Type' reference.\n \t * \n \t * \n \t * @generated\n \t * @ordered\n \t */\n-\tint REFERENCE__DTO = PROPERTY_FEATURE_COUNT + 4;\n+\tint REFERENCE__REFERENCED_TYPE = PROPERTY_FEATURE_COUNT + 4;\n \n \t/**\n \t * The number of structural features of the 'Reference' class.\n@@ -3003,6 +3109,17 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tEReference getEnvironment_TypesDefinition();\n \n+\t/**\n+\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.Environment#getNamespaces Namespaces}'.\n+\t * \n+\t * \n+\t * @return the meta object for the containment reference list 'Namespaces'.\n+\t * @see org.obeonetwork.dsl.environment.Environment#getNamespaces()\n+\t * @see #getEnvironment()\n+\t * @generated\n+\t */\n+\tEReference getEnvironment_Namespaces();\n+\n \t/**\n \t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.Type Type}'.\n \t * \n@@ -3385,102 +3502,102 @@ public interface EnvironmentPackage extends EPackage {\n \tEClass getStructuredType();\n \n \t/**\n-\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.DTO DTO}'.\n+\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype Supertype}'.\n \t * \n \t * \n-\t * @return the meta object for class 'DTO'.\n-\t * @see org.obeonetwork.dsl.environment.DTO\n+\t * @return the meta object for the reference 'Supertype'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getSupertype()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEClass getDTO();\n+\tEReference getStructuredType_Supertype();\n \n \t/**\n-\t * Returns the meta object for the containment reference '{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer Owned Container}'.\n+\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes Associated Types}'.\n \t * \n \t * \n-\t * @return the meta object for the containment reference 'Owned Container'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedContainer()\n-\t * @see #getDTO()\n+\t * @return the meta object for the reference list 'Associated Types'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEReference getDTO_OwnedContainer();\n+\tEReference getStructuredType_AssociatedTypes();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getAssociatedTypes Associated Types}'.\n+\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes Owned Attributes}'.\n \t * \n \t * \n-\t * @return the meta object for the reference list 'Associated Types'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getAssociatedTypes()\n-\t * @see #getDTO()\n+\t * @return the meta object for the containment reference list 'Owned Attributes'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEReference getDTO_AssociatedTypes();\n+\tEReference getStructuredType_OwnedAttributes();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getProperties Properties}'.\n+\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getAttributes Attributes}'.\n \t * \n \t * \n-\t * @return the meta object for the reference list 'Properties'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getProperties()\n-\t * @see #getDTO()\n+\t * @return the meta object for the reference list 'Attributes'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getAttributes()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEReference getDTO_Properties();\n+\tEReference getStructuredType_Attributes();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getReferences References}'.\n+\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences Owned References}'.\n \t * \n \t * \n-\t * @return the meta object for the reference list 'References'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getReferences()\n-\t * @see #getDTO()\n+\t * @return the meta object for the containment reference list 'Owned References'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEReference getDTO_References();\n+\tEReference getStructuredType_OwnedReferences();\n \n \t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences Owned References}'.\n+\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getReferences References}'.\n \t * \n \t * \n-\t * @return the meta object for the containment reference list 'Owned References'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedReferences()\n-\t * @see #getDTO()\n+\t * @return the meta object for the reference list 'References'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getReferences()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEReference getDTO_OwnedReferences();\n+\tEReference getStructuredType_References();\n \n \t/**\n-\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getAttributes Attributes}'.\n+\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getProperties Properties}'.\n \t * \n \t * \n-\t * @return the meta object for the reference list 'Attributes'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getAttributes()\n-\t * @see #getDTO()\n+\t * @return the meta object for the reference list 'Properties'.\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getProperties()\n+\t * @see #getStructuredType()\n \t * @generated\n \t */\n-\tEReference getDTO_Attributes();\n+\tEReference getStructuredType_Properties();\n \n \t/**\n-\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes Owned Attributes}'.\n+\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.DTO DTO}'.\n \t * \n \t * \n-\t * @return the meta object for the containment reference list 'Owned Attributes'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedAttributes()\n-\t * @see #getDTO()\n+\t * @return the meta object for class 'DTO'.\n+\t * @see org.obeonetwork.dsl.environment.DTO\n \t * @generated\n \t */\n-\tEReference getDTO_OwnedAttributes();\n+\tEClass getDTO();\n \n \t/**\n-\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.DTO#getSupertype Supertype}'.\n+\t * Returns the meta object for the containment reference '{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer Owned Container}'.\n \t * \n \t * \n-\t * @return the meta object for the reference 'Supertype'.\n-\t * @see org.obeonetwork.dsl.environment.DTO#getSupertype()\n+\t * @return the meta object for the containment reference 'Owned Container'.\n+\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedContainer()\n \t * @see #getDTO()\n \t * @generated\n \t */\n-\tEReference getDTO_Supertype();\n+\tEReference getDTO_OwnedContainer();\n \n \t/**\n \t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.FilterContainer Filter Container}'.\n@@ -3578,15 +3695,15 @@ public interface EnvironmentPackage extends EPackage {\n \tEReference getAttribute_Type();\n \n \t/**\n-\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}'.\n+\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}'.\n \t * \n \t * \n-\t * @return the meta object for the container reference 'Dto'.\n-\t * @see org.obeonetwork.dsl.environment.Attribute#getDto()\n+\t * @return the meta object for the container reference 'Containing Type'.\n+\t * @see org.obeonetwork.dsl.environment.Attribute#getContainingType()\n \t * @see #getAttribute()\n \t * @generated\n \t */\n-\tEReference getAttribute_Dto();\n+\tEReference getAttribute_ContainingType();\n \n \t/**\n \t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.Reference Reference}'.\n@@ -3632,26 +3749,26 @@ public interface EnvironmentPackage extends EPackage {\n \tEReference getReference_OppositeOf();\n \n \t/**\n-\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.Reference#getType Type}'.\n+\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}'.\n \t * \n \t * \n-\t * @return the meta object for the reference 'Type'.\n-\t * @see org.obeonetwork.dsl.environment.Reference#getType()\n+\t * @return the meta object for the container reference 'Containing Type'.\n+\t * @see org.obeonetwork.dsl.environment.Reference#getContainingType()\n \t * @see #getReference()\n \t * @generated\n \t */\n-\tEReference getReference_Type();\n+\tEReference getReference_ContainingType();\n \n \t/**\n-\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Reference#getDto Dto}'.\n+\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.Reference#getReferencedType Referenced Type}'.\n \t * \n \t * \n-\t * @return the meta object for the container reference 'Dto'.\n-\t * @see org.obeonetwork.dsl.environment.Reference#getDto()\n+\t * @return the meta object for the reference 'Referenced Type'.\n+\t * @see org.obeonetwork.dsl.environment.Reference#getReferencedType()\n \t * @see #getReference()\n \t * @generated\n \t */\n-\tEReference getReference_Dto();\n+\tEReference getReference_ReferencedType();\n \n \t/**\n \t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.Property Property}'.\n@@ -3685,6 +3802,17 @@ public interface EnvironmentPackage extends EPackage {\n \t */\n \tEAttribute getProperty_Multiplicity();\n \n+\t/**\n+\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier Is Identifier}'.\n+\t * \n+\t * \n+\t * @return the meta object for the attribute 'Is Identifier'.\n+\t * @see org.obeonetwork.dsl.environment.Property#isIsIdentifier()\n+\t * @see #getProperty()\n+\t * @generated\n+\t */\n+\tEAttribute getProperty_IsIdentifier();\n+\n \t/**\n \t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.BindingInfo Binding Info}'.\n \t * \n@@ -3984,6 +4112,15 @@ interface Literals {\n \t\tEReference ENVIRONMENT__TYPES_DEFINITION = eINSTANCE\n \t\t\t\t.getEnvironment_TypesDefinition();\n \n+\t\t/**\n+\t\t * The meta object literal for the 'Namespaces' containment reference list feature.\n+\t\t * \n+\t\t * \n+\t\t * @generated\n+\t\t */\n+\t\tEReference ENVIRONMENT__NAMESPACES = eINSTANCE\n+\t\t\t\t.getEnvironment_Namespaces();\n+\n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl Type}' class.\n \t\t * \n@@ -4314,78 +4451,85 @@ interface Literals {\n \t\tEClass STRUCTURED_TYPE = eINSTANCE.getStructuredType();\n \n \t\t/**\n-\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl DTO}' class.\n+\t\t * The meta object literal for the 'Supertype' reference feature.\n \t\t * \n \t\t * \n-\t\t * @see org.obeonetwork.dsl.environment.impl.DTOImpl\n-\t\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getDTO()\n \t\t * @generated\n \t\t */\n-\t\tEClass DTO = eINSTANCE.getDTO();\n+\t\tEReference STRUCTURED_TYPE__SUPERTYPE = eINSTANCE\n+\t\t\t\t.getStructuredType_Supertype();\n \n \t\t/**\n-\t\t * The meta object literal for the 'Owned Container' containment reference feature.\n+\t\t * The meta object literal for the 'Associated Types' reference list feature.\n \t\t * \n \t\t * \n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__OWNED_CONTAINER = eINSTANCE.getDTO_OwnedContainer();\n+\t\tEReference STRUCTURED_TYPE__ASSOCIATED_TYPES = eINSTANCE\n+\t\t\t\t.getStructuredType_AssociatedTypes();\n \n \t\t/**\n-\t\t * The meta object literal for the 'Associated Types' reference list feature.\n+\t\t * The meta object literal for the 'Owned Attributes' containment reference list feature.\n \t\t * \n \t\t * \n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__ASSOCIATED_TYPES = eINSTANCE.getDTO_AssociatedTypes();\n+\t\tEReference STRUCTURED_TYPE__OWNED_ATTRIBUTES = eINSTANCE\n+\t\t\t\t.getStructuredType_OwnedAttributes();\n \n \t\t/**\n-\t\t * The meta object literal for the 'Properties' reference list feature.\n+\t\t * The meta object literal for the 'Attributes' reference list feature.\n \t\t * \n \t\t * \n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__PROPERTIES = eINSTANCE.getDTO_Properties();\n+\t\tEReference STRUCTURED_TYPE__ATTRIBUTES = eINSTANCE\n+\t\t\t\t.getStructuredType_Attributes();\n \n \t\t/**\n-\t\t * The meta object literal for the 'References' reference list feature.\n+\t\t * The meta object literal for the 'Owned References' containment reference list feature.\n \t\t * \n \t\t * \n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__REFERENCES = eINSTANCE.getDTO_References();\n+\t\tEReference STRUCTURED_TYPE__OWNED_REFERENCES = eINSTANCE\n+\t\t\t\t.getStructuredType_OwnedReferences();\n \n \t\t/**\n-\t\t * The meta object literal for the 'Owned References' containment reference list feature.\n+\t\t * The meta object literal for the 'References' reference list feature.\n \t\t * \n \t\t * \n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__OWNED_REFERENCES = eINSTANCE.getDTO_OwnedReferences();\n+\t\tEReference STRUCTURED_TYPE__REFERENCES = eINSTANCE\n+\t\t\t\t.getStructuredType_References();\n \n \t\t/**\n-\t\t * The meta object literal for the 'Attributes' reference list feature.\n+\t\t * The meta object literal for the 'Properties' reference list feature.\n \t\t * \n \t\t * \n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__ATTRIBUTES = eINSTANCE.getDTO_Attributes();\n+\t\tEReference STRUCTURED_TYPE__PROPERTIES = eINSTANCE\n+\t\t\t\t.getStructuredType_Properties();\n \n \t\t/**\n-\t\t * The meta object literal for the 'Owned Attributes' containment reference list feature.\n+\t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl DTO}' class.\n \t\t * \n \t\t * \n+\t\t * @see org.obeonetwork.dsl.environment.impl.DTOImpl\n+\t\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getDTO()\n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__OWNED_ATTRIBUTES = eINSTANCE.getDTO_OwnedAttributes();\n+\t\tEClass DTO = eINSTANCE.getDTO();\n \n \t\t/**\n-\t\t * The meta object literal for the 'Supertype' reference feature.\n+\t\t * The meta object literal for the 'Owned Container' containment reference feature.\n \t\t * \n \t\t * \n \t\t * @generated\n \t\t */\n-\t\tEReference DTO__SUPERTYPE = eINSTANCE.getDTO_Supertype();\n+\t\tEReference DTO__OWNED_CONTAINER = eINSTANCE.getDTO_OwnedContainer();\n \n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.FilterContainerImpl Filter Container}' class.\n@@ -4470,12 +4614,13 @@ interface Literals {\n \t\tEReference ATTRIBUTE__TYPE = eINSTANCE.getAttribute_Type();\n \n \t\t/**\n-\t\t * The meta object literal for the 'Dto' container reference feature.\n+\t\t * The meta object literal for the 'Containing Type' container reference feature.\n \t\t * \n \t\t * \n \t\t * @generated\n \t\t */\n-\t\tEReference ATTRIBUTE__DTO = eINSTANCE.getAttribute_Dto();\n+\t\tEReference ATTRIBUTE__CONTAINING_TYPE = eINSTANCE\n+\t\t\t\t.getAttribute_ContainingType();\n \n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.ReferenceImpl Reference}' class.\n@@ -4513,20 +4658,22 @@ interface Literals {\n \t\tEReference REFERENCE__OPPOSITE_OF = eINSTANCE.getReference_OppositeOf();\n \n \t\t/**\n-\t\t * The meta object literal for the 'Type' reference feature.\n+\t\t * The meta object literal for the 'Containing Type' container reference feature.\n \t\t * \n \t\t * \n \t\t * @generated\n \t\t */\n-\t\tEReference REFERENCE__TYPE = eINSTANCE.getReference_Type();\n+\t\tEReference REFERENCE__CONTAINING_TYPE = eINSTANCE\n+\t\t\t\t.getReference_ContainingType();\n \n \t\t/**\n-\t\t * The meta object literal for the 'Dto' container reference feature.\n+\t\t * The meta object literal for the 'Referenced Type' reference feature.\n \t\t * \n \t\t * \n \t\t * @generated\n \t\t */\n-\t\tEReference REFERENCE__DTO = eINSTANCE.getReference_Dto();\n+\t\tEReference REFERENCE__REFERENCED_TYPE = eINSTANCE\n+\t\t\t\t.getReference_ReferencedType();\n \n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.PropertyImpl Property}' class.\n@@ -4555,6 +4702,15 @@ interface Literals {\n \t\tEAttribute PROPERTY__MULTIPLICITY = eINSTANCE\n \t\t\t\t.getProperty_Multiplicity();\n \n+\t\t/**\n+\t\t * The meta object literal for the 'Is Identifier' attribute feature.\n+\t\t * \n+\t\t * \n+\t\t * @generated\n+\t\t */\n+\t\tEAttribute PROPERTY__IS_IDENTIFIER = eINSTANCE\n+\t\t\t\t.getProperty_IsIdentifier();\n+\n \t\t/**\n \t\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.BindingInfoImpl Binding Info}' class.\n \t\t * ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentPackage.java","sha":"0ad0495209f0622687e7f0ccf75ce699a21a2c88","status":"modified"},{"additions":1,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FNamespace.java","changes":2,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FNamespace.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":1,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Namespace.java","new_code":"public interface Namespace extends TypesDefinition {","new_methods":[],"old_code":"public interface Namespace extends ObeoDSMObject {","old_methods":[],"patch":"@@ -32,7 +32,7 @@\n * @model\n * @generated\n */\n-public interface Namespace extends ObeoDSMObject {\n+public interface Namespace extends TypesDefinition {\n \t/**\n \t * \n \t * ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FNamespace.java","sha":"ed1b5d40d21b98228772c5487820ead8c60e6cc1","status":"modified"},{"additions":27,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FProperty.java","changes":27,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FProperty.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Property.java","new_code":" *
  • {@link org.obeonetwork.dsl.environment.Property#isIsIdentifier Is Identifier}
    • \n\t/**\n\t * Returns the value of the 'Is Identifier' attribute.\n\t * \n\t *

    \n\t * If the meaning of the 'Is Identifier' attribute isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Is Identifier' attribute.\n\t * @see #setIsIdentifier(boolean)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getProperty_IsIdentifier()\n\t * @model\n\t * @generated\n\t */\n\tboolean isIsIdentifier();\n\n\t/**\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier Is Identifier}' attribute.\n\t * \n\t * \n\t * @param value the new value of the 'Is Identifier' attribute.\n\t * @see #isIsIdentifier()\n\t * @generated\n\t */\n\tvoid setIsIdentifier(boolean value);\n","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -22,6 +22,7 @@\n *
      \n *
    • {@link org.obeonetwork.dsl.environment.Property#getName Name}
      • \n *
    • {@link org.obeonetwork.dsl.environment.Property#getMultiplicity Multiplicity}
      • \n+ *
    • {@link org.obeonetwork.dsl.environment.Property#isIsIdentifier Is Identifier}
      • \n *
    \n *

    \n *\n@@ -92,4 +93,30 @@ public interface Property extends ObeoDSMObject, BoundableElement {\n \t */\n \tvoid setMultiplicity(MultiplicityKind value);\n \n+\t/**\n+\t * Returns the value of the 'Is Identifier' attribute.\n+\t * \n+\t *

    \n+\t * If the meaning of the 'Is Identifier' attribute isn't clear,\n+\t * there really should be more of a description here...\n+\t *

    \n+\t * \n+\t * @return the value of the 'Is Identifier' attribute.\n+\t * @see #setIsIdentifier(boolean)\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getProperty_IsIdentifier()\n+\t * @model\n+\t * @generated\n+\t */\n+\tboolean isIsIdentifier();\n+\n+\t/**\n+\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier Is Identifier}' attribute.\n+\t * \n+\t * \n+\t * @param value the new value of the 'Is Identifier' attribute.\n+\t * @see #isIsIdentifier()\n+\t * @generated\n+\t */\n+\tvoid setIsIdentifier(boolean value);\n+\n } // Property","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FProperty.java","sha":"f0699efb354f2ec72eb48548dd5134eb2498687d","status":"modified"},{"additions":28,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FReference.java","changes":55,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FReference.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":27,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Reference.java","new_code":" *
  • {@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}
    • \n *
  • {@link org.obeonetwork.dsl.environment.Reference#getReferencedType Referenced Type}
    • \n\t * The default value is \"true\".\n\t * @model default=\"true\" required=\"true\"\n\t * Returns the value of the 'Containing Type' container reference.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences Owned References}'.\n\t * If the meaning of the 'Containing Type' container reference isn't clear,\n\t * @return the value of the 'Containing Type' container reference.\n\t * @see #setContainingType(StructuredType)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_ContainingType()\n\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences\n\t * @model opposite=\"ownedReferences\" required=\"true\" transient=\"false\"\n\tStructuredType getContainingType();\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}' container reference.\n\t * @param value the new value of the 'Containing Type' container reference.\n\t * @see #getContainingType()\n\tvoid setContainingType(StructuredType value);\n\t * Returns the value of the 'Referenced Type' reference.\n\t * If the meaning of the 'Referenced Type' reference list isn't clear,\n\t * @return the value of the 'Referenced Type' reference.\n\t * @see #setReferencedType(StructuredType)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_ReferencedType()\n\t * @model required=\"true\"\n\tStructuredType getReferencedType();\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getReferencedType Referenced Type}' reference.\n\t * @param value the new value of the 'Referenced Type' reference.\n\t * @see #getReferencedType()\n\tvoid setReferencedType(StructuredType value);","new_methods":[],"old_code":" *
  • {@link org.obeonetwork.dsl.environment.Reference#getType Type}
    • \n *
  • {@link org.obeonetwork.dsl.environment.Reference#getDto Dto}
    • \n\t * @model required=\"true\"\n\t * Returns the value of the 'Type' reference.\n\t * If the meaning of the 'Type' reference isn't clear,\n\t * @return the value of the 'Type' reference.\n\t * @see #setType(DTO)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Type()\n\t * @model required=\"true\"\n\tDTO getType();\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getType Type}' reference.\n\t * @param value the new value of the 'Type' reference.\n\t * @see #getType()\n\tvoid setType(DTO value);\n\t * Returns the value of the 'Dto' container reference.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences Owned References}'.\n\t * If the meaning of the 'Dto' container reference isn't clear,\n\t * @return the value of the 'Dto' container reference.\n\t * @see #setDto(DTO)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Dto()\n\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedReferences\n\t * @model opposite=\"ownedReferences\" required=\"true\" transient=\"false\"\n\tDTO getDto();\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getDto Dto}' container reference.\n\t * @param value the new value of the 'Dto' container reference.\n\t * @see #getDto()\n\tvoid setDto(DTO value);","old_methods":[],"patch":"@@ -23,8 +23,8 @@\n *
  • {@link org.obeonetwork.dsl.environment.Reference#isIsComposite Is Composite}
    • \n *
  • {@link org.obeonetwork.dsl.environment.Reference#isNavigable Navigable}
    • \n *
  • {@link org.obeonetwork.dsl.environment.Reference#getOppositeOf Opposite Of}
    • \n- *
  • {@link org.obeonetwork.dsl.environment.Reference#getType Type}
    • \n- *
  • {@link org.obeonetwork.dsl.environment.Reference#getDto Dto}
    • \n+ *
  • {@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}
    • \n+ *
  • {@link org.obeonetwork.dsl.environment.Reference#getReferencedType Referenced Type}
    • \n * \n *

    \n *\n@@ -68,6 +68,7 @@ public interface Reference extends Property {\n \n \t/**\n \t * Returns the value of the 'Navigable' attribute.\n+\t * The default value is \"true\".\n \t * \n \t *

    \n \t * If the meaning of the 'Navigable' attribute isn't clear,\n@@ -77,7 +78,7 @@ public interface Reference extends Property {\n \t * @return the value of the 'Navigable' attribute.\n \t * @see #setNavigable(boolean)\n \t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Navigable()\n-\t * @model required=\"true\"\n+\t * @model default=\"true\" required=\"true\"\n \t * @generated\n \t */\n \tboolean isNavigable();\n@@ -119,58 +120,58 @@ public interface Reference extends Property {\n \tvoid setOppositeOf(Reference value);\n \n \t/**\n-\t * Returns the value of the 'Type' reference.\n+\t * Returns the value of the 'Containing Type' container reference.\n+\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences Owned References}'.\n \t * \n \t *

    \n-\t * If the meaning of the 'Type' reference isn't clear,\n+\t * If the meaning of the 'Containing Type' container reference isn't clear,\n \t * there really should be more of a description here...\n \t *

    \n \t * \n-\t * @return the value of the 'Type' reference.\n-\t * @see #setType(DTO)\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Type()\n-\t * @model required=\"true\"\n+\t * @return the value of the 'Containing Type' container reference.\n+\t * @see #setContainingType(StructuredType)\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_ContainingType()\n+\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences\n+\t * @model opposite=\"ownedReferences\" required=\"true\" transient=\"false\"\n \t * @generated\n \t */\n-\tDTO getType();\n+\tStructuredType getContainingType();\n \n \t/**\n-\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getType Type}' reference.\n+\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}' container reference.\n \t * \n \t * \n-\t * @param value the new value of the 'Type' reference.\n-\t * @see #getType()\n+\t * @param value the new value of the 'Containing Type' container reference.\n+\t * @see #getContainingType()\n \t * @generated\n \t */\n-\tvoid setType(DTO value);\n+\tvoid setContainingType(StructuredType value);\n \n \t/**\n-\t * Returns the value of the 'Dto' container reference.\n-\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences Owned References}'.\n+\t * Returns the value of the 'Referenced Type' reference.\n \t * \n \t *

    \n-\t * If the meaning of the 'Dto' container reference isn't clear,\n+\t * If the meaning of the 'Referenced Type' reference list isn't clear,\n \t * there really should be more of a description here...\n \t *

    \n \t * \n-\t * @return the value of the 'Dto' container reference.\n-\t * @see #setDto(DTO)\n-\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Dto()\n-\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedReferences\n-\t * @model opposite=\"ownedReferences\" required=\"true\" transient=\"false\"\n+\t * @return the value of the 'Referenced Type' reference.\n+\t * @see #setReferencedType(StructuredType)\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_ReferencedType()\n+\t * @model required=\"true\"\n \t * @generated\n \t */\n-\tDTO getDto();\n+\tStructuredType getReferencedType();\n \n \t/**\n-\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getDto Dto}' container reference.\n+\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getReferencedType Referenced Type}' reference.\n \t * \n \t * \n-\t * @param value the new value of the 'Dto' container reference.\n-\t * @see #getDto()\n+\t * @param value the new value of the 'Referenced Type' reference.\n+\t * @see #getReferencedType()\n \t * @generated\n \t */\n-\tvoid setDto(DTO value);\n+\tvoid setReferencedType(StructuredType value);\n \n \t/**\n \t * ","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FReference.java","sha":"c8513179df2266c1d74faf28c38c8766f8dc7ce8","status":"modified"},{"additions":148,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FStructuredType.java","changes":148,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FStructuredType.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":0,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/StructuredType.java","new_code":"import org.eclipse.emf.common.util.EList;\n\n *

    \n * The following features are supported:\n *

      \n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getSupertype Supertype}
      • \n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes Associated Types}
      • \n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes Owned Attributes}
      • \n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getAttributes Attributes}
      • \n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences Owned References}
      • \n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getReferences References}
      • \n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getProperties Properties}
      • \n *
    \n *

    \n\n\t/**\n\t * Returns the value of the 'Supertype' reference.\n\t * \n\t *

    \n\t * If the meaning of the 'Supertype' reference isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Supertype' reference.\n\t * @see #setSupertype(StructuredType)\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Supertype()\n\t * @model\n\t * @generated\n\t */\n\tStructuredType getSupertype();\n\n\t/**\n\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype Supertype}' reference.\n\t * \n\t * \n\t * @param value the new value of the 'Supertype' reference.\n\t * @see #getSupertype()\n\t * @generated\n\t */\n\tvoid setSupertype(StructuredType value);\n\n\t/**\n\t * Returns the value of the 'Associated Types' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.StructuredType}.\n\t * \n\t *

    \n\t * If the meaning of the 'Associated Types' reference list isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Associated Types' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_AssociatedTypes()\n\t * @model\n\t * @generated\n\t */\n\tEList getAssociatedTypes();\n\n\t/**\n\t * Returns the value of the 'Owned Attributes' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}'.\n\t * \n\t *

    \n\t * If the meaning of the 'Owned Attributes' reference isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Owned Attributes' containment reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_OwnedAttributes()\n\t * @see org.obeonetwork.dsl.environment.Attribute#getContainingType\n\t * @model opposite=\"containingType\" containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList getOwnedAttributes();\n\n\t/**\n\t * Returns the value of the 'Attributes' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n\t * \n\t *

    \n\t * If the meaning of the 'Attributes' reference list isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Attributes' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Attributes()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList getAttributes();\n\n\t/**\n\t * Returns the value of the 'Owned References' containment reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}'.\n\t * \n\t *

    \n\t * If the meaning of the 'Owned References' reference isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Owned References' containment reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_OwnedReferences()\n\t * @see org.obeonetwork.dsl.environment.Reference#getContainingType\n\t * @model opposite=\"containingType\" containment=\"true\" resolveProxies=\"true\"\n\t * @generated\n\t */\n\tEList getOwnedReferences();\n\n\t/**\n\t * Returns the value of the 'References' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n\t * \n\t *

    \n\t * If the meaning of the 'References' reference list isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'References' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_References()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList getReferences();\n\n\t/**\n\t * Returns the value of the 'Properties' reference list.\n\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\n\t * \n\t *

    \n\t * If the meaning of the 'Properties' reference list isn't clear,\n\t * there really should be more of a description here...\n\t *

    \n\t * \n\t * @return the value of the 'Properties' reference list.\n\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Properties()\n\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n\t * @generated\n\t */\n\tEList getProperties();\n\n\t/**\n\t * \n\t * \n\t * @model required=\"true\"\n\t * @generated\n\t */\n\tboolean isSubtypeOf(StructuredType type);","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -12,11 +12,25 @@\n */\n package org.obeonetwork.dsl.environment;\n \n+import org.eclipse.emf.common.util.EList;\n+\n /**\n * \n * A representation of the model object 'Structured Type'.\n * \n *\n+ *

    \n+ * The following features are supported:\n+ *

      \n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getSupertype Supertype}
      • \n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes Associated Types}
      • \n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes Owned Attributes}
      • \n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getAttributes Attributes}
      • \n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences Owned References}
      • \n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getReferences References}
      • \n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getProperties Properties}
      • \n+ *
    \n+ *

    \n *\n * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType()\n * @model abstract=\"true\"\n@@ -30,4 +44,138 @@ public interface StructuredType extends Type {\n \t * @generated\n \t */\n \tString copyright = \"Copyright (c) 2008-2009 Obeo.\\nAll rights reserved. This program and the accompanying materials\\nare made available under the terms of the Eclipse Public License v1.0\\nwhich accompanies this distribution, and is available at\\nhttp://www.eclipse.org/legal/epl-v10.html\\n\\nContributors:\\n Obeo - initial API and implementation\";\n+\n+\t/**\n+\t * Returns the value of the 'Supertype' reference.\n+\t * \n+\t *

    \n+\t * If the meaning of the 'Supertype' reference isn't clear,\n+\t * there really should be more of a description here...\n+\t *

    \n+\t * \n+\t * @return the value of the 'Supertype' reference.\n+\t * @see #setSupertype(StructuredType)\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Supertype()\n+\t * @model\n+\t * @generated\n+\t */\n+\tStructuredType getSupertype();\n+\n+\t/**\n+\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype Supertype}' reference.\n+\t * \n+\t * \n+\t * @param value the new value of the 'Supertype' reference.\n+\t * @see #getSupertype()\n+\t * @generated\n+\t */\n+\tvoid setSupertype(StructuredType value);\n+\n+\t/**\n+\t * Returns the value of the 'Associated Types' reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.StructuredType}.\n+\t * \n+\t *

    \n+\t * If the meaning of the 'Associated Types' reference list isn't clear,\n+\t * there really should be more of a description here...\n+\t *

    \n+\t * \n+\t * @return the value of the 'Associated Types' reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_AssociatedTypes()\n+\t * @model\n+\t * @generated\n+\t */\n+\tEList getAssociatedTypes();\n+\n+\t/**\n+\t * Returns the value of the 'Owned Attributes' containment reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n+\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}'.\n+\t * \n+\t *

    \n+\t * If the meaning of the 'Owned Attributes' reference isn't clear,\n+\t * there really should be more of a description here...\n+\t *

    \n+\t * \n+\t * @return the value of the 'Owned Attributes' containment reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_OwnedAttributes()\n+\t * @see org.obeonetwork.dsl.environment.Attribute#getContainingType\n+\t * @model opposite=\"containingType\" containment=\"true\" resolveProxies=\"true\"\n+\t * @generated\n+\t */\n+\tEList getOwnedAttributes();\n+\n+\t/**\n+\t * Returns the value of the 'Attributes' reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\n+\t * \n+\t *

    \n+\t * If the meaning of the 'Attributes' reference list isn't clear,\n+\t * there really should be more of a description here...\n+\t *

    \n+\t * \n+\t * @return the value of the 'Attributes' reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Attributes()\n+\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n+\t * @generated\n+\t */\n+\tEList getAttributes();\n+\n+\t/**\n+\t * Returns the value of the 'Owned References' containment reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n+\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}'.\n+\t * \n+\t *

    \n+\t * If the meaning of the 'Owned References' reference isn't clear,\n+\t * there really should be more of a description here...\n+\t *

    \n+\t * \n+\t * @return the value of the 'Owned References' containment reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_OwnedReferences()\n+\t * @see org.obeonetwork.dsl.environment.Reference#getContainingType\n+\t * @model opposite=\"containingType\" containment=\"true\" resolveProxies=\"true\"\n+\t * @generated\n+\t */\n+\tEList getOwnedReferences();\n+\n+\t/**\n+\t * Returns the value of the 'References' reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\n+\t * \n+\t *

    \n+\t * If the meaning of the 'References' reference list isn't clear,\n+\t * there really should be more of a description here...\n+\t *

    \n+\t * \n+\t * @return the value of the 'References' reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_References()\n+\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n+\t * @generated\n+\t */\n+\tEList getReferences();\n+\n+\t/**\n+\t * Returns the value of the 'Properties' reference list.\n+\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\n+\t * \n+\t *

    \n+\t * If the meaning of the 'Properties' reference list isn't clear,\n+\t * there really should be more of a description here...\n+\t *

    \n+\t * \n+\t * @return the value of the 'Properties' reference list.\n+\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Properties()\n+\t * @model transient=\"true\" changeable=\"false\" volatile=\"true\" derived=\"true\"\n+\t * @generated\n+\t */\n+\tEList getProperties();\n+\n+\t/**\n+\t * \n+\t * \n+\t * @model required=\"true\"\n+\t * @generated\n+\t */\n+\tboolean isSubtypeOf(StructuredType type);\n } // StructuredType\n\\ No newline at end of file","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FStructuredType.java","sha":"8d0cfe4477a8d131b8cb5b8e972021088fa106d0","status":"modified"},{"additions":36,"blob_url":"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fimpl%2FAttributeImpl.java","changes":64,"contents_url":"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fimpl%2FAttributeImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6","deletions":28,"filename":"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/impl/AttributeImpl.java","new_code":"import org.obeonetwork.dsl.environment.StructuredType;\n *
  • {@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getContainingType Containing Type}
    • \n\tpublic StructuredType getContainingType() {\n\t\treturn (StructuredType) eDynamicGet(\n\t\t\t\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\n\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE, true,\n\t\t\t\ttrue);\n\tpublic StructuredType basicGetContainingType() {\n\t\treturn (StructuredType) eDynamicGet(\n\t\t\t\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\n\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE, false,\n\t\t\t\ttrue);\n\tpublic NotificationChain basicSetContainingType(\n\t\t\tStructuredType newContainingType, NotificationChain msgs) {\n\t\tmsgs = eBasicSetContainer((InternalEObject) newContainingType,\n\t\t\t\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE, msgs);\n\tpublic void setContainingType(StructuredType newContainingType) {\n\t\teDynamicSet(EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\n\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE,\n\t\t\t\tnewContainingType);\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\treturn basicSetContainingType((StructuredType) otherEnd, msgs);\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\treturn basicSetContainingType(null, msgs);\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\t\t\tEnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES,\n\t\t\t\t\tStructuredType.class, msgs);\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\t\treturn getContainingType();\n\t\t\treturn basicGetContainingType();\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\tsetContainingType((StructuredType) newValue);\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\tsetContainingType((StructuredType) null);\n\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n\t\t\treturn basicGetContainingType() != null;","new_methods":[],"old_code":" *
  • {@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getDto Dto}
    • \n\tpublic DTO getDto() {\n\t\treturn (DTO) eDynamicGet(EnvironmentPackage.ATTRIBUTE__DTO,\n\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, true, true);\n\tpublic DTO basicGetDto() {\n\t\treturn (DTO) eDynamicGet(EnvironmentPackage.ATTRIBUTE__DTO,\n\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, false, true);\n\tpublic NotificationChain basicSetDto(DTO newDto, NotificationChain msgs) {\n\t\tmsgs = eBasicSetContainer((InternalEObject) newDto,\n\t\t\t\tEnvironmentPackage.ATTRIBUTE__DTO, msgs);\n\tpublic void setDto(DTO newDto) {\n\t\teDynamicSet(EnvironmentPackage.ATTRIBUTE__DTO,\n\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, newDto);\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\treturn basicSetDto((DTO) otherEnd, msgs);\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\treturn basicSetDto(null, msgs);\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\t\t\tEnvironmentPackage.DTO__OWNED_ATTRIBUTES, DTO.class, msgs);\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\t\treturn getDto();\n\t\t\treturn basicGetDto();\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\tsetDto((DTO) newValue);\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\tsetDto((DTO) null);\n\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n\t\t\treturn basicGetDto() != null;","old_methods":[],"patch":"@@ -19,6 +19,7 @@\n import org.obeonetwork.dsl.environment.DTO;\n import org.obeonetwork.dsl.environment.EnvironmentPackage;\n import org.obeonetwork.dsl.environment.PrimitiveType;\n+import org.obeonetwork.dsl.environment.StructuredType;\n \n /**\n * \n@@ -28,7 +29,7 @@\n * The following features are implemented:\n *
      \n *
    • {@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getType Type}
      • \n- *
    • {@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getDto Dto}
      • \n+ *
    • {@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getContainingType Containing Type}
      • \n *
    \n *

    \n *\n@@ -96,29 +97,34 @@ public void setType(PrimitiveType newType) {\n \t * \n \t * @generated\n \t */\n-\tpublic DTO getDto() {\n-\t\treturn (DTO) eDynamicGet(EnvironmentPackage.ATTRIBUTE__DTO,\n-\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, true, true);\n+\tpublic StructuredType getContainingType() {\n+\t\treturn (StructuredType) eDynamicGet(\n+\t\t\t\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\n+\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE, true,\n+\t\t\t\ttrue);\n \t}\n \n \t/**\n \t * \n \t * \n \t * @generated\n \t */\n-\tpublic DTO basicGetDto() {\n-\t\treturn (DTO) eDynamicGet(EnvironmentPackage.ATTRIBUTE__DTO,\n-\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, false, true);\n+\tpublic StructuredType basicGetContainingType() {\n+\t\treturn (StructuredType) eDynamicGet(\n+\t\t\t\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\n+\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE, false,\n+\t\t\t\ttrue);\n \t}\n \n \t/**\n \t * \n \t * \n \t * @generated\n \t */\n-\tpublic NotificationChain basicSetDto(DTO newDto, NotificationChain msgs) {\n-\t\tmsgs = eBasicSetContainer((InternalEObject) newDto,\n-\t\t\t\tEnvironmentPackage.ATTRIBUTE__DTO, msgs);\n+\tpublic NotificationChain basicSetContainingType(\n+\t\t\tStructuredType newContainingType, NotificationChain msgs) {\n+\t\tmsgs = eBasicSetContainer((InternalEObject) newContainingType,\n+\t\t\t\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE, msgs);\n \t\treturn msgs;\n \t}\n \n@@ -127,9 +133,10 @@ public NotificationChain basicSetDto(DTO newDto, NotificationChain msgs) {\n \t * \n \t * @generated\n \t */\n-\tpublic void setDto(DTO newDto) {\n-\t\teDynamicSet(EnvironmentPackage.ATTRIBUTE__DTO,\n-\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, newDto);\n+\tpublic void setContainingType(StructuredType newContainingType) {\n+\t\teDynamicSet(EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\n+\t\t\t\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE,\n+\t\t\t\tnewContainingType);\n \t}\n \n \t/**\n@@ -141,10 +148,10 @@ public void setDto(DTO newDto) {\n \tpublic NotificationChain eInverseAdd(InternalEObject otherEnd,\n \t\t\tint featureID, NotificationChain msgs) {\n \t\tswitch (featureID) {\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n \t\t\tif (eInternalContainer() != null)\n \t\t\t\tmsgs = eBasicRemoveFromContainer(msgs);\n-\t\t\treturn basicSetDto((DTO) otherEnd, msgs);\n+\t\t\treturn basicSetContainingType((StructuredType) otherEnd, msgs);\n \t\t}\n \t\treturn super.eInverseAdd(otherEnd, featureID, msgs);\n \t}\n@@ -158,8 +165,8 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd,\n \tpublic NotificationChain eInverseRemove(InternalEObject otherEnd,\n \t\t\tint featureID, NotificationChain msgs) {\n \t\tswitch (featureID) {\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n-\t\t\treturn basicSetDto(null, msgs);\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n+\t\t\treturn basicSetContainingType(null, msgs);\n \t\t}\n \t\treturn super.eInverseRemove(otherEnd, featureID, msgs);\n \t}\n@@ -173,9 +180,10 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd,\n \tpublic NotificationChain eBasicRemoveFromContainerFeature(\n \t\t\tNotificationChain msgs) {\n \t\tswitch (eContainerFeatureID()) {\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n \t\t\treturn eInternalContainer().eInverseRemove(this,\n-\t\t\t\t\tEnvironmentPackage.DTO__OWNED_ATTRIBUTES, DTO.class, msgs);\n+\t\t\t\t\tEnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES,\n+\t\t\t\t\tStructuredType.class, msgs);\n \t\t}\n \t\treturn super.eBasicRemoveFromContainerFeature(msgs);\n \t}\n@@ -192,10 +200,10 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {\n \t\t\tif (resolve)\n \t\t\t\treturn getType();\n \t\t\treturn basicGetType();\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n \t\t\tif (resolve)\n-\t\t\t\treturn getDto();\n-\t\t\treturn basicGetDto();\n+\t\t\t\treturn getContainingType();\n+\t\t\treturn basicGetContainingType();\n \t\t}\n \t\treturn super.eGet(featureID, resolve, coreType);\n \t}\n@@ -211,8 +219,8 @@ public void eSet(int featureID, Object newValue) {\n \t\tcase EnvironmentPackage.ATTRIBUTE__TYPE:\n \t\t\tsetType((PrimitiveType) newValue);\n \t\t\treturn;\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n-\t\t\tsetDto((DTO) newValue);\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n+\t\t\tsetContainingType((StructuredType) newValue);\n \t\t\treturn;\n \t\t}\n \t\tsuper.eSet(featureID, newValue);\n@@ -229,8 +237,8 @@ public void eUnset(int featureID) {\n \t\tcase EnvironmentPackage.ATTRIBUTE__TYPE:\n \t\t\tsetType((PrimitiveType) null);\n \t\t\treturn;\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n-\t\t\tsetDto((DTO) null);\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n+\t\t\tsetContainingType((StructuredType) null);\n \t\t\treturn;\n \t\t}\n \t\tsuper.eUnset(featureID);\n@@ -246,8 +254,8 @@ public boolean eIsSet(int featureID) {\n \t\tswitch (featureID) {\n \t\tcase EnvironmentPackage.ATTRIBUTE__TYPE:\n \t\t\treturn basicGetType() != null;\n-\t\tcase EnvironmentPackage.ATTRIBUTE__DTO:\n-\t\t\treturn basicGetDto() != null;\n+\t\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\n+\t\t\treturn basicGetContainingType() != null;\n \t\t}\n \t\treturn super.eIsSet(featureID);\n \t}","raw_url":"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fimpl%2FAttributeImpl.java","sha":"48804ec0c80437ac9c0169be060d86062c8820c6","status":"modified"}],"string":"[\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/designs%2Fcinematic%2Fplugins%2Forg.obeonetwork.dsl.cinematic.design%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fcinematic%2Fdesign%2Fservices%2FCinematicBindingServices.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/designs%2Fcinematic%2Fplugins%2Forg.obeonetwork.dsl.cinematic.design%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fcinematic%2Fdesign%2Fservices%2FCinematicBindingServices.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 2,\n \"filename\": \"designs/cinematic/plugins/org.obeonetwork.dsl.cinematic.design/src/org/obeonetwork/dsl/cinematic/design/services/CinematicBindingServices.java\",\n \"new_code\": \"\\t\\t\\treturn attribute.getContainingType().getName() + \\\".\\\" + attribute.getName() + \\\" (DTO Attribute)\\\";\\n\\t\\t\\treturn reference.getContainingType().getName() + \\\".\\\" + reference.getName() + \\\" (DTO Reference)\\\";\",\n \"new_methods\": [],\n \"old_code\": \"\\t\\t\\treturn attribute.getDto().getName() + \\\".\\\" + attribute.getName() + \\\" (DTO Attribute)\\\";\\n\\t\\t\\treturn reference.getDto().getName() + \\\".\\\" + reference.getName() + \\\" (DTO Reference)\\\";\",\n \"old_methods\": [],\n \"patch\": \"@@ -46,10 +46,10 @@ public String getCinematicBindingInfoLabel(BindingInfo bindingInfo) {\\n \\t\\t\\treturn ((DTO) element).getName() + \\\" (DTO)\\\";\\n \\t\\t} else if (element instanceof Attribute) {\\n \\t\\t\\tAttribute attribute = (Attribute) element;\\n-\\t\\t\\treturn attribute.getDto().getName() + \\\".\\\" + attribute.getName() + \\\" (DTO Attribute)\\\";\\n+\\t\\t\\treturn attribute.getContainingType().getName() + \\\".\\\" + attribute.getName() + \\\" (DTO Attribute)\\\";\\n \\t\\t} else if (element instanceof Reference) {\\n \\t\\t\\tReference reference = (Reference) element;\\n-\\t\\t\\treturn reference.getDto().getName() + \\\".\\\" + reference.getName() + \\\" (DTO Reference)\\\";\\n+\\t\\t\\treturn reference.getContainingType().getName() + \\\".\\\" + reference.getName() + \\\" (DTO Reference)\\\";\\n \\t\\t} else if (element.eClass().getEPackage().getNsURI().startsWith(\\\"http://www.obeonetwork.org/dsl/entity/\\\")) {\\n \\t\\t\\tif (\\\"Entity\\\".equals(element.eClass().getName())) {\\n \\t\\t\\t\\treturn getNameByReflection(element) + \\\" (Entity)\\\";\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/designs%2Fcinematic%2Fplugins%2Forg.obeonetwork.dsl.cinematic.design%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fcinematic%2Fdesign%2Fservices%2FCinematicBindingServices.java\",\n \"sha\": \"ed51d06c83432305143753f751d3f8509bc621b4\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2FMETA-INF%2FMANIFEST.MF\",\n \"changes\": 3,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 1,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/META-INF/MANIFEST.MF\",\n \"new_code\": \"Bundle-SymbolicName: org.obeonetwork.dsl.entity.edit;singleton:=true\\n org.obeonetwork.dsl.environment;visibility:=reexport,\",\n \"new_methods\": [],\n \"old_code\": \"Bundle-SymbolicName: org.obeonetwork.dsl.entity.edit; singleton:=true\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,7 +1,7 @@\\n Manifest-Version: 1.0\\n Bundle-ManifestVersion: 2\\n Bundle-Name: %pluginName\\n-Bundle-SymbolicName: org.obeonetwork.dsl.entity.edit; singleton:=true\\n+Bundle-SymbolicName: org.obeonetwork.dsl.entity.edit;singleton:=true\\n Bundle-Version: 2.4.0.qualifier\\n Bundle-ClassPath: .\\n Bundle-Activator: org.obeonetwork.dsl.entity.provider.EntityEditPlugin$Implementation\\n@@ -11,6 +11,7 @@ Export-Package: org.obeonetwork.dsl.entity.extensionUtilities.provider,\\n org.obeonetwork.dsl.entity.provider\\n Require-Bundle: org.eclipse.core.runtime,\\n org.eclipse.emf.edit;visibility:=reexport,\\n+ org.obeonetwork.dsl.environment;visibility:=reexport,\\n org.obeonetwork.dsl.environment.edit,\\n org.obeonetwork.dsl.entity;visibility:=reexport,\\n org.eclipse.emf.eef.runtime\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2FMETA-INF%2FMANIFEST.MF\",\n \"sha\": \"429297f9e6afdc41c20a48bda9e3acc81483f593\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fmodels%2Fentity.components\",\n \"changes\": 129,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fmodels%2Fentity.components?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 126,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/models/entity.components\",\n \"new_code\": \" \\n \\n \",\n \"new_methods\": [],\n \"old_code\": \" \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \",\n \"old_methods\": [],\n \"patch\": \"@@ -4,7 +4,7 @@\\n \\n \\n \\n- \\n+ \\n \\n \\n \\n@@ -14,24 +14,12 @@\\n \\n \\n \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n \\n \\n \\n \\n \\n- \\n+ \\n \\n \\n \\n@@ -53,63 +41,12 @@\\n \\n \\n \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n \\n \\n \\n \\n \\n- \\n+ \\n \\n \\n \\n@@ -164,17 +101,6 @@\\n \\n \\n \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n \\n \\n \\n@@ -201,55 +127,6 @@\\n \\n \\n \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n \\n \\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fmodels%2Fentity.components\",\n \"sha\": \"273abc205279c952d528547cdda9f37623565d15\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.properties\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/plugin.properties\",\n \"new_code\": \"_UI_Root_namespaces_feature = Namespaces\\n_UI_Root_name_feature = Name\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -112,3 +112,5 @@ _UI_InheritanceKind_TABLE_PER_SUBCLASS_literal = TABLE_PER_SUBCLASS\\n _UI_InheritanceKind_TABLE_PER_CLASS_HIERARCHY_literal = TABLE_PER_CLASS_HIERARCHY\\n _UI_Property_isPrimaryKey_feature = Is Primary Key\\n _UI_Finder_multiplicity_feature = Multiplicity\\n+_UI_Root_namespaces_feature = Namespaces\\n+_UI_Root_name_feature = Name\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.properties\",\n \"sha\": \"1ddac1ae70392d80687f0bc5cdd81b69b1850462\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 13,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.xml\",\n \"changes\": 13,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fplugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/plugin.xml\",\n \"new_code\": \"\\n \\n \\n \\n \",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -21,6 +21,19 @@\\n org.eclipse.emf.edit.provider.IItemLabelProvider\\n org.eclipse.emf.edit.provider.IItemPropertySource\\\" />\\n \\n+\\n+ \\n+ \\n+ \\n+ \\n \\n \\n \\n\\n \\n \\n\\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \",\n \"old_methods\": [],\n \"patch\": \"@@ -6,7 +6,7 @@\\n \\n \\n \\n \\n@@ -51,30 +51,12 @@\\n afterTab=\\\"Root\\\">\\n \\n \\n- \\n- \\n-\\n \\n \\n \\n- \\n- \\n-\\n- \\n- \\n-\\n \\n \\n- \\n- \\n- \\n- \\n \\n \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n J�r�me Benois\\n\\t\\t\\treturn EntityPackage.eINSTANCE.getRoot_Name();\\n\\t\\t\\tif (EntityPackage.eINSTANCE.getRoot_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && rootPart != null && isAccessible(EntityViewsRepository.Root.Properties.name)) {\\n\\t\\t\\tEntityPackage.eINSTANCE.getRoot_Name(),\\n\\t\\t\\t\\t\\t\\tnewValue = EEFConverterUtil.createFromString(EntityPackage.eINSTANCE.getRoot_Name().getEAttributeType(), (String)newValue);\\n\\t\\t\\t\\t\\tret = Diagnostician.INSTANCE.validate(EntityPackage.eINSTANCE.getRoot_Name().getEAttributeType(), newValue);\",\n \"new_methods\": [],\n \"old_code\": \" * @author J�r�me Benois\\n\\t\\t\\treturn EnvironmentPackage.eINSTANCE.getNamespace_Name();\\n\\t\\t\\tif (EnvironmentPackage.eINSTANCE.getNamespace_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && rootPart != null && isAccessible(EntityViewsRepository.Root.Properties.name)) {\\n\\t\\t\\tEnvironmentPackage.eINSTANCE.getNamespace_Name(),\\n\\t\\t\\t\\t\\t\\tnewValue = EEFConverterUtil.createFromString(EnvironmentPackage.eINSTANCE.getNamespace_Name().getEAttributeType(), (String)newValue);\\n\\t\\t\\t\\t\\tret = Diagnostician.INSTANCE.validate(EnvironmentPackage.eINSTANCE.getNamespace_Name().getEAttributeType(), newValue);\",\n \"old_methods\": [],\n \"patch\": \"@@ -27,6 +27,7 @@\\n import org.eclipse.emf.eef.runtime.context.PropertiesEditingContext;\\n import org.eclipse.emf.eef.runtime.impl.components.SinglePartPropertiesEditingComponent;\\n import org.eclipse.emf.eef.runtime.impl.utils.EEFConverterUtil;\\n+import org.obeonetwork.dsl.entity.EntityPackage;\\n import org.obeonetwork.dsl.entity.Root;\\n import org.obeonetwork.dsl.entity.parts.EntityViewsRepository;\\n import org.obeonetwork.dsl.entity.parts.RootPropertiesEditionPart;\\n@@ -36,7 +37,7 @@\\n // End of user code\\n \\n /**\\n- * @author J�r�me Benois\\n+ * @author J�r�me Benois\\n * \\n */\\n public class RootRootPropertiesEditionComponent extends SinglePartPropertiesEditingComponent {\\n@@ -98,7 +99,7 @@ public void initPart(Object key, int kind, EObject elt, ResourceSet allResource)\\n \\t */\\n \\tpublic EStructuralFeature associatedFeature(Object editorKey) {\\n \\t\\tif (editorKey == EntityViewsRepository.Root.Properties.name) {\\n-\\t\\t\\treturn EnvironmentPackage.eINSTANCE.getNamespace_Name();\\n+\\t\\t\\treturn EntityPackage.eINSTANCE.getRoot_Name();\\n \\t\\t}\\n \\t\\tif (editorKey == EntityViewsRepository.Root.Properties.description) {\\n \\t\\t\\treturn EnvironmentPackage.eINSTANCE.getObeoDSMObject_Description();\\n@@ -129,7 +130,7 @@ public void updatePart(Notification msg) {\\n \\t\\tsuper.updatePart(msg);\\n \\t\\tif (editingPart.isVisible()) {\\n \\t\\t\\tRootPropertiesEditionPart rootPart = (RootPropertiesEditionPart)editingPart;\\n-\\t\\t\\tif (EnvironmentPackage.eINSTANCE.getNamespace_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && rootPart != null && isAccessible(EntityViewsRepository.Root.Properties.name)) {\\n+\\t\\t\\tif (EntityPackage.eINSTANCE.getRoot_Name().equals(msg.getFeature()) && msg.getNotifier().equals(semanticObject) && rootPart != null && isAccessible(EntityViewsRepository.Root.Properties.name)) {\\n \\t\\t\\t\\tif (msg.getNewValue() != null) {\\n \\t\\t\\t\\t\\trootPart.setName(EcoreUtil.convertToString(EcorePackage.Literals.ESTRING, msg.getNewValue()));\\n \\t\\t\\t\\t} else {\\n@@ -155,7 +156,7 @@ public void updatePart(Notification msg) {\\n \\t@Override\\n \\tprotected NotificationFilter[] getNotificationFilters() {\\n \\t\\tNotificationFilter filter = new EStructuralFeatureNotificationFilter(\\n-\\t\\t\\tEnvironmentPackage.eINSTANCE.getNamespace_Name(),\\n+\\t\\t\\tEntityPackage.eINSTANCE.getRoot_Name(),\\n \\t\\t\\tEnvironmentPackage.eINSTANCE.getObeoDSMObject_Description()\\t\\t);\\n \\t\\treturn new NotificationFilter[] {filter,};\\n \\t}\\n@@ -174,9 +175,9 @@ public Diagnostic validateValue(IPropertiesEditionEvent event) {\\n \\t\\t\\t\\tif (EntityViewsRepository.Root.Properties.name == event.getAffectedEditor()) {\\n \\t\\t\\t\\t\\tObject newValue = event.getNewValue();\\n \\t\\t\\t\\t\\tif (newValue instanceof String) {\\n-\\t\\t\\t\\t\\t\\tnewValue = EEFConverterUtil.createFromString(EnvironmentPackage.eINSTANCE.getNamespace_Name().getEAttributeType(), (String)newValue);\\n+\\t\\t\\t\\t\\t\\tnewValue = EEFConverterUtil.createFromString(EntityPackage.eINSTANCE.getRoot_Name().getEAttributeType(), (String)newValue);\\n \\t\\t\\t\\t\\t}\\n-\\t\\t\\t\\t\\tret = Diagnostician.INSTANCE.validate(EnvironmentPackage.eINSTANCE.getNamespace_Name().getEAttributeType(), newValue);\\n+\\t\\t\\t\\t\\tret = Diagnostician.INSTANCE.validate(EntityPackage.eINSTANCE.getRoot_Name().getEAttributeType(), newValue);\\n \\t\\t\\t\\t}\\n \\t\\t\\t\\tif (EntityViewsRepository.Root.Properties.description == event.getAffectedEditor()) {\\n \\t\\t\\t\\t\\tObject newValue = event.getNewValue();\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fcomponents%2FRootRootPropertiesEditionComponent.java\",\n \"sha\": \"a7291f6c66f42aa01c29370a88881fabeaeb2d9f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fparts%2FEntityViewsRepository.java\",\n \"changes\": 81,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fparts%2FEntityViewsRepository.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 81,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/parts/EntityViewsRepository.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\t/**\\n\\t * Block view descriptor\\n\\t * \\n\\t */\\n\\tpublic static class Block {\\n\\t\\tpublic static class Properties {\\n\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String name = \\\"entity::Block::properties::name\\\";\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String description = \\\"entity::Block::properties::description\\\";\\n\\t\\t\\t\\n\\t\\n\\t\\t}\\n\\t\\n\\t}\\n\\n\\t/**\\n\\t * Attribute view descriptor\\n\\t * \\n\\t */\\n\\tpublic static class Attribute {\\n\\t\\tpublic static class Properties {\\n\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String name = \\\"entity::Attribute::properties::name\\\";\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String type = \\\"entity::Attribute::properties::type\\\";\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String multiplicity = \\\"entity::Attribute::properties::multiplicity\\\";\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String isPrimaryKey = \\\"entity::Attribute::properties::isPrimaryKey\\\";\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String description = \\\"entity::Attribute::properties::description\\\";\\n\\t\\t\\t\\n\\t\\n\\t\\t}\\n\\t\\n\\t}\\n\\n\\t/**\\n\\t * Reference view descriptor\\n\\t * \\n\\t */\\n\\tpublic static class Reference {\\n\\t\\tpublic static class Properties {\\n\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String name = \\\"entity::Reference::properties::name\\\";\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String type = \\\"entity::Reference::properties::type\\\";\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String multiplicity = \\\"entity::Reference::properties::multiplicity\\\";\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String isPrimaryKey = \\\"entity::Reference::properties::isPrimaryKey\\\";\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String isComposite = \\\"entity::Reference::properties::isComposite\\\";\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String navigable = \\\"entity::Reference::properties::navigable\\\";\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String oppositeOf = \\\"entity::Reference::properties::oppositeOf\\\";\\n\\t\\t\\t\\n\\t\\t\\t\\n\\t\\t\\tpublic static String description = \\\"entity::Reference::properties::description\\\";\\n\\t\\t\\t\\n\\t\\n\\t\\t}\\n\\t\\n\\t}\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -39,24 +39,6 @@ public static class Properties {\\n \\t\\n \\t}\\n \\n-\\t/**\\n-\\t * Block view descriptor\\n-\\t * \\n-\\t */\\n-\\tpublic static class Block {\\n-\\t\\tpublic static class Properties {\\n-\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String name = \\\"entity::Block::properties::name\\\";\\n-\\t\\t\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String description = \\\"entity::Block::properties::description\\\";\\n-\\t\\t\\t\\n-\\t\\n-\\t\\t}\\n-\\t\\n-\\t}\\n-\\n \\t/**\\n \\t * Entity view descriptor\\n \\t * \\n@@ -90,69 +72,6 @@ public static class Properties {\\n \\t\\n \\t}\\n \\n-\\t/**\\n-\\t * Attribute view descriptor\\n-\\t * \\n-\\t */\\n-\\tpublic static class Attribute {\\n-\\t\\tpublic static class Properties {\\n-\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String name = \\\"entity::Attribute::properties::name\\\";\\n-\\t\\t\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String type = \\\"entity::Attribute::properties::type\\\";\\n-\\t\\t\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String multiplicity = \\\"entity::Attribute::properties::multiplicity\\\";\\n-\\t\\t\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String isPrimaryKey = \\\"entity::Attribute::properties::isPrimaryKey\\\";\\n-\\t\\t\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String description = \\\"entity::Attribute::properties::description\\\";\\n-\\t\\t\\t\\n-\\t\\n-\\t\\t}\\n-\\t\\n-\\t}\\n-\\n-\\t/**\\n-\\t * Reference view descriptor\\n-\\t * \\n-\\t */\\n-\\tpublic static class Reference {\\n-\\t\\tpublic static class Properties {\\n-\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String name = \\\"entity::Reference::properties::name\\\";\\n-\\t\\t\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String type = \\\"entity::Reference::properties::type\\\";\\n-\\t\\t\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String multiplicity = \\\"entity::Reference::properties::multiplicity\\\";\\n-\\t\\t\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String isPrimaryKey = \\\"entity::Reference::properties::isPrimaryKey\\\";\\n-\\t\\t\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String isComposite = \\\"entity::Reference::properties::isComposite\\\";\\n-\\t\\t\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String navigable = \\\"entity::Reference::properties::navigable\\\";\\n-\\t\\t\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String oppositeOf = \\\"entity::Reference::properties::oppositeOf\\\";\\n-\\t\\t\\t\\n-\\t\\t\\t\\n-\\t\\t\\tpublic static String description = \\\"entity::Reference::properties::description\\\";\\n-\\t\\t\\t\\n-\\t\\n-\\t\\t}\\n-\\t\\n-\\t}\\n-\\n \\t/**\\n \\t * Finder view descriptor\\n \\t * \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fparts%2FEntityViewsRepository.java\",\n \"sha\": \"c8221c3ac9d2796b1e3ea938864e4713003e5ed2\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 4,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityEEFAdapterFactory.java\",\n \"changes\": 38,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityEEFAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 34,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java\",\n \"new_code\": \"import org.obeonetwork.dsl.environment.providers.TypesDefinitionPropertiesEditionProvider;\\n\\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createTypesDefinitionAdapter()\\n\\tpublic Adapter createTypesDefinitionAdapter() {\\n\\t\\treturn new TypesDefinitionPropertiesEditionProvider(providers);\",\n \"new_methods\": [],\n \"old_code\": \"import org.obeonetwork.dsl.environment.providers.NamespacePropertiesEditionProvider;\\n\\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createNamespaceAdapter()\\n\\tpublic Adapter createNamespaceAdapter() {\\n\\t\\treturn new NamespacePropertiesEditionProvider(providers);\\n\\t/**\\n\\t * {@inheritDoc}\\n\\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createBlockAdapter()\\n\\t * \\n\\t */\\n\\tpublic Adapter createBlockAdapter() {\\n\\t\\tList providers = new ArrayList(1);\\n\\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n\\t\\treturn new BlockPropertiesEditionProvider(providers);\\n\\t}\\n\\t/**\\n\\t * {@inheritDoc}\\n\\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createAttributeAdapter()\\n\\t * \\n\\t */\\n\\tpublic Adapter createAttributeAdapter() {\\n\\t\\tList providers = new ArrayList(1);\\n\\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n\\t\\treturn new AttributePropertiesEditionProvider(providers);\\n\\t}\\n\\t/**\\n\\t * {@inheritDoc}\\n\\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createReferenceAdapter()\\n\\t * \\n\\t */\\n\\tpublic Adapter createReferenceAdapter() {\\n\\t\\tList providers = new ArrayList(1);\\n\\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n\\t\\treturn new ReferencePropertiesEditionProvider(providers);\\n\\t}\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java\",\n \"implementation\": \"return new NamespacePropertiesEditionProvider(providers);\\n\\t/**\\n\\t * {@inheritDoc\",\n \"signature\": \"Adapter createNamespaceAdapter()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java\",\n \"implementation\": \"List providers = new ArrayList(1);\\n\\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n\\t\\treturn new BlockPropertiesEditionProvider(providers);\",\n \"signature\": \"Adapter createBlockAdapter()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java\",\n \"implementation\": \"List providers = new ArrayList(1);\\n\\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n\\t\\treturn new AttributePropertiesEditionProvider(providers);\",\n \"signature\": \"Adapter createAttributeAdapter()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityEEFAdapterFactory.java\",\n \"implementation\": \"List providers = new ArrayList(1);\\n\\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n\\t\\treturn new ReferencePropertiesEditionProvider(providers);\",\n \"signature\": \"Adapter createReferenceAdapter()\"\n }\n ],\n \"patch\": \"@@ -20,7 +20,7 @@\\n import org.obeonetwork.dsl.entity.util.EntityAdapterFactory;\\n \\n import org.obeonetwork.dsl.environment.providers.MetadataCptPropertiesEditionProvider;\\n-import org.obeonetwork.dsl.environment.providers.NamespacePropertiesEditionProvider;\\n+import org.obeonetwork.dsl.environment.providers.TypesDefinitionPropertiesEditionProvider;\\n \\n /**\\n * @author J�r�me Benois\\n@@ -38,13 +38,13 @@ public Adapter createObeoDSMObjectAdapter() {\\n \\t}\\n \\t/**\\n \\t * {@inheritDoc}\\n-\\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createNamespaceAdapter()\\n+\\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createTypesDefinitionAdapter()\\n \\t * \\n \\t */\\n-\\tpublic Adapter createNamespaceAdapter() {\\n+\\tpublic Adapter createTypesDefinitionAdapter() {\\n \\t\\tList providers = new ArrayList(1);\\n \\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n-\\t\\treturn new NamespacePropertiesEditionProvider(providers);\\n+\\t\\treturn new TypesDefinitionPropertiesEditionProvider(providers);\\n \\t}\\n \\t/**\\n \\t * {@inheritDoc}\\n@@ -56,16 +56,6 @@ public Adapter createRootAdapter() {\\n \\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n \\t\\treturn new RootPropertiesEditionProvider(providers);\\n \\t}\\n-\\t/**\\n-\\t * {@inheritDoc}\\n-\\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createBlockAdapter()\\n-\\t * \\n-\\t */\\n-\\tpublic Adapter createBlockAdapter() {\\n-\\t\\tList providers = new ArrayList(1);\\n-\\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n-\\t\\treturn new BlockPropertiesEditionProvider(providers);\\n-\\t}\\n \\t/**\\n \\t * {@inheritDoc}\\n \\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createEntityAdapter()\\n@@ -76,26 +66,6 @@ public Adapter createEntityAdapter() {\\n \\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n \\t\\treturn new EntityPropertiesEditionProvider(providers);\\n \\t}\\n-\\t/**\\n-\\t * {@inheritDoc}\\n-\\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createAttributeAdapter()\\n-\\t * \\n-\\t */\\n-\\tpublic Adapter createAttributeAdapter() {\\n-\\t\\tList providers = new ArrayList(1);\\n-\\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n-\\t\\treturn new AttributePropertiesEditionProvider(providers);\\n-\\t}\\n-\\t/**\\n-\\t * {@inheritDoc}\\n-\\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createReferenceAdapter()\\n-\\t * \\n-\\t */\\n-\\tpublic Adapter createReferenceAdapter() {\\n-\\t\\tList providers = new ArrayList(1);\\n-\\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n-\\t\\treturn new ReferencePropertiesEditionProvider(providers);\\n-\\t}\\n \\t/**\\n \\t * {@inheritDoc}\\n \\t * @see org.obeonetwork.dsl.entity.util.EntityAdapterFactory#createFinderAdapter()\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityEEFAdapterFactory.java\",\n \"sha\": \"d416f42f72465ced8bd8f084166ece0fa9246bab\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityMessages.java\",\n \"changes\": 72,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityMessages.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 72,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityMessages.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\tpublic static String BlockPropertiesEditionPart_PropertiesGroupLabel;\\n\\n\\t\\n\\tpublic static String AttributePropertiesEditionPart_PropertiesGroupLabel;\\n\\n\\t\\n\\tpublic static String ReferencePropertiesEditionPart_PropertiesGroupLabel;\\n\\n\\t\\n\\tpublic static String Block_ReadOnly;\\n\\n\\t\\n\\tpublic static String Block_Part_Title;\\n\\n\\t\\n\\tpublic static String Attribute_ReadOnly;\\n\\n\\t\\n\\tpublic static String Attribute_Part_Title;\\n\\n\\t\\n\\tpublic static String Reference_ReadOnly;\\n\\n\\t\\n\\tpublic static String Reference_Part_Title;\\n\\n\\t\\n\\tpublic static String BlockPropertiesEditionPart_NameLabel;\\n\\n\\t\\n\\tpublic static String BlockPropertiesEditionPart_DescriptionLabel;\\n\\n\\t\\n\\tpublic static String AttributePropertiesEditionPart_NameLabel;\\n\\n\\t\\n\\tpublic static String AttributePropertiesEditionPart_TypeLabel;\\n\\n\\t\\n\\tpublic static String AttributePropertiesEditionPart_MultiplicityLabel;\\n\\n\\t\\n\\tpublic static String AttributePropertiesEditionPart_IsPrimaryKeyLabel;\\n\\n\\t\\n\\tpublic static String AttributePropertiesEditionPart_DescriptionLabel;\\n\\n\\t\\n\\tpublic static String ReferencePropertiesEditionPart_NameLabel;\\n\\n\\t\\n\\tpublic static String ReferencePropertiesEditionPart_TypeLabel;\\n\\n\\t\\n\\tpublic static String ReferencePropertiesEditionPart_MultiplicityLabel;\\n\\n\\t\\n\\tpublic static String ReferencePropertiesEditionPart_IsPrimaryKeyLabel;\\n\\n\\t\\n\\tpublic static String ReferencePropertiesEditionPart_IsCompositeLabel;\\n\\n\\t\\n\\tpublic static String ReferencePropertiesEditionPart_NavigableLabel;\\n\\n\\t\\n\\tpublic static String ReferencePropertiesEditionPart_OppositeOfLabel;\\n\\n\\t\\n\\tpublic static String ReferencePropertiesEditionPart_DescriptionLabel;\\n\\n\\t\",\n \"old_methods\": [],\n \"patch\": \"@@ -24,18 +24,9 @@ public class EntityMessages extends NLS {\\n \\tpublic static String RootPropertiesEditionPart_PropertiesGroupLabel;\\n \\n \\t\\n-\\tpublic static String BlockPropertiesEditionPart_PropertiesGroupLabel;\\n-\\n-\\t\\n \\tpublic static String EntityPropertiesEditionPart_PropertiesGroupLabel;\\n \\n \\t\\n-\\tpublic static String AttributePropertiesEditionPart_PropertiesGroupLabel;\\n-\\n-\\t\\n-\\tpublic static String ReferencePropertiesEditionPart_PropertiesGroupLabel;\\n-\\n-\\t\\n \\tpublic static String FinderPropertiesEditionPart_PropertiesGroupLabel;\\n \\n \\t\\n@@ -52,30 +43,12 @@ public class EntityMessages extends NLS {\\n \\tpublic static String Root_Part_Title;\\n \\n \\t\\n-\\tpublic static String Block_ReadOnly;\\n-\\n-\\t\\n-\\tpublic static String Block_Part_Title;\\n-\\n-\\t\\n \\tpublic static String Entity_ReadOnly;\\n \\n \\t\\n \\tpublic static String Entity_Part_Title;\\n \\n \\t\\n-\\tpublic static String Attribute_ReadOnly;\\n-\\n-\\t\\n-\\tpublic static String Attribute_Part_Title;\\n-\\n-\\t\\n-\\tpublic static String Reference_ReadOnly;\\n-\\n-\\t\\n-\\tpublic static String Reference_Part_Title;\\n-\\n-\\t\\n \\tpublic static String Finder_ReadOnly;\\n \\n \\t\\n@@ -101,12 +74,6 @@ public class EntityMessages extends NLS {\\n \\tpublic static String RootPropertiesEditionPart_DescriptionLabel;\\n \\n \\t\\n-\\tpublic static String BlockPropertiesEditionPart_NameLabel;\\n-\\n-\\t\\n-\\tpublic static String BlockPropertiesEditionPart_DescriptionLabel;\\n-\\n-\\t\\n \\tpublic static String EntityPropertiesEditionPart_NameLabel;\\n \\n \\t\\n@@ -128,45 +95,6 @@ public class EntityMessages extends NLS {\\n \\tpublic static String EntityPropertiesEditionPart_DescriptionLabel;\\n \\n \\t\\n-\\tpublic static String AttributePropertiesEditionPart_NameLabel;\\n-\\n-\\t\\n-\\tpublic static String AttributePropertiesEditionPart_TypeLabel;\\n-\\n-\\t\\n-\\tpublic static String AttributePropertiesEditionPart_MultiplicityLabel;\\n-\\n-\\t\\n-\\tpublic static String AttributePropertiesEditionPart_IsPrimaryKeyLabel;\\n-\\n-\\t\\n-\\tpublic static String AttributePropertiesEditionPart_DescriptionLabel;\\n-\\n-\\t\\n-\\tpublic static String ReferencePropertiesEditionPart_NameLabel;\\n-\\n-\\t\\n-\\tpublic static String ReferencePropertiesEditionPart_TypeLabel;\\n-\\n-\\t\\n-\\tpublic static String ReferencePropertiesEditionPart_MultiplicityLabel;\\n-\\n-\\t\\n-\\tpublic static String ReferencePropertiesEditionPart_IsPrimaryKeyLabel;\\n-\\n-\\t\\n-\\tpublic static String ReferencePropertiesEditionPart_IsCompositeLabel;\\n-\\n-\\t\\n-\\tpublic static String ReferencePropertiesEditionPart_NavigableLabel;\\n-\\n-\\t\\n-\\tpublic static String ReferencePropertiesEditionPart_OppositeOfLabel;\\n-\\n-\\t\\n-\\tpublic static String ReferencePropertiesEditionPart_DescriptionLabel;\\n-\\n-\\t\\n \\tpublic static String FinderPropertiesEditionPart_CustomizedNameLabel;\\n \\n \\t\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityMessages.java\",\n \"sha\": \"c32f38c4747367108f3fc7967b3a8ebd9ea22b09\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityPropertiesEditionPartProvider.java\",\n \"changes\": 24,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityPropertiesEditionPartProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 24,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/EntityPropertiesEditionPartProvider.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"import org.obeonetwork.dsl.entity.parts.forms.AttributePropertiesEditionPartForm;\\nimport org.obeonetwork.dsl.entity.parts.forms.BlockPropertiesEditionPartForm;\\nimport org.obeonetwork.dsl.entity.parts.forms.ReferencePropertiesEditionPartForm;\\nimport org.obeonetwork.dsl.entity.parts.impl.AttributePropertiesEditionPartImpl;\\nimport org.obeonetwork.dsl.entity.parts.impl.BlockPropertiesEditionPartImpl;\\nimport org.obeonetwork.dsl.entity.parts.impl.ReferencePropertiesEditionPartImpl;\\n\\t\\tif (key == EntityViewsRepository.Block.class) {\\n\\t\\t\\tif (kind == EntityViewsRepository.SWT_KIND)\\n\\t\\t\\t\\treturn new BlockPropertiesEditionPartImpl(component);\\n\\t\\t\\tif (kind == EntityViewsRepository.FORM_KIND)\\n\\t\\t\\t\\treturn new BlockPropertiesEditionPartForm(component);\\n\\t\\t}\\n\\t\\tif (key == EntityViewsRepository.Attribute.class) {\\n\\t\\t\\tif (kind == EntityViewsRepository.SWT_KIND)\\n\\t\\t\\t\\treturn new AttributePropertiesEditionPartImpl(component);\\n\\t\\t\\tif (kind == EntityViewsRepository.FORM_KIND)\\n\\t\\t\\t\\treturn new AttributePropertiesEditionPartForm(component);\\n\\t\\t}\\n\\t\\tif (key == EntityViewsRepository.Reference.class) {\\n\\t\\t\\tif (kind == EntityViewsRepository.SWT_KIND)\\n\\t\\t\\t\\treturn new ReferencePropertiesEditionPartImpl(component);\\n\\t\\t\\tif (kind == EntityViewsRepository.FORM_KIND)\\n\\t\\t\\t\\treturn new ReferencePropertiesEditionPartForm(component);\\n\\t\\t}\",\n \"old_methods\": [],\n \"patch\": \"@@ -18,22 +18,16 @@\\n \\n import org.obeonetwork.dsl.entity.parts.EntityViewsRepository;\\n \\n-import org.obeonetwork.dsl.entity.parts.forms.AttributePropertiesEditionPartForm;\\n-import org.obeonetwork.dsl.entity.parts.forms.BlockPropertiesEditionPartForm;\\n import org.obeonetwork.dsl.entity.parts.forms.EntityPropertiesEditionPartForm;\\n import org.obeonetwork.dsl.entity.parts.forms.ExternalCriterionPropertiesEditionPartForm;\\n import org.obeonetwork.dsl.entity.parts.forms.FinderPropertiesEditionPartForm;\\n import org.obeonetwork.dsl.entity.parts.forms.InternalCriterionPropertiesEditionPartForm;\\n-import org.obeonetwork.dsl.entity.parts.forms.ReferencePropertiesEditionPartForm;\\n import org.obeonetwork.dsl.entity.parts.forms.RootPropertiesEditionPartForm;\\n \\n-import org.obeonetwork.dsl.entity.parts.impl.AttributePropertiesEditionPartImpl;\\n-import org.obeonetwork.dsl.entity.parts.impl.BlockPropertiesEditionPartImpl;\\n import org.obeonetwork.dsl.entity.parts.impl.EntityPropertiesEditionPartImpl;\\n import org.obeonetwork.dsl.entity.parts.impl.ExternalCriterionPropertiesEditionPartImpl;\\n import org.obeonetwork.dsl.entity.parts.impl.FinderPropertiesEditionPartImpl;\\n import org.obeonetwork.dsl.entity.parts.impl.InternalCriterionPropertiesEditionPartImpl;\\n-import org.obeonetwork.dsl.entity.parts.impl.ReferencePropertiesEditionPartImpl;\\n import org.obeonetwork.dsl.entity.parts.impl.RootPropertiesEditionPartImpl;\\n \\n /**\\n@@ -63,30 +57,12 @@ public IPropertiesEditionPart getPropertiesEditionPart(Object key, int kind, IPr\\n \\t\\t\\tif (kind == EntityViewsRepository.FORM_KIND)\\n \\t\\t\\t\\treturn new RootPropertiesEditionPartForm(component);\\n \\t\\t}\\n-\\t\\tif (key == EntityViewsRepository.Block.class) {\\n-\\t\\t\\tif (kind == EntityViewsRepository.SWT_KIND)\\n-\\t\\t\\t\\treturn new BlockPropertiesEditionPartImpl(component);\\n-\\t\\t\\tif (kind == EntityViewsRepository.FORM_KIND)\\n-\\t\\t\\t\\treturn new BlockPropertiesEditionPartForm(component);\\n-\\t\\t}\\n \\t\\tif (key == EntityViewsRepository.Entity_.class) {\\n \\t\\t\\tif (kind == EntityViewsRepository.SWT_KIND)\\n \\t\\t\\t\\treturn new EntityPropertiesEditionPartImpl(component);\\n \\t\\t\\tif (kind == EntityViewsRepository.FORM_KIND)\\n \\t\\t\\t\\treturn new EntityPropertiesEditionPartForm(component);\\n \\t\\t}\\n-\\t\\tif (key == EntityViewsRepository.Attribute.class) {\\n-\\t\\t\\tif (kind == EntityViewsRepository.SWT_KIND)\\n-\\t\\t\\t\\treturn new AttributePropertiesEditionPartImpl(component);\\n-\\t\\t\\tif (kind == EntityViewsRepository.FORM_KIND)\\n-\\t\\t\\t\\treturn new AttributePropertiesEditionPartForm(component);\\n-\\t\\t}\\n-\\t\\tif (key == EntityViewsRepository.Reference.class) {\\n-\\t\\t\\tif (kind == EntityViewsRepository.SWT_KIND)\\n-\\t\\t\\t\\treturn new ReferencePropertiesEditionPartImpl(component);\\n-\\t\\t\\tif (kind == EntityViewsRepository.FORM_KIND)\\n-\\t\\t\\t\\treturn new ReferencePropertiesEditionPartForm(component);\\n-\\t\\t}\\n \\t\\tif (key == EntityViewsRepository.Finder.class) {\\n \\t\\t\\tif (kind == EntityViewsRepository.SWT_KIND)\\n \\t\\t\\t\\treturn new FinderPropertiesEditionPartImpl(component);\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FEntityPropertiesEditionPartProvider.java\",\n \"sha\": \"6d0f7dddd0d63e8f22cc2e57f0aafc277fc74f12\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages.properties\",\n \"changes\": 24,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 24,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/entityMessages.properties\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"BlockPropertiesEditionPart_PropertiesGroupLabel=Properties\\nAttributePropertiesEditionPart_PropertiesGroupLabel=Properties\\nReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\\nBlock_ReadOnly=This property is read only\\nBlock_Part_Title=Block\\nAttribute_ReadOnly=This property is read only\\nAttribute_Part_Title=Attribute\\nReference_ReadOnly=This property is read only\\nReference_Part_Title=Reference\\nBlockPropertiesEditionPart_NameLabel=Name : \\nBlockPropertiesEditionPart_DescriptionLabel=Description : \\nAttributePropertiesEditionPart_NameLabel=Name : \\nAttributePropertiesEditionPart_TypeLabel=Type : \\nAttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \\nAttributePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\\nAttributePropertiesEditionPart_DescriptionLabel=Description : \\nReferencePropertiesEditionPart_NameLabel=Name : \\nReferencePropertiesEditionPart_TypeLabel=Type : \\nReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \\nReferencePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\\nReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\\nReferencePropertiesEditionPart_NavigableLabel=Navigable\\nReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \\nReferencePropertiesEditionPart_DescriptionLabel=Description : \",\n \"old_methods\": [],\n \"patch\": \"@@ -15,23 +15,14 @@\\n \\n # default values ...\\n RootPropertiesEditionPart_PropertiesGroupLabel=Properties\\n-BlockPropertiesEditionPart_PropertiesGroupLabel=Properties\\n EntityPropertiesEditionPart_PropertiesGroupLabel=Properties\\n-AttributePropertiesEditionPart_PropertiesGroupLabel=Properties\\n-ReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\\n FinderPropertiesEditionPart_PropertiesGroupLabel=Properties\\n InternalCriterionPropertiesEditionPart_PropertiesGroupLabel=Properties\\n ExternalCriterionPropertiesEditionPart_PropertiesGroupLabel=Properties\\n Root_ReadOnly=This property is read only\\n Root_Part_Title=Root\\n-Block_ReadOnly=This property is read only\\n-Block_Part_Title=Block\\n Entity_ReadOnly=This property is read only\\n Entity_Part_Title=Entity\\n-Attribute_ReadOnly=This property is read only\\n-Attribute_Part_Title=Attribute\\n-Reference_ReadOnly=This property is read only\\n-Reference_Part_Title=Reference\\n Finder_ReadOnly=This property is read only\\n Finder_Part_Title=Finder\\n InternalCriterion_ReadOnly=This property is read only\\n@@ -40,28 +31,13 @@ ExternalCriterion_ReadOnly=This property is read only\\n ExternalCriterion_Part_Title=ExternalCriterion\\n RootPropertiesEditionPart_NameLabel=Name : \\n RootPropertiesEditionPart_DescriptionLabel=Description : \\n-BlockPropertiesEditionPart_NameLabel=Name : \\n-BlockPropertiesEditionPart_DescriptionLabel=Description : \\n EntityPropertiesEditionPart_NameLabel=Name : \\n EntityPropertiesEditionPart_SuperTypeLabel=SuperType : \\n EntityPropertiesEditionPart_EstimatedVolumetryLabel=EstimatedVolumetry : \\n EntityPropertiesEditionPart_EstimatedAccessLabel=EstimatedAccess : \\n EntityPropertiesEditionPart_HistorizedLabel=Historized\\n EntityPropertiesEditionPart_InheritanceKindLabel=InheritanceKind : \\n EntityPropertiesEditionPart_DescriptionLabel=Description : \\n-AttributePropertiesEditionPart_NameLabel=Name : \\n-AttributePropertiesEditionPart_TypeLabel=Type : \\n-AttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \\n-AttributePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\\n-AttributePropertiesEditionPart_DescriptionLabel=Description : \\n-ReferencePropertiesEditionPart_NameLabel=Name : \\n-ReferencePropertiesEditionPart_TypeLabel=Type : \\n-ReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \\n-ReferencePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\\n-ReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\\n-ReferencePropertiesEditionPart_NavigableLabel=Navigable\\n-ReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \\n-ReferencePropertiesEditionPart_DescriptionLabel=Description : \\n FinderPropertiesEditionPart_CustomizedNameLabel=CustomizedName : \\n FinderPropertiesEditionPart_MultiplicityLabel=Multiplicity : \\n FinderPropertiesEditionPart_DescriptionLabel=Description : \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages.properties\",\n \"sha\": \"e551490d3772a5bcf82734c6159364943ef6b8c0\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages_fr.properties\",\n \"changes\": 24,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages_fr.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 24,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src-gen/org/obeonetwork/dsl/entity/providers/entityMessages_fr.properties\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"BlockPropertiesEditionPart_PropertiesGroupLabel=Properties\\nAttributePropertiesEditionPart_PropertiesGroupLabel=Properties\\nReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\\nBlock_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\nBlock_Part_Title=Block\\nAttribute_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\nAttribute_Part_Title=Attribute\\nReference_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\nReference_Part_Title=Reference\\nBlockPropertiesEditionPart_NameLabel=Name : \\nBlockPropertiesEditionPart_DescriptionLabel=Description : \\nAttributePropertiesEditionPart_NameLabel=Name : \\nAttributePropertiesEditionPart_TypeLabel=Type : \\nAttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \\nAttributePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\\nAttributePropertiesEditionPart_DescriptionLabel=Description : \\nReferencePropertiesEditionPart_NameLabel=Name : \\nReferencePropertiesEditionPart_TypeLabel=Type : \\nReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \\nReferencePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\\nReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\\nReferencePropertiesEditionPart_NavigableLabel=Navigable\\nReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \\nReferencePropertiesEditionPart_DescriptionLabel=Description : \",\n \"old_methods\": [],\n \"patch\": \"@@ -15,23 +15,14 @@\\n \\n # default values ...\\n RootPropertiesEditionPart_PropertiesGroupLabel=Properties\\n-BlockPropertiesEditionPart_PropertiesGroupLabel=Properties\\n EntityPropertiesEditionPart_PropertiesGroupLabel=Properties\\n-AttributePropertiesEditionPart_PropertiesGroupLabel=Properties\\n-ReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\\n FinderPropertiesEditionPart_PropertiesGroupLabel=Properties\\n InternalCriterionPropertiesEditionPart_PropertiesGroupLabel=Properties\\n ExternalCriterionPropertiesEditionPart_PropertiesGroupLabel=Properties\\n Root_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n Root_Part_Title=Root\\n-Block_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n-Block_Part_Title=Block\\n Entity_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n Entity_Part_Title=Entity\\n-Attribute_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n-Attribute_Part_Title=Attribute\\n-Reference_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n-Reference_Part_Title=Reference\\n Finder_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n Finder_Part_Title=Finder\\n InternalCriterion_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n@@ -40,28 +31,13 @@ ExternalCriterion_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n ExternalCriterion_Part_Title=ExternalCriterion\\n RootPropertiesEditionPart_NameLabel=Name : \\n RootPropertiesEditionPart_DescriptionLabel=Description : \\n-BlockPropertiesEditionPart_NameLabel=Name : \\n-BlockPropertiesEditionPart_DescriptionLabel=Description : \\n EntityPropertiesEditionPart_NameLabel=Name : \\n EntityPropertiesEditionPart_SuperTypeLabel=SuperType : \\n EntityPropertiesEditionPart_EstimatedVolumetryLabel=EstimatedVolumetry : \\n EntityPropertiesEditionPart_EstimatedAccessLabel=EstimatedAccess : \\n EntityPropertiesEditionPart_HistorizedLabel=Historized\\n EntityPropertiesEditionPart_InheritanceKindLabel=InheritanceKind : \\n EntityPropertiesEditionPart_DescriptionLabel=Description : \\n-AttributePropertiesEditionPart_NameLabel=Name : \\n-AttributePropertiesEditionPart_TypeLabel=Type : \\n-AttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \\n-AttributePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\\n-AttributePropertiesEditionPart_DescriptionLabel=Description : \\n-ReferencePropertiesEditionPart_NameLabel=Name : \\n-ReferencePropertiesEditionPart_TypeLabel=Type : \\n-ReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \\n-ReferencePropertiesEditionPart_IsPrimaryKeyLabel=IsPrimaryKey\\n-ReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\\n-ReferencePropertiesEditionPart_NavigableLabel=Navigable\\n-ReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \\n-ReferencePropertiesEditionPart_DescriptionLabel=Description : \\n FinderPropertiesEditionPart_CustomizedNameLabel=CustomizedName : \\n FinderPropertiesEditionPart_MultiplicityLabel=Multiplicity : \\n FinderPropertiesEditionPart_DescriptionLabel=Description : \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fproviders%2FentityMessages_fr.properties\",\n \"sha\": \"309a89bb42c5deb41a6a477e221bedff09378680\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProvider.java\",\n \"changes\": 37,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 37,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProvider.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\t\\t\\taddSupertypePropertyDescriptor(object);\\n\\t/**\\n\\t * This adds a property descriptor for the Supertype feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addSupertypePropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add\\n\\t\\t\\t(createItemPropertyDescriptor\\n\\t\\t\\t\\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\\n\\t\\t\\t\\t getResourceLocator(),\\n\\t\\t\\t\\t getString(\\\"_UI_Entity_supertype_feature\\\"),\\n\\t\\t\\t\\t getString(\\\"_UI_PropertyDescriptor_description\\\", \\\"_UI_Entity_supertype_feature\\\", \\\"_UI_Entity_type\\\"),\\n\\t\\t\\t\\t EntityPackage.Literals.ENTITY__SUPERTYPE,\\n\\t\\t\\t\\t true,\\n\\t\\t\\t\\t false,\\n\\t\\t\\t\\t true,\\n\\t\\t\\t\\t null,\\n\\t\\t\\t\\t null,\\n\\t\\t\\t\\t null));\\n\\t}\\n\\n\\t\\t\\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES);\\n\\t\\t\\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_REFERENCES);\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n\\t\\tnewChildDescriptors.add\\n\\t\\t\\t(createChildParameter\\n\\t\\t\\t\\t(EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES,\\n\\t\\t\\t\\t EntityFactory.eINSTANCE.createAttribute()));\\n\\n\\t\\tnewChildDescriptors.add\\n\\t\\t\\t(createChildParameter\\n\\t\\t\\t\\t(EntityPackage.Literals.ENTITY__OWNED_REFERENCES,\\n\\t\\t\\t\\t EntityFactory.eINSTANCE.createReference()));\\n\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add\\n\\t\\t\\t(createItemPropertyDescriptor\\n\\t\\t\\t\\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\\n\\t\\t\\t\\t getResourceLocator(),\\n\\t\\t\\t\\t getString(\\\"_UI_Entity_supertype_feature\\\"),\\n\\t\\t\\t\\t getString(\\\"_UI_PropertyDescriptor_description\\\", \\\"_UI_Entity_supertype_feature\\\", \\\"_UI_Entity_type\\\"),\\n\\t\\t\\t\\t EntityPackage.Literals.ENTITY__SUPERTYPE,\\n\\t\\t\\t\\t true,\\n\\t\\t\\t\\t false,\\n\\t\\t\\t\\t true,\\n\\t\\t\\t\\t null,\\n\\t\\t\\t\\t null,\\n\\t\\t\\t\\t null));\",\n \"signature\": \"void addSupertypePropertyDescriptor(Object object)\"\n }\n ],\n \"patch\": \"@@ -76,7 +76,6 @@ public List getPropertyDescriptors(Object object) {\\n \\t\\tif (itemPropertyDescriptors == null) {\\n \\t\\t\\tsuper.getPropertyDescriptors(object);\\n \\n-\\t\\t\\taddSupertypePropertyDescriptor(object);\\n \\t\\t\\taddEstimatedVolumetryPropertyDescriptor(object);\\n \\t\\t\\taddEstimatedAccessPropertyDescriptor(object);\\n \\t\\t\\taddHistorizedPropertyDescriptor(object);\\n@@ -85,28 +84,6 @@ public List getPropertyDescriptors(Object object) {\\n \\t\\treturn itemPropertyDescriptors;\\n \\t}\\n \\n-\\t/**\\n-\\t * This adds a property descriptor for the Supertype feature.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprotected void addSupertypePropertyDescriptor(Object object) {\\n-\\t\\titemPropertyDescriptors.add\\n-\\t\\t\\t(createItemPropertyDescriptor\\n-\\t\\t\\t\\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\\n-\\t\\t\\t\\t getResourceLocator(),\\n-\\t\\t\\t\\t getString(\\\"_UI_Entity_supertype_feature\\\"),\\n-\\t\\t\\t\\t getString(\\\"_UI_PropertyDescriptor_description\\\", \\\"_UI_Entity_supertype_feature\\\", \\\"_UI_Entity_type\\\"),\\n-\\t\\t\\t\\t EntityPackage.Literals.ENTITY__SUPERTYPE,\\n-\\t\\t\\t\\t true,\\n-\\t\\t\\t\\t false,\\n-\\t\\t\\t\\t true,\\n-\\t\\t\\t\\t null,\\n-\\t\\t\\t\\t null,\\n-\\t\\t\\t\\t null));\\n-\\t}\\n-\\n \\t/**\\n \\t * This adds a property descriptor for the Estimated Volumetry feature.\\n \\t * \\n@@ -207,8 +184,6 @@ protected void addInheritanceKindPropertyDescriptor(Object object) {\\n \\tpublic Collection getChildrenFeatures(Object object) {\\n \\t\\tif (childrenFeatures == null) {\\n \\t\\t\\tsuper.getChildrenFeatures(object);\\n-\\t\\t\\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES);\\n-\\t\\t\\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_REFERENCES);\\n \\t\\t\\tchildrenFeatures.add(EntityPackage.Literals.ENTITY__OWNED_FINDERS);\\n \\t\\t}\\n \\t\\treturn childrenFeatures;\\n@@ -280,8 +255,6 @@ public void notifyChanged(Notification notification) {\\n \\t\\t\\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\\n \\t\\t\\t\\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));\\n \\t\\t\\t\\treturn;\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n \\t\\t\\tcase EntityPackage.ENTITY__OWNED_FINDERS:\\n \\t\\t\\t\\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));\\n \\t\\t\\t\\treturn;\\n@@ -300,16 +273,6 @@ public void notifyChanged(Notification notification) {\\n \\tprotected void collectNewChildDescriptors(Collection newChildDescriptors, Object object) {\\n \\t\\tsuper.collectNewChildDescriptors(newChildDescriptors, object);\\n \\n-\\t\\tnewChildDescriptors.add\\n-\\t\\t\\t(createChildParameter\\n-\\t\\t\\t\\t(EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES,\\n-\\t\\t\\t\\t EntityFactory.eINSTANCE.createAttribute()));\\n-\\n-\\t\\tnewChildDescriptors.add\\n-\\t\\t\\t(createChildParameter\\n-\\t\\t\\t\\t(EntityPackage.Literals.ENTITY__OWNED_REFERENCES,\\n-\\t\\t\\t\\t EntityFactory.eINSTANCE.createReference()));\\n-\\n \\t\\tnewChildDescriptors.add\\n \\t\\t\\t(createChildParameter\\n \\t\\t\\t\\t(EntityPackage.Literals.ENTITY__OWNED_FINDERS,\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProvider.java\",\n \"sha\": \"f30aa0a7834b87444800447803f17309525950c7\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProviderAdapterFactory.java\",\n \"changes\": 72,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProviderAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 72,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProviderAdapterFactory.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\t/**\\n\\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Block} instances.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected BlockItemProvider blockItemProvider;\\n\\n\\t/**\\n\\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Block}.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\t@Override\\n\\tpublic Adapter createBlockAdapter() {\\n\\t\\tif (blockItemProvider == null) {\\n\\t\\t\\tblockItemProvider = new BlockItemProvider(this);\\n\\t\\t}\\n\\n\\t\\treturn blockItemProvider;\\n\\t}\\n\\n\\t/**\\n\\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Attribute} instances.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected AttributeItemProvider attributeItemProvider;\\n\\n\\t/**\\n\\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Attribute}.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\t@Override\\n\\tpublic Adapter createAttributeAdapter() {\\n\\t\\tif (attributeItemProvider == null) {\\n\\t\\t\\tattributeItemProvider = new AttributeItemProvider(this);\\n\\t\\t}\\n\\n\\t\\treturn attributeItemProvider;\\n\\t}\\n\\n\\t/**\\n\\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Reference} instances.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected ReferenceItemProvider referenceItemProvider;\\n\\n\\t/**\\n\\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Reference}.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\t@Override\\n\\tpublic Adapter createReferenceAdapter() {\\n\\t\\tif (referenceItemProvider == null) {\\n\\t\\t\\treferenceItemProvider = new ReferenceItemProvider(this);\\n\\t\\t}\\n\\n\\t\\treturn referenceItemProvider;\\n\\t}\\n\\n\\t\\tif (blockItemProvider != null) blockItemProvider.dispose();\\n\\t\\tif (attributeItemProvider != null) attributeItemProvider.dispose();\\n\\t\\tif (referenceItemProvider != null) referenceItemProvider.dispose();\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProviderAdapterFactory.java\",\n \"implementation\": \"if (blockItemProvider == null) {\\n\\t\\t\\tblockItemProvider = new BlockItemProvider(this);\",\n \"signature\": \"Adapter createBlockAdapter()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProviderAdapterFactory.java\",\n \"implementation\": \"if (attributeItemProvider == null) {\\n\\t\\t\\tattributeItemProvider = new AttributeItemProvider(this);\",\n \"signature\": \"Adapter createAttributeAdapter()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/EntityItemProviderAdapterFactory.java\",\n \"implementation\": \"if (referenceItemProvider == null) {\\n\\t\\t\\treferenceItemProvider = new ReferenceItemProvider(this);\",\n \"signature\": \"Adapter createReferenceAdapter()\"\n }\n ],\n \"patch\": \"@@ -109,29 +109,6 @@ public Adapter createRootAdapter() {\\n \\t\\treturn rootItemProvider;\\n \\t}\\n \\n-\\t/**\\n-\\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Block} instances.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprotected BlockItemProvider blockItemProvider;\\n-\\n-\\t/**\\n-\\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Block}.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\t@Override\\n-\\tpublic Adapter createBlockAdapter() {\\n-\\t\\tif (blockItemProvider == null) {\\n-\\t\\t\\tblockItemProvider = new BlockItemProvider(this);\\n-\\t\\t}\\n-\\n-\\t\\treturn blockItemProvider;\\n-\\t}\\n-\\n \\t/**\\n \\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Entity} instances.\\n \\t * \\n@@ -155,52 +132,6 @@ public Adapter createEntityAdapter() {\\n \\t\\treturn entityItemProvider;\\n \\t}\\n \\n-\\t/**\\n-\\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Attribute} instances.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprotected AttributeItemProvider attributeItemProvider;\\n-\\n-\\t/**\\n-\\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Attribute}.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\t@Override\\n-\\tpublic Adapter createAttributeAdapter() {\\n-\\t\\tif (attributeItemProvider == null) {\\n-\\t\\t\\tattributeItemProvider = new AttributeItemProvider(this);\\n-\\t\\t}\\n-\\n-\\t\\treturn attributeItemProvider;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Reference} instances.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprotected ReferenceItemProvider referenceItemProvider;\\n-\\n-\\t/**\\n-\\t * This creates an adapter for a {@link org.obeonetwork.dsl.entity.Reference}.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\t@Override\\n-\\tpublic Adapter createReferenceAdapter() {\\n-\\t\\tif (referenceItemProvider == null) {\\n-\\t\\t\\treferenceItemProvider = new ReferenceItemProvider(this);\\n-\\t\\t}\\n-\\n-\\t\\treturn referenceItemProvider;\\n-\\t}\\n-\\n \\t/**\\n \\t * This keeps track of the one adapter used for all {@link org.obeonetwork.dsl.entity.Finder} instances.\\n \\t * \\n@@ -370,10 +301,7 @@ public void fireNotifyChanged(Notification notification) {\\n \\t */\\n \\tpublic void dispose() {\\n \\t\\tif (rootItemProvider != null) rootItemProvider.dispose();\\n-\\t\\tif (blockItemProvider != null) blockItemProvider.dispose();\\n \\t\\tif (entityItemProvider != null) entityItemProvider.dispose();\\n-\\t\\tif (attributeItemProvider != null) attributeItemProvider.dispose();\\n-\\t\\tif (referenceItemProvider != null) referenceItemProvider.dispose();\\n \\t\\tif (finderItemProvider != null) finderItemProvider.dispose();\\n \\t\\tif (internalCriterionItemProvider != null) internalCriterionItemProvider.dispose();\\n \\t\\tif (externalCriterionItemProvider != null) externalCriterionItemProvider.dispose();\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FEntityItemProviderAdapterFactory.java\",\n \"sha\": \"badda280b3ed642ab47843aa7b92a10dfdfddf53\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 42,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FRootItemProvider.java\",\n \"changes\": 50,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FRootItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 8,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/RootItemProvider.java\",\n \"new_code\": \"import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;\\nimport org.eclipse.emf.edit.provider.ItemPropertyDescriptor;\\nimport org.obeonetwork.dsl.environment.EnvironmentFactory;\\nimport org.obeonetwork.dsl.environment.provider.TypesDefinitionItemProvider;\\n\\textends TypesDefinitionItemProvider\\n\\t\\t\\taddNamePropertyDescriptor(object);\\n\\t/**\\n\\t * This adds a property descriptor for the Name feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addNamePropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add\\n\\t\\t\\t(createItemPropertyDescriptor\\n\\t\\t\\t\\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\\n\\t\\t\\t\\t getResourceLocator(),\\n\\t\\t\\t\\t getString(\\\"_UI_Root_name_feature\\\"),\\n\\t\\t\\t\\t getString(\\\"_UI_PropertyDescriptor_description\\\", \\\"_UI_Root_name_feature\\\", \\\"_UI_Root_type\\\"),\\n\\t\\t\\t\\t EntityPackage.Literals.ROOT__NAME,\\n\\t\\t\\t\\t true,\\n\\t\\t\\t\\t false,\\n\\t\\t\\t\\t false,\\n\\t\\t\\t\\t ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,\\n\\t\\t\\t\\t null,\\n\\t\\t\\t\\t null));\\n\\t}\\n\\n\\t\\t\\tchildrenFeatures.add(EntityPackage.Literals.ROOT__NAMESPACES);\\n\\t\\tString label = ((Root)object).getName();\\n\\t\\tif (label != null) {\\n\\t\\t\\treturn label;\\n\\t\\t}\\n\\t\\treturn \\\"Entities\\\";\\n\\t\\t\\tcase EntityPackage.ROOT__NAME:\\n\\t\\t\\t\\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));\\n\\t\\t\\t\\treturn;\\n\\t\\t\\tcase EntityPackage.ROOT__NAMESPACES:\\n\\t\\t\\t\\t(EnvironmentPackage.Literals.TYPES_DEFINITION__TYPES,\\n\\t\\t\\t\\t EntityFactory.eINSTANCE.createEntity()));\\n\\t\\t\\t\\t(EntityPackage.Literals.ROOT__NAMESPACES,\\n\\t\\t\\t\\t EnvironmentFactory.eINSTANCE.createNamespace()));\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.edit/src/org/obeonetwork/dsl/entity/provider/RootItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add\\n\\t\\t\\t(createItemPropertyDescriptor\\n\\t\\t\\t\\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\\n\\t\\t\\t\\t getResourceLocator(),\\n\\t\\t\\t\\t getString(\\\"_UI_Root_name_feature\\\"),\\n\\t\\t\\t\\t getString(\\\"_UI_PropertyDescriptor_description\\\", \\\"_UI_Root_name_feature\\\", \\\"_UI_Root_type\\\"),\\n\\t\\t\\t\\t EntityPackage.Literals.ROOT__NAME,\\n\\t\\t\\t\\t true,\\n\\t\\t\\t\\t false,\\n\\t\\t\\t\\t false,\\n\\t\\t\\t\\t ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,\\n\\t\\t\\t\\t null,\\n\\t\\t\\t\\t null));\",\n \"signature\": \"void addNamePropertyDescriptor(Object object)\"\n }\n ],\n \"old_code\": \"\\textends NamespaceItemProvider\\n\\t\\t\\tchildrenFeatures.add(EntityPackage.Literals.ROOT__BLOCKS);\\n\\t\\treturn \\\"Blocks\\\";\\n\\t\\t\\tcase EntityPackage.ROOT__BLOCKS:\\n\\t\\t\\t\\t(EnvironmentPackage.Literals.NAMESPACE__OWNED_NAMESPACES,\\n\\t\\t\\t\\t EntityFactory.eINSTANCE.createRoot()));\\n\\t\\t\\t\\t(EntityPackage.Literals.ROOT__BLOCKS,\\n\\t\\t\\t\\t EntityFactory.eINSTANCE.createBlock()));\",\n \"old_methods\": [],\n \"patch\": \"@@ -20,18 +20,22 @@\\n import org.eclipse.emf.common.notify.Notification;\\n import org.eclipse.emf.common.util.ResourceLocator;\\n import org.eclipse.emf.ecore.EStructuralFeature;\\n+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;\\n import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;\\n import org.eclipse.emf.edit.provider.IItemLabelProvider;\\n import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;\\n import org.eclipse.emf.edit.provider.IItemPropertySource;\\n import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;\\n import org.eclipse.emf.edit.provider.ITreeItemContentProvider;\\n+import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;\\n import org.eclipse.emf.edit.provider.ViewerNotification;\\n import org.obeonetwork.dsl.entity.EntityFactory;\\n import org.obeonetwork.dsl.entity.EntityPackage;\\n import org.obeonetwork.dsl.entity.Root;\\n+import org.obeonetwork.dsl.environment.EnvironmentFactory;\\n import org.obeonetwork.dsl.environment.EnvironmentPackage;\\n import org.obeonetwork.dsl.environment.provider.NamespaceItemProvider;\\n+import org.obeonetwork.dsl.environment.provider.TypesDefinitionItemProvider;\\n \\n /**\\n * This is the item provider adapter for a {@link org.obeonetwork.dsl.entity.Root} object.\\n@@ -40,7 +44,7 @@\\n * @generated\\n */\\n public class RootItemProvider\\n-\\textends NamespaceItemProvider\\n+\\textends TypesDefinitionItemProvider\\n \\timplements\\t\\n \\t\\tIEditingDomainItemProvider,\\t\\n \\t\\tIStructuredItemContentProvider,\\t\\n@@ -75,10 +79,33 @@ public List getPropertyDescriptors(Object object) {\\n \\t\\tif (itemPropertyDescriptors == null) {\\n \\t\\t\\tsuper.getPropertyDescriptors(object);\\n \\n+\\t\\t\\taddNamePropertyDescriptor(object);\\n \\t\\t}\\n \\t\\treturn itemPropertyDescriptors;\\n \\t}\\n \\n+\\t/**\\n+\\t * This adds a property descriptor for the Name feature.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\tprotected void addNamePropertyDescriptor(Object object) {\\n+\\t\\titemPropertyDescriptors.add\\n+\\t\\t\\t(createItemPropertyDescriptor\\n+\\t\\t\\t\\t(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),\\n+\\t\\t\\t\\t getResourceLocator(),\\n+\\t\\t\\t\\t getString(\\\"_UI_Root_name_feature\\\"),\\n+\\t\\t\\t\\t getString(\\\"_UI_PropertyDescriptor_description\\\", \\\"_UI_Root_name_feature\\\", \\\"_UI_Root_type\\\"),\\n+\\t\\t\\t\\t EntityPackage.Literals.ROOT__NAME,\\n+\\t\\t\\t\\t true,\\n+\\t\\t\\t\\t false,\\n+\\t\\t\\t\\t false,\\n+\\t\\t\\t\\t ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,\\n+\\t\\t\\t\\t null,\\n+\\t\\t\\t\\t null));\\n+\\t}\\n+\\n \\t/**\\n \\t * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an\\n \\t * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or\\n@@ -91,7 +118,7 @@ public List getPropertyDescriptors(Object object) {\\n \\tpublic Collection getChildrenFeatures(Object object) {\\n \\t\\tif (childrenFeatures == null) {\\n \\t\\t\\tsuper.getChildrenFeatures(object);\\n-\\t\\t\\tchildrenFeatures.add(EntityPackage.Literals.ROOT__BLOCKS);\\n+\\t\\t\\tchildrenFeatures.add(EntityPackage.Literals.ROOT__NAMESPACES);\\n \\t\\t}\\n \\t\\treturn childrenFeatures;\\n \\t}\\n@@ -138,7 +165,11 @@ protected boolean shouldComposeCreationImage() {\\n \\t */\\n \\t@Override\\n \\tpublic String getText(Object object) {\\n-\\t\\treturn \\\"Blocks\\\";\\n+\\t\\tString label = ((Root)object).getName();\\n+\\t\\tif (label != null) {\\n+\\t\\t\\treturn label;\\n+\\t\\t}\\n+\\t\\treturn \\\"Entities\\\";\\n \\t}\\n \\n \\t/**\\n@@ -153,7 +184,10 @@ public void notifyChanged(Notification notification) {\\n \\t\\tupdateChildren(notification);\\n \\n \\t\\tswitch (notification.getFeatureID(Root.class)) {\\n-\\t\\t\\tcase EntityPackage.ROOT__BLOCKS:\\n+\\t\\t\\tcase EntityPackage.ROOT__NAME:\\n+\\t\\t\\t\\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));\\n+\\t\\t\\t\\treturn;\\n+\\t\\t\\tcase EntityPackage.ROOT__NAMESPACES:\\n \\t\\t\\t\\tfireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), true, false));\\n \\t\\t\\t\\treturn;\\n \\t\\t}\\n@@ -173,13 +207,13 @@ protected void collectNewChildDescriptors(Collection newChildDescriptors\\n \\n \\t\\tnewChildDescriptors.add\\n \\t\\t\\t(createChildParameter\\n-\\t\\t\\t\\t(EnvironmentPackage.Literals.NAMESPACE__OWNED_NAMESPACES,\\n-\\t\\t\\t\\t EntityFactory.eINSTANCE.createRoot()));\\n+\\t\\t\\t\\t(EnvironmentPackage.Literals.TYPES_DEFINITION__TYPES,\\n+\\t\\t\\t\\t EntityFactory.eINSTANCE.createEntity()));\\n \\n \\t\\tnewChildDescriptors.add\\n \\t\\t\\t(createChildParameter\\n-\\t\\t\\t\\t(EntityPackage.Literals.ROOT__BLOCKS,\\n-\\t\\t\\t\\t EntityFactory.eINSTANCE.createBlock()));\\n+\\t\\t\\t\\t(EntityPackage.Literals.ROOT__NAMESPACES,\\n+\\t\\t\\t\\t EnvironmentFactory.eINSTANCE.createNamespace()));\\n \\t}\\n \\n \\t/**\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fprovider%2FRootItemProvider.java\",\n \"sha\": \"3fecd259c422a24d95ee0d0169890c68118b678f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 4,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2FMETA-INF%2FMANIFEST.MF\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 2,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.editor/META-INF/MANIFEST.MF\",\n \"new_code\": \"Bundle-SymbolicName: org.obeonetwork.dsl.entity.editor;singleton:=true\\nExport-Package: org.obeonetwork.dsl.entity.extensionUtilities.presentation,\\n org.obeonetwork.dsl.entity.presentation\\n org.obeonetwork.dsl.environment.edit;visibility:=reexport,\",\n \"new_methods\": [],\n \"old_code\": \"Bundle-SymbolicName: org.obeonetwork.dsl.entity.editor; singleton:=true\\nExport-Package: org.obeonetwork.dsl.entity.presentation\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,19 +1,21 @@\\n Manifest-Version: 1.0\\n Bundle-ManifestVersion: 2\\n Bundle-Name: %pluginName\\n-Bundle-SymbolicName: org.obeonetwork.dsl.entity.editor; singleton:=true\\n+Bundle-SymbolicName: org.obeonetwork.dsl.entity.editor;singleton:=true\\n Bundle-Version: 2.4.0.qualifier\\n Bundle-ClassPath: .\\n Bundle-Activator: org.obeonetwork.dsl.entity.presentation.EntityEditorPlugin$Implementation\\n Bundle-Vendor: %providerName\\n Bundle-Localization: plugin\\n-Export-Package: org.obeonetwork.dsl.entity.presentation\\n+Export-Package: org.obeonetwork.dsl.entity.extensionUtilities.presentation,\\n+ org.obeonetwork.dsl.entity.presentation\\n Require-Bundle: org.eclipse.core.runtime,\\n org.eclipse.core.resources;visibility:=reexport,\\n org.obeonetwork.dsl.entity.edit;visibility:=reexport,\\n org.eclipse.emf.ecore.xmi;visibility:=reexport,\\n org.eclipse.emf.edit.ui;visibility:=reexport,\\n org.eclipse.ui.ide;visibility:=reexport,\\n+ org.obeonetwork.dsl.environment.edit;visibility:=reexport,\\n org.obeonetwork.dsl.environment.editor,\\n org.eclipse.emf.eef.runtime\\n Bundle-ActivationPolicy: lazy\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2FMETA-INF%2FMANIFEST.MF\",\n \"sha\": \"226851ae9f7bd49dc7760eeee731203ed48c8415\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 56,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fplugin.xml\",\n \"changes\": 57,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fplugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 1,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.editor/plugin.xml\",\n \"new_code\": \" \\n \\n \\n \\n %_UI_EntityModelWizard_description\\n \\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n \\n \\n \\n %_UI_ExtensionUtilitiesModelWizard_description\\n \\n \\n \\n\\nnull\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -40,4 +40,59 @@\\n contributorClass=\\\"org.obeonetwork.dsl.entity.presentation.EntityActionBarContributor\\\" >\\n \\n \\n-\\n+ \\n+ \\n+ \\n+ \\n+ %_UI_EntityModelWizard_description\\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ %_UI_ExtensionUtilitiesModelWizard_description\\n+ \\n+ \\n+ \\n+\\n+null\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fplugin.xml\",\n \"sha\": \"cbf5ef13dc1987b81aea2befdee5b03786a9cf77\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 40,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fpresentation%2FExtensionUtilitiesEditor.java\",\n \"changes\": 76,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fpresentation%2FExtensionUtilitiesEditor.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 36,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java\",\n \"new_code\": \"\\tprotected List propertySheetPages = new ArrayList();\\n\\t\\t\\t\\t\\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {\\n\\t\\t\\t\\tresourceToDiagnosticMap.remove(target);\\n\\t\\t\\t\\tif (updateProblemIndication) {\\n\\t\\t\\t\\t\\tgetSite().getShell().getDisplay().asyncExec\\n\\t\\t\\t\\t\\t\\t(new Runnable() {\\n\\t\\t\\t\\t\\t\\t\\t public void run() {\\n\\t\\t\\t\\t\\t\\t\\t\\t updateProblemIndication();\\n\\t\\t\\t\\t\\t\\t\\t }\\n\\t\\t\\t\\t\\t\\t });\\n\\t\\t\\t\\t}\\n\\t\\t\\t\\t\\t\\t\\t\\treturn false;\\n\\t\\t\\t\\t\\t\\t\\t\\t for (Iterator i = propertySheetPages.iterator(); i.hasNext(); ) {\\n\\t\\t\\t\\t\\t\\t\\t\\t\\t PropertySheetPage propertySheetPage = i.next();\\n\\t\\t\\t\\t\\t\\t\\t\\t\\t if (propertySheetPage.getControl().isDisposed()) {\\n\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t i.remove();\\n\\t\\t\\t\\t\\t\\t\\t\\t\\t }\\n\\t\\t\\t\\t\\t\\t\\t\\t\\t else {\\n\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t propertySheetPage.refresh();\\n\\t\\t\\t\\t\\t\\t\\t\\t\\t }\\n\\t\\tPropertySheetPage propertySheetPage =\\n\\t\\t\\tnew ExtendedPropertySheetPage(editingDomain) {\\n\\t\\t\\t\\t@Override\\n\\t\\t\\t\\tpublic void setSelectionToViewer(List selection) {\\n\\t\\t\\t\\t\\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\\n\\t\\t\\t\\t\\tExtensionUtilitiesEditor.this.setFocus();\\n\\t\\t\\t\\t}\\n\\t\\t\\t\\t@Override\\n\\t\\t\\t\\tpublic void setActionBars(IActionBars actionBars) {\\n\\t\\t\\t\\t\\tsuper.setActionBars(actionBars);\\n\\t\\t\\t\\t\\tgetActionBarContributor().shareGlobalActions(this, actionBars);\\n\\t\\t\\t\\t}\\n\\t\\t\\t};\\n\\t\\tpropertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));\\n\\t\\tpropertySheetPages.add(propertySheetPage);\\n\\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\\n\\t\\tList targetObjects = markerHelper.getTargetObjects(editingDomain, marker);\\n\\t\\tif (!targetObjects.isEmpty()) {\\n\\t\\t\\tsetSelectionToViewer(targetObjects);\\n\\t\\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java\",\n \"implementation\": \"public void run() {\\n\\t\\t\\t\\t\\t\\t\\t\\t updateProblemIndication();\",\n \"signature\": \"new Runnable()\"\n },\n {\n \"arguments\": [\n \"editingDomain\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java\",\n \"implementation\": \"@Override\\n\\t\\t\\t\\tpublic void setSelectionToViewer(List selection) {\\n\\t\\t\\t\\t\\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\\n\\t\\t\\t\\t\\tExtensionUtilitiesEditor.this.setFocus();\",\n \"signature\": \"new ExtendedPropertySheetPage(editingDomain)\"\n },\n {\n \"arguments\": [\n \"IActionBars actionBars\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java\",\n \"implementation\": \"super.setActionBars(actionBars);\\n\\t\\t\\t\\t\\tgetActionBarContributor().shareGlobalActions(this, actionBars);\",\n \"signature\": \"void setActionBars(IActionBars actionBars)\"\n }\n ],\n \"old_code\": \"\\tprotected PropertySheetPage propertySheetPage;\\n\\t\\t\\t\\t\\tif (((PropertySheet)p).getCurrentPage() == propertySheetPage) {\\n\\t\\t\\t\\t\\t\\t\\t\\t if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {\\n\\t\\t\\t\\t\\t\\t\\t\\t\\t propertySheetPage.refresh();\\n\\t\\tif (propertySheetPage == null) {\\n\\t\\t\\tpropertySheetPage =\\n\\t\\t\\t\\tnew ExtendedPropertySheetPage(editingDomain) {\\n\\t\\t\\t\\t\\t@Override\\n\\t\\t\\t\\t\\tpublic void setSelectionToViewer(List selection) {\\n\\t\\t\\t\\t\\t\\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\\n\\t\\t\\t\\t\\t\\tExtensionUtilitiesEditor.this.setFocus();\\n\\t\\t\\t\\t\\t}\\n\\t\\t\\t\\t\\t@Override\\n\\t\\t\\t\\t\\tpublic void setActionBars(IActionBars actionBars) {\\n\\t\\t\\t\\t\\t\\tsuper.setActionBars(actionBars);\\n\\t\\t\\t\\t\\t\\tgetActionBarContributor().shareGlobalActions(this, actionBars);\\n\\t\\t\\t\\t\\t}\\n\\t\\t\\t\\t};\\n\\t\\t\\tpropertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));\\n\\t\\t}\\n\\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \\n\\t\\ttry {\\n\\t\\t\\tif (marker.getType().equals(EValidator.MARKER)) {\\n\\t\\t\\t\\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);\\n\\t\\t\\t\\tif (uriAttribute != null) {\\n\\t\\t\\t\\t\\tURI uri = URI.createURI(uriAttribute);\\n\\t\\t\\t\\t\\tEObject eObject = editingDomain.getResourceSet().getEObject(uri, true);\\n\\t\\t\\t\\t\\tif (eObject != null) {\\n\\t\\t\\t\\t\\t setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));\\n\\t\\t\\t\\t\\t}\\n\\t\\t\\t\\t}\\n\\t\\t\\t}\\n\\t\\t}\\n\\t\\tcatch (CoreException exception) {\\n\\t\\t\\tEntityEditorPlugin.INSTANCE.log(exception);\\n\\t\\tif (propertySheetPage != null) {\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"editingDomain\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java\",\n \"implementation\": \"@Override\\n\\t\\t\\t\\t\\tpublic void setSelectionToViewer(List selection) {\\n\\t\\t\\t\\t\\t\\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\\n\\t\\t\\t\\t\\t\\tExtensionUtilitiesEditor.this.setFocus();\",\n \"signature\": \"new ExtendedPropertySheetPage(editingDomain)\"\n },\n {\n \"arguments\": [\n \"IActionBars actionBars\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/extensionUtilities/presentation/ExtensionUtilitiesEditor.java\",\n \"implementation\": \"super.setActionBars(actionBars);\\n\\t\\t\\t\\t\\t\\tgetActionBarContributor().shareGlobalActions(this, actionBars);\",\n \"signature\": \"void setActionBars(IActionBars actionBars)\"\n }\n ],\n \"patch\": \"@@ -195,7 +195,7 @@ public class ExtensionUtilitiesEditor\\n \\t * \\n \\t * @generated\\n \\t */\\n-\\tprotected PropertySheetPage propertySheetPage;\\n+\\tprotected List propertySheetPages = new ArrayList();\\n \\n \\t/**\\n \\t * This is the viewer that shadows the selection in the content outline.\\n@@ -314,7 +314,7 @@ public void partActivated(IWorkbenchPart p) {\\n \\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t}\\n \\t\\t\\t\\telse if (p instanceof PropertySheet) {\\n-\\t\\t\\t\\t\\tif (((PropertySheet)p).getCurrentPage() == propertySheetPage) {\\n+\\t\\t\\t\\t\\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {\\n \\t\\t\\t\\t\\t\\tgetActionBarContributor().setActiveEditor(ExtensionUtilitiesEditor.this);\\n \\t\\t\\t\\t\\t\\thandleActivate();\\n \\t\\t\\t\\t\\t}\\n@@ -426,6 +426,15 @@ protected void setTarget(Resource target) {\\n \\t\\t\\t@Override\\n \\t\\t\\tprotected void unsetTarget(Resource target) {\\n \\t\\t\\t\\tbasicUnsetTarget(target);\\n+\\t\\t\\t\\tresourceToDiagnosticMap.remove(target);\\n+\\t\\t\\t\\tif (updateProblemIndication) {\\n+\\t\\t\\t\\t\\tgetSite().getShell().getDisplay().asyncExec\\n+\\t\\t\\t\\t\\t\\t(new Runnable() {\\n+\\t\\t\\t\\t\\t\\t\\t public void run() {\\n+\\t\\t\\t\\t\\t\\t\\t\\t updateProblemIndication();\\n+\\t\\t\\t\\t\\t\\t\\t }\\n+\\t\\t\\t\\t\\t\\t });\\n+\\t\\t\\t\\t}\\n \\t\\t\\t}\\n \\t\\t};\\n \\n@@ -459,6 +468,7 @@ else if (!savedResources.remove(resource)) {\\n \\t\\t\\t\\t\\t\\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t\\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t\\t\\t\\t\\t}\\n+\\t\\t\\t\\t\\t\\t\\t\\treturn false;\\n \\t\\t\\t\\t\\t\\t\\t}\\n \\n \\t\\t\\t\\t\\t\\t\\treturn true;\\n@@ -697,8 +707,14 @@ public void run() {\\n \\t\\t\\t\\t\\t\\t\\t\\t if (mostRecentCommand != null) {\\n \\t\\t\\t\\t\\t\\t\\t\\t\\t setSelectionToViewer(mostRecentCommand.getAffectedObjects());\\n \\t\\t\\t\\t\\t\\t\\t\\t }\\n-\\t\\t\\t\\t\\t\\t\\t\\t if (propertySheetPage != null && !propertySheetPage.getControl().isDisposed()) {\\n-\\t\\t\\t\\t\\t\\t\\t\\t\\t propertySheetPage.refresh();\\n+\\t\\t\\t\\t\\t\\t\\t\\t for (Iterator i = propertySheetPages.iterator(); i.hasNext(); ) {\\n+\\t\\t\\t\\t\\t\\t\\t\\t\\t PropertySheetPage propertySheetPage = i.next();\\n+\\t\\t\\t\\t\\t\\t\\t\\t\\t if (propertySheetPage.getControl().isDisposed()) {\\n+\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t i.remove();\\n+\\t\\t\\t\\t\\t\\t\\t\\t\\t }\\n+\\t\\t\\t\\t\\t\\t\\t\\t\\t else {\\n+\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t propertySheetPage.refresh();\\n+\\t\\t\\t\\t\\t\\t\\t\\t\\t }\\n \\t\\t\\t\\t\\t\\t\\t\\t }\\n \\t\\t\\t\\t\\t\\t\\t }\\n \\t\\t\\t\\t\\t\\t });\\n@@ -1333,23 +1349,22 @@ public void selectionChanged(SelectionChangedEvent event) {\\n \\t * @generated\\n \\t */\\n \\tpublic IPropertySheetPage getPropertySheetPage() {\\n-\\t\\tif (propertySheetPage == null) {\\n-\\t\\t\\tpropertySheetPage =\\n-\\t\\t\\t\\tnew ExtendedPropertySheetPage(editingDomain) {\\n-\\t\\t\\t\\t\\t@Override\\n-\\t\\t\\t\\t\\tpublic void setSelectionToViewer(List selection) {\\n-\\t\\t\\t\\t\\t\\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\\n-\\t\\t\\t\\t\\t\\tExtensionUtilitiesEditor.this.setFocus();\\n-\\t\\t\\t\\t\\t}\\n+\\t\\tPropertySheetPage propertySheetPage =\\n+\\t\\t\\tnew ExtendedPropertySheetPage(editingDomain) {\\n+\\t\\t\\t\\t@Override\\n+\\t\\t\\t\\tpublic void setSelectionToViewer(List selection) {\\n+\\t\\t\\t\\t\\tExtensionUtilitiesEditor.this.setSelectionToViewer(selection);\\n+\\t\\t\\t\\t\\tExtensionUtilitiesEditor.this.setFocus();\\n+\\t\\t\\t\\t}\\n \\n-\\t\\t\\t\\t\\t@Override\\n-\\t\\t\\t\\t\\tpublic void setActionBars(IActionBars actionBars) {\\n-\\t\\t\\t\\t\\t\\tsuper.setActionBars(actionBars);\\n-\\t\\t\\t\\t\\t\\tgetActionBarContributor().shareGlobalActions(this, actionBars);\\n-\\t\\t\\t\\t\\t}\\n-\\t\\t\\t\\t};\\n-\\t\\t\\tpropertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));\\n-\\t\\t}\\n+\\t\\t\\t\\t@Override\\n+\\t\\t\\t\\tpublic void setActionBars(IActionBars actionBars) {\\n+\\t\\t\\t\\t\\tsuper.setActionBars(actionBars);\\n+\\t\\t\\t\\t\\tgetActionBarContributor().shareGlobalActions(this, actionBars);\\n+\\t\\t\\t\\t}\\n+\\t\\t\\t};\\n+\\t\\tpropertySheetPage.setPropertySourceProvider(new AdapterFactoryContentProvider(adapterFactory));\\n+\\t\\tpropertySheetPages.add(propertySheetPage);\\n \\n \\t\\treturn propertySheetPage;\\n \\t}\\n@@ -1468,7 +1483,7 @@ public void execute(IProgressMonitor monitor) {\\n \\n \\t/**\\n \\t * This returns whether something has been persisted to the URI of the specified resource.\\n-\\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \\n+\\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\\n \\t * \\n \\t * \\n \\t * @generated\\n@@ -1540,20 +1555,9 @@ protected void doSaveAs(URI uri, IEditorInput editorInput) {\\n \\t * @generated\\n \\t */\\n \\tpublic void gotoMarker(IMarker marker) {\\n-\\t\\ttry {\\n-\\t\\t\\tif (marker.getType().equals(EValidator.MARKER)) {\\n-\\t\\t\\t\\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);\\n-\\t\\t\\t\\tif (uriAttribute != null) {\\n-\\t\\t\\t\\t\\tURI uri = URI.createURI(uriAttribute);\\n-\\t\\t\\t\\t\\tEObject eObject = editingDomain.getResourceSet().getEObject(uri, true);\\n-\\t\\t\\t\\t\\tif (eObject != null) {\\n-\\t\\t\\t\\t\\t setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));\\n-\\t\\t\\t\\t\\t}\\n-\\t\\t\\t\\t}\\n-\\t\\t\\t}\\n-\\t\\t}\\n-\\t\\tcatch (CoreException exception) {\\n-\\t\\t\\tEntityEditorPlugin.INSTANCE.log(exception);\\n+\\t\\tList targetObjects = markerHelper.getTargetObjects(editingDomain, marker);\\n+\\t\\tif (!targetObjects.isEmpty()) {\\n+\\t\\t\\tsetSelectionToViewer(targetObjects);\\n \\t\\t}\\n \\t}\\n \\n@@ -1744,7 +1748,7 @@ public void dispose() {\\n \\t\\t\\tgetActionBarContributor().setActiveEditor(null);\\n \\t\\t}\\n \\n-\\t\\tif (propertySheetPage != null) {\\n+\\t\\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {\\n \\t\\t\\tpropertySheetPage.dispose();\\n \\t\\t}\\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fpresentation%2FExtensionUtilitiesEditor.java\",\n \"sha\": \"4b71ce963c48df0e446b6edc73fa5be0f40d66b2\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 27,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fpresentation%2FEntityEditor.java\",\n \"changes\": 44,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fpresentation%2FEntityEditor.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 17,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/presentation/EntityEditor.java\",\n \"new_code\": \"import java.util.List;\\nimport org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;\\nimport org.eclipse.ui.views.properties.PropertySheetPage;\\n\\t/**\\n\\t * This is the property sheet page.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected List propertySheetPages = new ArrayList();\\n\\n\\t\\t\\t\\t\\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {\\n\\t\\t\\t\\tresourceToDiagnosticMap.remove(target);\\n\\t\\t\\t\\tif (updateProblemIndication) {\\n\\t\\t\\t\\t\\tgetSite().getShell().getDisplay().asyncExec\\n\\t\\t\\t\\t\\t\\t(new Runnable() {\\n\\t\\t\\t\\t\\t\\t\\t public void run() {\\n\\t\\t\\t\\t\\t\\t\\t\\t updateProblemIndication();\\n\\t\\t\\t\\t\\t\\t\\t }\\n\\t\\t\\t\\t\\t\\t });\\n\\t\\t\\t\\t}\\n\\t\\t\\t\\t\\t\\t\\t\\treturn false;\\n\\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\\n\\t\\tList targetObjects = markerHelper.getTargetObjects(editingDomain, marker);\\n\\t\\tif (!targetObjects.isEmpty()) {\\n\\t\\t\\tsetSelectionToViewer(targetObjects);\\n\\t\\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity.editor/src/org/obeonetwork/dsl/entity/presentation/EntityEditor.java\",\n \"implementation\": \"public void run() {\\n\\t\\t\\t\\t\\t\\t\\t\\t updateProblemIndication();\",\n \"signature\": \"new Runnable()\"\n }\n ],\n \"old_code\": \"\\t\\t\\t\\t\\tif (((PropertySheet)p).getCurrentPage() == propertySheetPage) {\\n\\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \\n\\t\\ttry {\\n\\t\\t\\tif (marker.getType().equals(EValidator.MARKER)) {\\n\\t\\t\\t\\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);\\n\\t\\t\\t\\tif (uriAttribute != null) {\\n\\t\\t\\t\\t\\tURI uri = URI.createURI(uriAttribute);\\n\\t\\t\\t\\t\\tEObject eObject = editingDomain.getResourceSet().getEObject(uri, true);\\n\\t\\t\\t\\t\\tif (eObject != null) {\\n\\t\\t\\t\\t\\t setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));\\n\\t\\t\\t\\t\\t}\\n\\t\\t\\t\\t}\\n\\t\\t\\t}\\n\\t\\t}\\n\\t\\tcatch (CoreException exception) {\\n\\t\\t\\tEntityEditorPlugin.INSTANCE.log(exception);\\n\\t\\tif (propertySheetPage != null) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -21,6 +21,7 @@\\n import java.util.HashMap;\\n import java.util.Iterator;\\n import java.util.LinkedHashMap;\\n+import java.util.List;\\n import java.util.Map;\\n \\n import org.eclipse.core.resources.IFile;\\n@@ -71,6 +72,7 @@\\n import org.eclipse.emf.edit.ui.provider.UnwrappingSelectionProvider;\\n import org.eclipse.emf.edit.ui.util.EditUIMarkerHelper;\\n import org.eclipse.emf.edit.ui.util.EditUIUtil;\\n+import org.eclipse.emf.edit.ui.view.ExtendedPropertySheetPage;\\n import org.eclipse.emf.eef.runtime.ui.notify.OpenWizardOnDoubleClick;\\n import org.eclipse.jface.action.IMenuListener;\\n import org.eclipse.jface.action.IMenuManager;\\n@@ -124,6 +126,7 @@\\n import org.eclipse.ui.views.contentoutline.IContentOutlinePage;\\n import org.eclipse.ui.views.properties.IPropertySheetPage;\\n import org.eclipse.ui.views.properties.PropertySheet;\\n+import org.eclipse.ui.views.properties.PropertySheetPage;\\n import org.eclipse.ui.views.properties.tabbed.ITabbedPropertySheetPageContributor;\\n import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;\\n import org.obeonetwork.dsl.entity.extensionUtilities.provider.ExtensionUtilitiesItemProviderAdapterFactory;\\n@@ -188,6 +191,14 @@ public class EntityEditor extends MultiPageEditorPart implements\\n \\t */\\n \\tprotected TreeViewer contentOutlineViewer;\\n \\n+\\t/**\\n+\\t * This is the property sheet page.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\tprotected List propertySheetPages = new ArrayList();\\n+\\n \\t/**\\n \\t * This is the property sheet page. \\n@@ -309,7 +320,7 @@ public void partActivated(IWorkbenchPart p) {\\n \\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t}\\n \\t\\t\\t\\telse if (p instanceof PropertySheet) {\\n-\\t\\t\\t\\t\\tif (((PropertySheet)p).getCurrentPage() == propertySheetPage) {\\n+\\t\\t\\t\\t\\tif (propertySheetPages.contains(((PropertySheet)p).getCurrentPage())) {\\n \\t\\t\\t\\t\\t\\tgetActionBarContributor().setActiveEditor(EntityEditor.this);\\n \\t\\t\\t\\t\\t\\thandleActivate();\\n \\t\\t\\t\\t\\t}\\n@@ -419,6 +430,15 @@ protected void setTarget(Resource target) {\\n \\t\\t\\t@Override\\n \\t\\t\\tprotected void unsetTarget(Resource target) {\\n \\t\\t\\t\\tbasicUnsetTarget(target);\\n+\\t\\t\\t\\tresourceToDiagnosticMap.remove(target);\\n+\\t\\t\\t\\tif (updateProblemIndication) {\\n+\\t\\t\\t\\t\\tgetSite().getShell().getDisplay().asyncExec\\n+\\t\\t\\t\\t\\t\\t(new Runnable() {\\n+\\t\\t\\t\\t\\t\\t\\t public void run() {\\n+\\t\\t\\t\\t\\t\\t\\t\\t updateProblemIndication();\\n+\\t\\t\\t\\t\\t\\t\\t }\\n+\\t\\t\\t\\t\\t\\t });\\n+\\t\\t\\t\\t}\\n \\t\\t\\t}\\n \\t\\t};\\n \\n@@ -451,6 +471,7 @@ else if (!savedResources.remove(resource)) {\\n \\t\\t\\t\\t\\t\\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t\\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t\\t\\t\\t\\t}\\n+\\t\\t\\t\\t\\t\\t\\t\\treturn false;\\n \\t\\t\\t\\t\\t\\t\\t}\\n \\n \\t\\t\\t\\t\\t\\t\\treturn true;\\n@@ -1449,7 +1470,7 @@ public void execute(IProgressMonitor monitor) {\\n \\n \\t/**\\n \\t * This returns whether something has been persisted to the URI of the specified resource.\\n-\\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \\n+\\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\\n \\t * \\n \\t * @generated\\n@@ -1519,20 +1540,9 @@ protected void doSaveAs(URI uri, IEditorInput editorInput) {\\n \\t * @generated\\n \\t */\\n \\tpublic void gotoMarker(IMarker marker) {\\n-\\t\\ttry {\\n-\\t\\t\\tif (marker.getType().equals(EValidator.MARKER)) {\\n-\\t\\t\\t\\tString uriAttribute = marker.getAttribute(EValidator.URI_ATTRIBUTE, null);\\n-\\t\\t\\t\\tif (uriAttribute != null) {\\n-\\t\\t\\t\\t\\tURI uri = URI.createURI(uriAttribute);\\n-\\t\\t\\t\\t\\tEObject eObject = editingDomain.getResourceSet().getEObject(uri, true);\\n-\\t\\t\\t\\t\\tif (eObject != null) {\\n-\\t\\t\\t\\t\\t setSelectionToViewer(Collections.singleton(editingDomain.getWrapper(eObject)));\\n-\\t\\t\\t\\t\\t}\\n-\\t\\t\\t\\t}\\n-\\t\\t\\t}\\n-\\t\\t}\\n-\\t\\tcatch (CoreException exception) {\\n-\\t\\t\\tEntityEditorPlugin.INSTANCE.log(exception);\\n+\\t\\tList targetObjects = markerHelper.getTargetObjects(editingDomain, marker);\\n+\\t\\tif (!targetObjects.isEmpty()) {\\n+\\t\\t\\tsetSelectionToViewer(targetObjects);\\n \\t\\t}\\n \\t}\\n \\n@@ -1721,7 +1731,7 @@ public void dispose() {\\n \\t\\t\\tgetActionBarContributor().setActiveEditor(null);\\n \\t\\t}\\n \\n-\\t\\tif (propertySheetPage != null) {\\n+\\t\\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {\\n \\t\\t\\tpropertySheetPage.dispose();\\n \\t\\t}\\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fpresentation%2FEntityEditor.java\",\n \"sha\": \"3cabf29196558b7f86423c465af74e1fd09af3d9\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2FMETA-INF%2FMANIFEST.MF\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/META-INF/MANIFEST.MF\",\n \"new_code\": \" org.eclipse.emf.cdo;visibility:=reexport,\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -15,6 +15,7 @@ Export-Package: org.obeonetwork.dsl.entity,\\n org.obeonetwork.dsl.entity.util\\n Require-Bundle: org.eclipse.core.runtime,\\n org.eclipse.emf.ecore;visibility:=reexport,\\n+ org.eclipse.emf.cdo;visibility:=reexport,\\n org.eclipse.emf.ecore.xmi;visibility:=reexport,\\n org.obeonetwork.dsl.environment;visibility:=reexport\\n Bundle-ActivationPolicy: lazy\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2FMETA-INF%2FMANIFEST.MF\",\n \"sha\": \"b6669f5cc9f2cbcbf62f971931614879dd45d41b\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.ecore\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.ecore?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/model/entity.ecore\",\n \"new_code\": \" \",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -3,6 +3,7 @@\\n xmlns:ecore=\\\"http://www.eclipse.org/emf/2002/Ecore\\\" name=\\\"entity\\\" nsURI=\\\"http://www.obeonetwork.org/dsl/entity/3.0.0\\\"\\n nsPrefix=\\\"oent\\\">\\n \\n+ \\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.ecore\",\n \"sha\": \"09e13314f4c0a117418d7ab00f164b84812d9d99\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.genmodel\",\n \"changes\": 39,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.genmodel?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 36,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/model/entity.genmodel\",\n \"new_code\": \" importerID=\\\"org.eclipse.emf.importer.cdo\\\" featureDelegation=\\\"Dynamic\\\" containmentProxies=\\\"true\\\"\\n \\n \",\n \"new_methods\": [],\n \"old_code\": \" importerID=\\\"org.eclipse.importer.cdo\\\" featureDelegation=\\\"Dynamic\\\" containmentProxies=\\\"true\\\"\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \",\n \"old_methods\": [],\n \"patch\": \"@@ -3,7 +3,7 @@\\n xmlns:genmodel=\\\"http://www.eclipse.org/emf/2002/GenModel\\\" copyrightText=\\\"Copyright (c) 2008-2009 Obeo.&#xA;All rights reserved. This program and the accompanying materials&#xA;are made available under the terms of the Eclipse Public License v1.0&#xA;which accompanies this distribution, and is available at&#xA;http://www.eclipse.org/legal/epl-v10.html&#xA;&#xA;Contributors:&#xA; Obeo - initial API and implementation\\\"\\n modelDirectory=\\\"/org.obeonetwork.dsl.entity/src\\\" creationIcons=\\\"false\\\" modelPluginID=\\\"org.obeonetwork.dsl.entity\\\"\\n modelName=\\\"Entity\\\" rootExtendsInterface=\\\"org.eclipse.emf.cdo.CDOObject\\\" rootExtendsClass=\\\"org.eclipse.emf.internal.cdo.CDOObjectImpl\\\"\\n- importerID=\\\"org.eclipse.importer.cdo\\\" featureDelegation=\\\"Dynamic\\\" containmentProxies=\\\"true\\\"\\n+ importerID=\\\"org.eclipse.emf.importer.cdo\\\" featureDelegation=\\\"Dynamic\\\" containmentProxies=\\\"true\\\"\\n complianceLevel=\\\"5.0\\\" runtimeVersion=\\\"2.6\\\" usedGenPackages=\\\"../../org.obeonetwork.dsl.environment/model/environment.genmodel#//environment\\\">\\n entity.ecore\\n CDO=org.eclipse.emf.cdo\\n@@ -14,48 +14,15 @@\\n \\n \\n \\n- \\n- \\n- \\n- \\n- \\n- \\n+ \\n+ \\n \\n \\n- \\n- \\n- \\n- \\n- \\n- \\n \\n \\n \\n \\n- \\n \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n \\n \\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fmodel%2Fentity.genmodel\",\n \"sha\": \"3e2b2ac3b0be4be6b7dd0f11c783104d8caf3cb9\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntity.java\",\n \"changes\": 154,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntity.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 154,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/Entity.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \" *
  • {@link org.obeonetwork.dsl.entity.Entity#getOwnedAttributes Owned Attributes}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.Entity#getOwnedReferences Owned References}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.Entity#getSupertype Supertype}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.Entity#getAttributes Attributes}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.Entity#getReferences References}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.Entity#getProperties Properties}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.Entity#getBlock Block}
    • \\n\\t/**\\n\\t * Returns the value of the 'Owned Attributes' containment reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\\n\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Attribute#getEntity Entity}'.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Owned Attributes' containment\\n\\t * reference list isn't clear, there really should be more of a description\\n\\t * here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Owned Attributes' containment reference list.\\n\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_OwnedAttributes()\\n\\t * @see org.obeonetwork.dsl.entity.Attribute#getEntity\\n\\t * @model opposite=\\\"entity\\\" containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getOwnedAttributes();\\n\\n\\t/**\\n\\t * Returns the value of the 'Owned References' containment reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\\n\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Reference#getEntity Entity}'.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Owned References' containment\\n\\t * reference list isn't clear, there really should be more of a description\\n\\t * here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Owned References' containment reference list.\\n\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_OwnedReferences()\\n\\t * @see org.obeonetwork.dsl.entity.Reference#getEntity\\n\\t * @model opposite=\\\"entity\\\" containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getOwnedReferences();\\n\\n\\t/**\\n\\t * Returns the value of the 'Supertype' reference. \\n\\t *

    \\n\\t * If the meaning of the 'Supertype' reference isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * \\n\\t * @return the value of the 'Supertype' reference.\\n\\t * @see #setSupertype(Entity)\\n\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Supertype()\\n\\t * @model\\n\\t * @generated\\n\\t */\\n\\tEntity getSupertype();\\n\\n\\t/**\\n\\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Entity#getSupertype Supertype}' reference.\\n\\t * \\n\\t * @param value the new value of the 'Supertype' reference.\\n\\t * @see #getSupertype()\\n\\t * @generated\\n\\t */\\n\\tvoid setSupertype(Entity value);\\n\\n\\t/**\\n\\t * Returns the value of the 'Attributes' reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Attributes' reference list isn't\\n\\t * clear, there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Attributes' reference list.\\n\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Attributes()\\n\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getAttributes();\\n\\n\\t/**\\n\\t * Returns the value of the 'References' reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'References' reference list isn't\\n\\t * clear, there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'References' reference list.\\n\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_References()\\n\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getReferences();\\n\\n\\t/**\\n\\t * Returns the value of the 'Properties' reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Property}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Properties' reference list isn't\\n\\t * clear, there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Properties' reference list.\\n\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Properties()\\n\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getProperties();\\n\\n\\t/**\\n\\t * Returns the value of the 'Block' container reference.\\n\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Block#getEntities Entities}'.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Block' container reference isn't\\n\\t * clear, there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Block' container reference.\\n\\t * @see #setBlock(Block)\\n\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Block()\\n\\t * @see org.obeonetwork.dsl.entity.Block#getEntities\\n\\t * @model opposite=\\\"entities\\\" required=\\\"true\\\" transient=\\\"false\\\"\\n\\t * @generated\\n\\t */\\n\\tBlock getBlock();\\n\\n\\t/**\\n\\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Entity#getBlock Block}' container reference.\\n\\t * \\n\\t * @param value the new value of the 'Block' container reference.\\n\\t * @see #getBlock()\\n\\t * @generated\\n\\t */\\n\\tvoid setBlock(Block value);\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @model\\n\\t * @generated\\n\\t */\\n\\tboolean isSubtypeOf(Entity entity);\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -22,17 +22,10 @@\\n *

    \\n * The following features are supported:\\n *

      \\n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getOwnedAttributes Owned Attributes}
      • \\n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getOwnedReferences Owned References}
      • \\n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getSupertype Supertype}
      • \\n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getAttributes Attributes}
      • \\n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getReferences References}
      • \\n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getProperties Properties}
      • \\n *
    • {@link org.obeonetwork.dsl.entity.Entity#getEstimatedVolumetry Estimated Volumetry}
      • \\n *
    • {@link org.obeonetwork.dsl.entity.Entity#getEstimatedAccess Estimated Access}
      • \\n *
    • {@link org.obeonetwork.dsl.entity.Entity#isHistorized Historized}
      • \\n *
    • {@link org.obeonetwork.dsl.entity.Entity#getOwnedFinders Owned Finders}
      • \\n- *
    • {@link org.obeonetwork.dsl.entity.Entity#getBlock Block}
      • \\n *
    • {@link org.obeonetwork.dsl.entity.Entity#getInheritanceKind Inheritance Kind}
      • \\n *
    \\n *

    \\n@@ -49,118 +42,6 @@ public interface Entity extends StructuredType {\\n \\t */\\n \\tString copyright = \\\"Copyright (c) 2008-2009 Obeo.\\\\nAll rights reserved. This program and the accompanying materials\\\\nare made available under the terms of the Eclipse Public License v1.0\\\\nwhich accompanies this distribution, and is available at\\\\nhttp://www.eclipse.org/legal/epl-v10.html\\\\n\\\\nContributors:\\\\n Obeo - initial API and implementation\\\";\\n \\n-\\t/**\\n-\\t * Returns the value of the 'Owned Attributes' containment reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\\n-\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Attribute#getEntity Entity}'.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'Owned Attributes' containment\\n-\\t * reference list isn't clear, there really should be more of a description\\n-\\t * here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'Owned Attributes' containment reference list.\\n-\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_OwnedAttributes()\\n-\\t * @see org.obeonetwork.dsl.entity.Attribute#getEntity\\n-\\t * @model opposite=\\\"entity\\\" containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n-\\t * @generated\\n-\\t */\\n-\\tEList getOwnedAttributes();\\n-\\n-\\t/**\\n-\\t * Returns the value of the 'Owned References' containment reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\\n-\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Reference#getEntity Entity}'.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'Owned References' containment\\n-\\t * reference list isn't clear, there really should be more of a description\\n-\\t * here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'Owned References' containment reference list.\\n-\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_OwnedReferences()\\n-\\t * @see org.obeonetwork.dsl.entity.Reference#getEntity\\n-\\t * @model opposite=\\\"entity\\\" containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n-\\t * @generated\\n-\\t */\\n-\\tEList getOwnedReferences();\\n-\\n-\\t/**\\n-\\t * Returns the value of the 'Supertype' reference. \\n-\\t *

    \\n-\\t * If the meaning of the 'Supertype' reference isn't clear,\\n-\\t * there really should be more of a description here...\\n-\\t *

    \\n-\\t * \\n-\\t * \\n-\\t * @return the value of the 'Supertype' reference.\\n-\\t * @see #setSupertype(Entity)\\n-\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Supertype()\\n-\\t * @model\\n-\\t * @generated\\n-\\t */\\n-\\tEntity getSupertype();\\n-\\n-\\t/**\\n-\\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Entity#getSupertype Supertype}' reference.\\n-\\t * \\n-\\t * @param value the new value of the 'Supertype' reference.\\n-\\t * @see #getSupertype()\\n-\\t * @generated\\n-\\t */\\n-\\tvoid setSupertype(Entity value);\\n-\\n-\\t/**\\n-\\t * Returns the value of the 'Attributes' reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'Attributes' reference list isn't\\n-\\t * clear, there really should be more of a description here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'Attributes' reference list.\\n-\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Attributes()\\n-\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n-\\t * @generated\\n-\\t */\\n-\\tEList getAttributes();\\n-\\n-\\t/**\\n-\\t * Returns the value of the 'References' reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'References' reference list isn't\\n-\\t * clear, there really should be more of a description here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'References' reference list.\\n-\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_References()\\n-\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n-\\t * @generated\\n-\\t */\\n-\\tEList getReferences();\\n-\\n-\\t/**\\n-\\t * Returns the value of the 'Properties' reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Property}.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'Properties' reference list isn't\\n-\\t * clear, there really should be more of a description here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'Properties' reference list.\\n-\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Properties()\\n-\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n-\\t * @generated\\n-\\t */\\n-\\tEList getProperties();\\n-\\n \\t/**\\n \\t * Returns the value of the 'Estimated Volumetry' attribute.\\n \\t * \\n@@ -258,33 +139,6 @@ public interface Entity extends StructuredType {\\n \\t */\\n \\tEList getOwnedFinders();\\n \\n-\\t/**\\n-\\t * Returns the value of the 'Block' container reference.\\n-\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.entity.Block#getEntities Entities}'.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'Block' container reference isn't\\n-\\t * clear, there really should be more of a description here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'Block' container reference.\\n-\\t * @see #setBlock(Block)\\n-\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getEntity_Block()\\n-\\t * @see org.obeonetwork.dsl.entity.Block#getEntities\\n-\\t * @model opposite=\\\"entities\\\" required=\\\"true\\\" transient=\\\"false\\\"\\n-\\t * @generated\\n-\\t */\\n-\\tBlock getBlock();\\n-\\n-\\t/**\\n-\\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Entity#getBlock Block}' container reference.\\n-\\t * \\n-\\t * @param value the new value of the 'Block' container reference.\\n-\\t * @see #getBlock()\\n-\\t * @generated\\n-\\t */\\n-\\tvoid setBlock(Block value);\\n-\\n \\t/**\\n \\t * Returns the value of the 'Inheritance Kind' attribute.\\n \\t * The literals are from the enumeration {@link org.obeonetwork.dsl.entity.InheritanceKind}.\\n@@ -313,12 +167,4 @@ public interface Entity extends StructuredType {\\n \\t */\\n \\tvoid setInheritanceKind(InheritanceKind value);\\n \\n-\\t/**\\n-\\t * \\n-\\t * \\n-\\t * @model\\n-\\t * @generated\\n-\\t */\\n-\\tboolean isSubtypeOf(Entity entity);\\n-\\n } // Entity\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntity.java\",\n \"sha\": \"d437e6c7d4bafe48f759fae41f1ed0d2a1879f0e\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntityFactory.java\",\n \"changes\": 27,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntityFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 27,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/EntityFactory.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\t/**\\n\\t * Returns a new object of class 'Block'.\\n\\t * \\n\\t * @return a new object of class 'Block'.\\n\\t * @generated\\n\\t */\\n\\tBlock createBlock();\\n\\n\\t/**\\n\\t * Returns a new object of class 'Attribute'. \\n\\t * \\n\\t * @return a new object of class 'Attribute'.\\n\\t * @generated\\n\\t */\\n\\tAttribute createAttribute();\\n\\n\\t/**\\n\\t * Returns a new object of class 'Reference'. \\n\\t * \\n\\t * @return a new object of class 'Reference'.\\n\\t * @generated\\n\\t */\\n\\tReference createReference();\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -44,15 +44,6 @@ public interface EntityFactory extends EFactory {\\n \\t */\\n \\tRoot createRoot();\\n \\n-\\t/**\\n-\\t * Returns a new object of class 'Block'.\\n-\\t * \\n-\\t * @return a new object of class 'Block'.\\n-\\t * @generated\\n-\\t */\\n-\\tBlock createBlock();\\n-\\n \\t/**\\n \\t * Returns a new object of class 'Entity'.\\n \\t * \\n-\\t * \\n-\\t * @return a new object of class 'Attribute'.\\n-\\t * @generated\\n-\\t */\\n-\\tAttribute createAttribute();\\n-\\n-\\t/**\\n-\\t * Returns a new object of class 'Reference'. \\n-\\t * \\n-\\t * @return a new object of class 'Reference'.\\n-\\t * @generated\\n-\\t */\\n-\\tReference createReference();\\n-\\n \\t/**\\n \\t * Returns a new object of class 'Finder'.\\n \\t * \\n\\t * \\n\\tint ENTITY__SUPERTYPE = EnvironmentPackage.STRUCTURED_TYPE__SUPERTYPE;\\n\\t * The feature id for the 'Associated Types' reference list.\\n\\t * \\n\\t * \\n\\tint ENTITY__ASSOCIATED_TYPES = EnvironmentPackage.STRUCTURED_TYPE__ASSOCIATED_TYPES;\\n\\t * The feature id for the 'Owned Attributes' containment reference list.\\n\\t * @ordered\\n\\tint ENTITY__OWNED_ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES;\\n\\t * The feature id for the 'Attributes' reference list.\\n\\tint ENTITY__ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE__ATTRIBUTES;\\n\\t * The feature id for the 'Owned References' containment reference list.\\n\\t * \\n\\tint ENTITY__OWNED_REFERENCES = EnvironmentPackage.STRUCTURED_TYPE__OWNED_REFERENCES;\\n\\t * The feature id for the 'References' reference list.\\n\\t * \\n\\tint ENTITY__REFERENCES = EnvironmentPackage.STRUCTURED_TYPE__REFERENCES;\\n\\t * The feature id for the 'Properties' reference list.\\n\\t * \\n\\tint ENTITY__PROPERTIES = EnvironmentPackage.STRUCTURED_TYPE__PROPERTIES;\\n\\t * The feature id for the 'Estimated Volumetry' attribute.\\n\\t * \\n\\tint ENTITY__ESTIMATED_VOLUMETRY = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 0;\\n\\t * The feature id for the 'Estimated Access' attribute.\\n\\t * \\n\\tint ENTITY__ESTIMATED_ACCESS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 1;\\n\\t * The feature id for the 'Historized' attribute. \\n\\t * \\n\\tint ENTITY__HISTORIZED = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 2;\\n\\t * The feature id for the 'Owned Finders' containment reference list.\\n\\t * \\n\\tint ENTITY__OWNED_FINDERS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 3;\\n\\t * The feature id for the 'Inheritance Kind' attribute.\\n\\t * \\n\\tint ENTITY__INHERITANCE_KIND = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 4;\\n\\t * The number of structural features of the 'Entity' class.\\n\\tint ENTITY_FEATURE_COUNT = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 5;\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl Finder}' class.\\n\\t * @see org.obeonetwork.dsl.entity.impl.FinderImpl\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getFinder()\\n\\tint FINDER = 2;\\n\\t * The feature id for the 'Metadatas' containment reference.\\n\\tint FINDER__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\\n\\t * The feature id for the 'Description' attribute.\\n\\t * \\n\\t * \\n\\tint FINDER__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\\n\\t * The feature id for the 'Keywords' attribute list.\\n\\t * \\n\\t * \\n\\tint FINDER__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\\n\\t * The feature id for the 'Behaviours' containment reference list.\\n\\t * \\n\\t * \\n\\tint FINDER__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\\n\\t * The feature id for the 'Binding Registries' reference list.\\n\\t * \\n\\t * \\n\\tint FINDER__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n\\t * The feature id for the 'Version' attribute.\\n\\t * \\n\\t * \\n\\tint FINDER__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\\n\\t * The feature id for the 'Created On' attribute.\\n\\t * \\n\\t * \\n\\tint FINDER__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\\n\\t * The feature id for the 'Modified On' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\\n\\n\\t/**\\n\\t * The feature id for the 'Name' attribute. \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\\n\\n\\t/**\\n\\t * The number of structural features of the 'Finder' class.\\n\\tint FINDER_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.CriterionImpl Criterion}' class.\\n\\t * @see org.obeonetwork.dsl.entity.impl.CriterionImpl\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getCriterion()\\n\\tint CRITERION = 4;\\n\\tint CRITERION__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\\n\\tint CRITERION__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\\n\\tint CRITERION__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\\n\\tint CRITERION__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\\n\\tint CRITERION__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n\\tint CRITERION__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\\n\\tint CRITERION__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\\n\\tint CRITERION__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\\n\\t * The number of structural features of the 'Criterion' class.\\n\\tint CRITERION_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.InternalCriterionImpl Internal Criterion}' class.\\n\\t * @see org.obeonetwork.dsl.entity.impl.InternalCriterionImpl\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInternalCriterion()\\n\\tint INTERNAL_CRITERION = 3;\\n\\tint INTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\\n\\tint INTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\\n\\tint INTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\\n\\tint INTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\\n\\tint INTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\\n\\tint INTERNAL_CRITERION__VERSION = CRITERION__VERSION;\\n\\tint INTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\\n\\tint INTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\\n\\t * The feature id for the 'Target' reference. \\n\\t * \\n\\t * @ordered\\n\\tint EXTERNAL_CRITERION__TYPE = CRITERION_FEATURE_COUNT + 1;\\n\\t * The number of structural features of the 'External Criterion' class.\\n\\t * @ordered\\n\\tint EXTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.InheritanceKind Inheritance Kind}' enum.\\n\\t * @see org.obeonetwork.dsl.entity.InheritanceKind\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInheritanceKind()\\n\\tint INHERITANCE_KIND = 6;\\n\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Root Root}'.\\n\\t * @return the meta object for class 'Root'.\\n\\t * @see org.obeonetwork.dsl.entity.Root\\n\\tEClass getRoot();\\n\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Root#getName Name}'.\\n\\t * \\n\\t * \\n\\t * @return the meta object for the attribute 'Name'.\\n\\t * @see org.obeonetwork.dsl.entity.Root#getName()\\n\\t * @see #getRoot()\\n\\tEAttribute getRoot_Name();\\n\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Root#getNamespaces Namespaces}'.\\n\\t * \\n\\t * \\n\\t * @return the meta object for the containment reference list 'Namespaces'.\\n\\t * @see org.obeonetwork.dsl.entity.Root#getNamespaces()\\n\\t * @see #getRoot()\\n\\tEReference getRoot_Namespaces();\\n\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Entity Entity}'.\\n\\t * @return the meta object for class 'Entity'.\\n\\t * @see org.obeonetwork.dsl.entity.Entity\\n\\tEClass getEntity();\\n\\t\\t * \\n\\t\\t * \\n\\t\\tEAttribute ROOT__NAME = eINSTANCE.getRoot_Name();\\n\\t\\t * The meta object literal for the 'Namespaces' containment reference list feature.\\n\\t\\t * \\n\\t\\t * \\n\\t\\tEReference ROOT__NAMESPACES = eINSTANCE.getRoot_Namespaces();\",\n \"new_methods\": [],\n \"old_code\": \"\\tString eNS_URI = \\\"http://www.obeonetwork.org/dsl/entity/2.0.0\\\";\\n\\tint ROOT__METADATAS = EnvironmentPackage.NAMESPACE__METADATAS;\\n\\tint ROOT__DESCRIPTION = EnvironmentPackage.NAMESPACE__DESCRIPTION;\\n\\tint ROOT__KEYWORDS = EnvironmentPackage.NAMESPACE__KEYWORDS;\\n\\tint ROOT__BEHAVIOURS = EnvironmentPackage.NAMESPACE__BEHAVIOURS;\\n\\tint ROOT__BINDING_REGISTRIES = EnvironmentPackage.NAMESPACE__BINDING_REGISTRIES;\\n\\tint ROOT__VERSION = EnvironmentPackage.NAMESPACE__VERSION;\\n\\tint ROOT__CREATED_ON = EnvironmentPackage.NAMESPACE__CREATED_ON;\\n\\tint ROOT__MODIFIED_ON = EnvironmentPackage.NAMESPACE__MODIFIED_ON;\\n\\t * The feature id for the 'Owned Namespaces' containment reference list.\\n\\tint ROOT__OWNED_NAMESPACES = EnvironmentPackage.NAMESPACE__OWNED_NAMESPACES;\\n\\t * The feature id for the 'Owner' container reference.\\n\\tint ROOT__OWNER = EnvironmentPackage.NAMESPACE__OWNER;\\n\\t * The feature id for the 'Name' attribute.\\n\\tint ROOT__NAME = EnvironmentPackage.NAMESPACE__NAME;\\n\\n\\t/**\\n\\t * The feature id for the 'Blocks' containment reference list.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint ROOT__BLOCKS = EnvironmentPackage.NAMESPACE_FEATURE_COUNT + 0;\\n\\tint ROOT_FEATURE_COUNT = EnvironmentPackage.NAMESPACE_FEATURE_COUNT + 1;\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.BlockImpl Block}' class.\\n\\t * @see org.obeonetwork.dsl.entity.impl.BlockImpl\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getBlock()\\n\\tint BLOCK = 1;\\n\\tint BLOCK__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\\n\\tint BLOCK__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\\n\\tint BLOCK__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\\n\\tint BLOCK__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\\n\\tint BLOCK__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n\\tint BLOCK__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\\n\\tint BLOCK__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\\n\\tint BLOCK__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\\n\\tint BLOCK__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\\n\\t * The feature id for the 'Entities' containment reference list.\\n\\tint BLOCK__ENTITIES = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\\n\\t * The feature id for the 'Subblocks' containment reference list.\\n\\t * \\n\\tint BLOCK__SUBBLOCKS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n\\t * The number of structural features of the 'Block' class. \\n\\t * \\n\\tint BLOCK_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.EntityImpl Entity}' class.\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityImpl\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getEntity()\\n\\tint ENTITY = 2;\\n\\t * The feature id for the 'Metadatas' containment reference.\\n\\tint ENTITY__METADATAS = EnvironmentPackage.STRUCTURED_TYPE__METADATAS;\\n\\t * The feature id for the 'Description' attribute.\\n\\t * \\n\\t * \\n\\tint ENTITY__DESCRIPTION = EnvironmentPackage.STRUCTURED_TYPE__DESCRIPTION;\\n\\t * The feature id for the 'Keywords' attribute list.\\n\\t * \\n\\t * \\n\\tint ENTITY__KEYWORDS = EnvironmentPackage.STRUCTURED_TYPE__KEYWORDS;\\n\\t * The feature id for the 'Behaviours' containment reference list.\\n\\t * \\n\\t * \\n\\tint ENTITY__BEHAVIOURS = EnvironmentPackage.STRUCTURED_TYPE__BEHAVIOURS;\\n\\t * The feature id for the 'Binding Registries' reference list.\\n\\t * \\n\\t * \\n\\tint ENTITY__BINDING_REGISTRIES = EnvironmentPackage.STRUCTURED_TYPE__BINDING_REGISTRIES;\\n\\t * The feature id for the 'Version' attribute.\\n\\t * \\n\\t * \\n\\tint ENTITY__VERSION = EnvironmentPackage.STRUCTURED_TYPE__VERSION;\\n\\t * The feature id for the 'Created On' attribute.\\n\\t * \\n\\t * \\n\\tint ENTITY__CREATED_ON = EnvironmentPackage.STRUCTURED_TYPE__CREATED_ON;\\n\\t * The feature id for the 'Modified On' attribute.\\n\\t * \\n\\t * \\n\\tint ENTITY__MODIFIED_ON = EnvironmentPackage.STRUCTURED_TYPE__MODIFIED_ON;\\n\\t * The feature id for the 'Name' attribute. \\n\\t * \\n\\tint ENTITY__NAME = EnvironmentPackage.STRUCTURED_TYPE__NAME;\\n\\t * The feature id for the 'Type Definition' container reference.\\n\\tint ENTITY__TYPE_DEFINITION = EnvironmentPackage.STRUCTURED_TYPE__TYPE_DEFINITION;\\n\\t * The feature id for the 'Owned Attributes' containment reference list.\\n\\t * @ordered\\n\\tint ENTITY__OWNED_ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 0;\\n\\t * The feature id for the 'Owned References' containment reference list.\\n\\tint ENTITY__OWNED_REFERENCES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 1;\\n\\t * The feature id for the 'Supertype' reference. \\n\\t * \\n\\tint ENTITY__SUPERTYPE = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 2;\\n\\t * The feature id for the 'Attributes' reference list.\\n\\t * \\n\\tint ENTITY__ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 3;\\n\\t * The feature id for the 'References' reference list.\\n\\t * \\n\\tint ENTITY__REFERENCES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 4;\\n\\t * The feature id for the 'Properties' reference list.\\n\\t * \\n\\tint ENTITY__PROPERTIES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 5;\\n\\t * The feature id for the 'Estimated Volumetry' attribute.\\n\\t * \\n\\tint ENTITY__ESTIMATED_VOLUMETRY = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 6;\\n\\t * The feature id for the 'Estimated Access' attribute.\\n\\t * \\n\\tint ENTITY__ESTIMATED_ACCESS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 7;\\n\\t * The feature id for the 'Historized' attribute. \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint PROPERTY__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\\n\\n\\t/**\\n\\t * The feature id for the 'Multiplicity' attribute.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint PROPERTY__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\\n\\n\\t/**\\n\\t * The feature id for the 'Is Primary Key' attribute.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint PROPERTY__IS_PRIMARY_KEY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n\\t * The number of structural features of the 'Property' class.\\n\\tint PROPERTY_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.AttributeImpl Attribute}' class.\\n\\t * @see org.obeonetwork.dsl.entity.impl.AttributeImpl\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getAttribute()\\n\\tint ATTRIBUTE = 4;\\n\\tint ATTRIBUTE__METADATAS = PROPERTY__METADATAS;\\n\\tint ATTRIBUTE__DESCRIPTION = PROPERTY__DESCRIPTION;\\n\\tint ATTRIBUTE__KEYWORDS = PROPERTY__KEYWORDS;\\n\\tint ATTRIBUTE__BEHAVIOURS = PROPERTY__BEHAVIOURS;\\n\\tint ATTRIBUTE__BINDING_REGISTRIES = PROPERTY__BINDING_REGISTRIES;\\n\\tint ATTRIBUTE__VERSION = PROPERTY__VERSION;\\n\\tint ATTRIBUTE__CREATED_ON = PROPERTY__CREATED_ON;\\n\\tint ATTRIBUTE__MODIFIED_ON = PROPERTY__MODIFIED_ON;\\n\\t * The feature id for the 'Name' attribute. \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint ATTRIBUTE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\\n\\n\\t/**\\n\\t * The feature id for the 'Is Primary Key' attribute.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint ATTRIBUTE__IS_PRIMARY_KEY = PROPERTY__IS_PRIMARY_KEY;\\n\\n\\t/**\\n\\t * The feature id for the 'Entity' container reference.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint ATTRIBUTE__ENTITY = PROPERTY_FEATURE_COUNT + 0;\\n\\t * The feature id for the 'Type' reference. \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint REFERENCE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\\n\\n\\t/**\\n\\t * The feature id for the 'Is Primary Key' attribute.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint REFERENCE__IS_PRIMARY_KEY = PROPERTY__IS_PRIMARY_KEY;\\n\\n\\t/**\\n\\t * The feature id for the 'Entity' container reference.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint REFERENCE__ENTITY = PROPERTY_FEATURE_COUNT + 0;\\n\\n\\t/**\\n\\t * The feature id for the 'Is Composite' attribute.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint REFERENCE__IS_COMPOSITE = PROPERTY_FEATURE_COUNT + 1;\\n\\n\\t/**\\n\\t * The feature id for the 'Opposite Of' reference. \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint REFERENCE__OPPOSITE_OF = PROPERTY_FEATURE_COUNT + 2;\\n\\n\\t/**\\n\\t * The feature id for the 'Type' reference. \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint REFERENCE__TYPE = PROPERTY_FEATURE_COUNT + 3;\\n\\n\\t/**\\n\\t * The feature id for the 'Navigable' attribute. \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint REFERENCE__NAVIGABLE = PROPERTY_FEATURE_COUNT + 4;\\n\\n\\t/**\\n\\t * The number of structural features of the 'Reference' class.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint REFERENCE_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 5;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl Finder}' class.\\n\\t * \\n\\t * @see org.obeonetwork.dsl.entity.impl.FinderImpl\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getFinder()\\n\\t * @generated\\n\\t */\\n\\tint FINDER = 6;\\n\\n\\t/**\\n\\t * The feature id for the 'Metadatas' containment reference.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\\n\\n\\t/**\\n\\t * The feature id for the 'Description' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\\n\\n\\t/**\\n\\t * The feature id for the 'Keywords' attribute list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\\n\\n\\t/**\\n\\t * The feature id for the 'Behaviours' containment reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\\n\\n\\t/**\\n\\t * The feature id for the 'Binding Registries' reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n\\n\\t/**\\n\\t * The feature id for the 'Version' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\\n\\n\\t/**\\n\\t * The feature id for the 'Created On' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\\n\\n\\t/**\\n\\t * The feature id for the 'Modified On' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\\n\\n\\t/**\\n\\t * The feature id for the 'Name' attribute. \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\\n\\n\\t/**\\n\\t * The feature id for the 'Entity' container reference.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__ENTITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\\n\\n\\t/**\\n\\t * The feature id for the 'Customized Name' attribute.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__CUSTOMIZED_NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n\\n\\t/**\\n\\t * The feature id for the 'Criterions' containment reference list.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__CRITERIONS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\\n\\n\\t/**\\n\\t * The feature id for the 'Multiplicity' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\\n\\n\\t/**\\n\\t * The number of structural features of the 'Finder' class.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint FINDER_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.CriterionImpl Criterion}' class.\\n\\t * \\n\\t * @see org.obeonetwork.dsl.entity.impl.CriterionImpl\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getCriterion()\\n\\t * @generated\\n\\t */\\n\\tint CRITERION = 8;\\n\\n\\t/**\\n\\t * The feature id for the 'Metadatas' containment reference.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint CRITERION__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\\n\\n\\t/**\\n\\t * The feature id for the 'Description' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint CRITERION__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\\n\\n\\t/**\\n\\t * The feature id for the 'Keywords' attribute list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint CRITERION__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\\n\\n\\t/**\\n\\t * The feature id for the 'Behaviours' containment reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint CRITERION__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\\n\\n\\t/**\\n\\t * The feature id for the 'Binding Registries' reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint CRITERION__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n\\n\\t/**\\n\\t * The feature id for the 'Version' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint CRITERION__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\\n\\n\\t/**\\n\\t * The feature id for the 'Created On' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint CRITERION__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\\n\\n\\t/**\\n\\t * The feature id for the 'Modified On' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint CRITERION__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\\n\\n\\t/**\\n\\t * The number of structural features of the 'Criterion' class.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint CRITERION_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.InternalCriterionImpl Internal Criterion}' class.\\n\\t * \\n\\t * @see org.obeonetwork.dsl.entity.impl.InternalCriterionImpl\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInternalCriterion()\\n\\t * @generated\\n\\t */\\n\\tint INTERNAL_CRITERION = 7;\\n\\n\\t/**\\n\\t * The feature id for the 'Metadatas' containment reference.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint INTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\\n\\n\\t/**\\n\\t * The feature id for the 'Description' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint INTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\\n\\n\\t/**\\n\\t * The feature id for the 'Keywords' attribute list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint INTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\\n\\n\\t/**\\n\\t * The feature id for the 'Behaviours' containment reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint INTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\\n\\n\\t/**\\n\\t * The feature id for the 'Binding Registries' reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint INTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\\n\\n\\t/**\\n\\t * The feature id for the 'Version' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint INTERNAL_CRITERION__VERSION = CRITERION__VERSION;\\n\\n\\t/**\\n\\t * The feature id for the 'Created On' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint INTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\\n\\n\\t/**\\n\\t * The feature id for the 'Modified On' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint INTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\\n\\n\\t/**\\n\\t * The feature id for the 'Target' reference. \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint INTERNAL_CRITERION__TARGET = CRITERION_FEATURE_COUNT + 0;\\n\\n\\t/**\\n\\t * The feature id for the 'Name' attribute. \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint INTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 1;\\n\\n\\t/**\\n\\t * The number of structural features of the 'Internal Criterion' class.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint INTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl External Criterion}' class.\\n\\t * \\n\\t * @see org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getExternalCriterion()\\n\\t * @generated\\n\\t */\\n\\tint EXTERNAL_CRITERION = 9;\\n\\n\\t/**\\n\\t * The feature id for the 'Metadatas' containment reference.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint EXTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\\n\\n\\t/**\\n\\t * The feature id for the 'Description' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint EXTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\\n\\n\\t/**\\n\\t * The feature id for the 'Keywords' attribute list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint EXTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\\n\\n\\t/**\\n\\t * The feature id for the 'Behaviours' containment reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint EXTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\\n\\n\\t/**\\n\\t * The feature id for the 'Binding Registries' reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint EXTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\\n\\n\\t/**\\n\\t * The feature id for the 'Version' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint EXTERNAL_CRITERION__VERSION = CRITERION__VERSION;\\n\\n\\t/**\\n\\t * The feature id for the 'Created On' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint EXTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\\n\\n\\t/**\\n\\t * The feature id for the 'Modified On' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint EXTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\\n\\n\\t/**\\n\\t * The feature id for the 'Name' attribute. \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint EXTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 0;\\n\\n\\t/**\\n\\t * The feature id for the 'Type' reference. \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint EXTERNAL_CRITERION__TYPE = CRITERION_FEATURE_COUNT + 1;\\n\\n\\t/**\\n\\t * The number of structural features of the 'External Criterion' class.\\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint EXTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.InheritanceKind Inheritance Kind}' enum.\\n\\t * \\n\\t * @see org.obeonetwork.dsl.entity.InheritanceKind\\n\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInheritanceKind()\\n\\t * @generated\\n\\t */\\n\\tint INHERITANCE_KIND = 10;\\n\\n\\t/**\\n\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Root Root}'.\\n\\t * \\n\\t * @return the meta object for class 'Root'.\\n\\t * @see org.obeonetwork.dsl.entity.Root\\n\\t * @generated\\n\\t */\\n\\tEClass getRoot();\\n\\n\\t/**\\n\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Root#getBlocks Blocks}'.\\n\\t * \\n\\t * @return the meta object for the containment reference list 'Blocks'.\\n\\t * @see org.obeonetwork.dsl.entity.Root#getBlocks()\\n\\t * @see #getRoot()\\n\\t * @generated\\n\\t */\\n\\tEReference getRoot_Blocks();\\n\\n\\t/**\\n\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Block Block}'.\\n\\t * \\n\\t * @return the meta object for class 'Block'.\\n\\t * @see org.obeonetwork.dsl.entity.Block\\n\\t * @generated\\n\\t */\\n\\tEClass getBlock();\\n\\n\\t/**\\n\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Block#getName Name}'.\\n\\t * \\n\\t * @return the meta object for the attribute 'Name'.\\n\\t * @see org.obeonetwork.dsl.entity.Block#getName()\\n\\t * @see #getBlock()\\n\\t * @generated\\n\\t */\\n\\tEAttribute getBlock_Name();\\n\\n\\t/**\\n\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Block#getEntities Entities}'.\\n\\t * \\n\\t * @return the meta object for the containment reference list 'Entities'.\\n\\t * @see org.obeonetwork.dsl.entity.Block#getEntities()\\n\\t * @see #getBlock()\\n\\t * @generated\\n\\t */\\n\\tEReference getBlock_Entities();\\n\\n\\t/**\\n\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Block#getSubblocks Subblocks}'.\\n\\t * \\n\\t * @return the meta object for the containment reference list 'Subblocks'.\\n\\t * @see org.obeonetwork.dsl.entity.Block#getSubblocks()\\n\\t * @see #getBlock()\\n\\t * @generated\\n\\t */\\n\\tEReference getBlock_Subblocks();\\n\\n\\t/**\\n\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Entity Entity}'.\\n\\t * \\n\\t * @return the meta object for class 'Entity'.\\n\\t * @see org.obeonetwork.dsl.entity.Entity\\n\\tEClass getEntity();\\n\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Entity#getOwnedAttributes Owned Attributes}'.\\n\\t * @return the meta object for the containment reference list 'Owned Attributes'.\\n\\t * @see org.obeonetwork.dsl.entity.Entity#getOwnedAttributes()\\n\\t * @see #getEntity()\\n\\tEReference getEntity_OwnedAttributes();\\n\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Entity#getOwnedReferences Owned References}'.\\n\\t * @return the meta object for the containment reference list 'Owned References'.\\n\\t * @see org.obeonetwork.dsl.entity.Entity#getOwnedReferences()\\n\\t * @see #getEntity()\\n\\tEReference getEntity_OwnedReferences();\\n\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Entity#getSupertype Supertype}'.\\n\\t * @return the meta object for the reference 'Supertype'.\\n\\t * @see org.obeonetwork.dsl.entity.Entity#getSupertype()\\n\\t * @see #getEntity()\\n\\tEReference getEntity_Supertype();\\n\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getAttributes Attributes}'.\\n\\t * \\n\\t * @return the meta object for the reference list 'Attributes'.\\n\\t * @see org.obeonetwork.dsl.entity.Entity#getAttributes()\\n\\t * @see #getEntity()\\n\\tEReference getEntity_Attributes();\\n\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getReferences References}'.\\n\\t * \\n\\t * @return the meta object for the reference list 'References'.\\n\\t * @see org.obeonetwork.dsl.entity.Entity#getReferences()\\n\\t * @see #getEntity()\\n\\tEReference getEntity_References();\\n\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getProperties Properties}'.\\n\\t * @return the meta object for the reference list 'Properties'.\\n\\t * @see org.obeonetwork.dsl.entity.Entity#getProperties()\\n\\t * @see #getEntity()\\n\\tEReference getEntity_Properties();\\n\\t/**\\n\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Entity#getBlock Block}'.\\n\\t * \\n\\t * @return the meta object for the container reference 'Block'.\\n\\t * @see org.obeonetwork.dsl.entity.Entity#getBlock()\\n\\t * @see #getEntity()\\n\\t * @generated\\n\\t */\\n\\tEReference getEntity_Block();\\n\\n\\t/**\\n\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Property Property}'.\\n\\t * \\n\\t * @return the meta object for class 'Property'.\\n\\t * @see org.obeonetwork.dsl.entity.Property\\n\\t * @generated\\n\\t */\\n\\tEClass getProperty();\\n\\n\\t/**\\n\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#getName Name}'.\\n\\t * \\n\\t * @return the meta object for the attribute 'Name'.\\n\\t * @see org.obeonetwork.dsl.entity.Property#getName()\\n\\t * @see #getProperty()\\n\\t * @generated\\n\\t */\\n\\tEAttribute getProperty_Name();\\n\\n\\t/**\\n\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#getMultiplicity Multiplicity}'.\\n\\t * \\n\\t * @return the meta object for the attribute 'Multiplicity'.\\n\\t * @see org.obeonetwork.dsl.entity.Property#getMultiplicity()\\n\\t * @see #getProperty()\\n\\t * @generated\\n\\t */\\n\\tEAttribute getProperty_Multiplicity();\\n\\n\\t/**\\n\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#isIsPrimaryKey Is Primary Key}'.\\n\\t * \\n\\t * @return the meta object for the attribute 'Is Primary Key'.\\n\\t * @see org.obeonetwork.dsl.entity.Property#isIsPrimaryKey()\\n\\t * @see #getProperty()\\n\\t * @generated\\n\\t */\\n\\tEAttribute getProperty_IsPrimaryKey();\\n\\n\\t/**\\n\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Attribute Attribute}'.\\n\\t * \\n\\t * @return the meta object for class 'Attribute'.\\n\\t * @see org.obeonetwork.dsl.entity.Attribute\\n\\t * @generated\\n\\t */\\n\\tEClass getAttribute();\\n\\n\\t/**\\n\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Attribute#getEntity Entity}'.\\n\\t * \\n\\t * @return the meta object for the container reference 'Entity'.\\n\\t * @see org.obeonetwork.dsl.entity.Attribute#getEntity()\\n\\t * @see #getAttribute()\\n\\t * @generated\\n\\t */\\n\\tEReference getAttribute_Entity();\\n\\n\\t/**\\n\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Attribute#getType Type}'.\\n\\t * \\n\\t * @return the meta object for the reference 'Type'.\\n\\t * @see org.obeonetwork.dsl.entity.Attribute#getType()\\n\\t * @see #getAttribute()\\n\\t * @generated\\n\\t */\\n\\tEReference getAttribute_Type();\\n\\n\\t/**\\n\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Reference Reference}'.\\n\\t * \\n\\t * @return the meta object for class 'Reference'.\\n\\t * @see org.obeonetwork.dsl.entity.Reference\\n\\t * @generated\\n\\t */\\n\\tEClass getReference();\\n\\n\\t/**\\n\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Reference#getEntity Entity}'.\\n\\t * \\n\\t * @return the meta object for the container reference 'Entity'.\\n\\t * @see org.obeonetwork.dsl.entity.Reference#getEntity()\\n\\t * @see #getReference()\\n\\t * @generated\\n\\t */\\n\\tEReference getReference_Entity();\\n\\n\\t/**\\n\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Reference#isIsComposite Is Composite}'.\\n\\t * \\n\\t * @return the meta object for the attribute 'Is Composite'.\\n\\t * @see org.obeonetwork.dsl.entity.Reference#isIsComposite()\\n\\t * @see #getReference()\\n\\t * @generated\\n\\t */\\n\\tEAttribute getReference_IsComposite();\\n\\n\\t/**\\n\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Reference#getOppositeOf Opposite Of}'.\\n\\t * \\n\\t * @return the meta object for the reference 'Opposite Of'.\\n\\t * @see org.obeonetwork.dsl.entity.Reference#getOppositeOf()\\n\\t * @see #getReference()\\n\\t * @generated\\n\\t */\\n\\tEReference getReference_OppositeOf();\\n\\n\\t/**\\n\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Reference#getType Type}'.\\n\\t * \\n\\t * @return the meta object for the reference 'Type'.\\n\\t * @see org.obeonetwork.dsl.entity.Reference#getType()\\n\\t * @see #getReference()\\n\\t * @generated\\n\\t */\\n\\tEReference getReference_Type();\\n\\n\\t/**\\n\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Reference#isNavigable Navigable}'.\\n\\t * \\n\\t * @return the meta object for the attribute 'Navigable'.\\n\\t * @see org.obeonetwork.dsl.entity.Reference#isNavigable()\\n\\t * @see #getReference()\\n\\t * @generated\\n\\t */\\n\\tEAttribute getReference_Navigable();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Blocks' containment reference list feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference ROOT__BLOCKS = eINSTANCE.getRoot_Blocks();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.BlockImpl Block}' class.\\n\\t\\t * \\n\\t\\t * @see org.obeonetwork.dsl.entity.impl.BlockImpl\\n\\t\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getBlock()\\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEClass BLOCK = eINSTANCE.getBlock();\\n\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEAttribute BLOCK__NAME = eINSTANCE.getBlock_Name();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Entities' containment reference list feature.\\n\\t\\t * \\n\\t\\tEReference BLOCK__ENTITIES = eINSTANCE.getBlock_Entities();\\n\\t\\t * The meta object literal for the 'Subblocks' containment reference list feature.\\n\\t\\t * \\n\\t\\tEReference BLOCK__SUBBLOCKS = eINSTANCE.getBlock_Subblocks();\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Owned Attributes' containment reference list feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference ENTITY__OWNED_ATTRIBUTES = eINSTANCE.getEntity_OwnedAttributes();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Owned References' containment reference list feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference ENTITY__OWNED_REFERENCES = eINSTANCE.getEntity_OwnedReferences();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Supertype' reference feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference ENTITY__SUPERTYPE = eINSTANCE.getEntity_Supertype();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Attributes' reference list feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference ENTITY__ATTRIBUTES = eINSTANCE.getEntity_Attributes();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'References' reference list feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference ENTITY__REFERENCES = eINSTANCE.getEntity_References();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Properties' reference list feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference ENTITY__PROPERTIES = eINSTANCE.getEntity_Properties();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Block' container reference feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference ENTITY__BLOCK = eINSTANCE.getEntity_Block();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.PropertyImpl Property}' class.\\n\\t\\t * \\n\\t\\t * @see org.obeonetwork.dsl.entity.impl.PropertyImpl\\n\\t\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getProperty()\\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEClass PROPERTY = eINSTANCE.getProperty();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Name' attribute feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Multiplicity' attribute feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEAttribute PROPERTY__MULTIPLICITY = eINSTANCE.getProperty_Multiplicity();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Is Primary Key' attribute feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEAttribute PROPERTY__IS_PRIMARY_KEY = eINSTANCE.getProperty_IsPrimaryKey();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.AttributeImpl Attribute}' class.\\n\\t\\t * \\n\\t\\t * @see org.obeonetwork.dsl.entity.impl.AttributeImpl\\n\\t\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getAttribute()\\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEClass ATTRIBUTE = eINSTANCE.getAttribute();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Entity' container reference feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference ATTRIBUTE__ENTITY = eINSTANCE.getAttribute_Entity();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Type' reference feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference ATTRIBUTE__TYPE = eINSTANCE.getAttribute_Type();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.ReferenceImpl Reference}' class.\\n\\t\\t * \\n\\t\\t * @see org.obeonetwork.dsl.entity.impl.ReferenceImpl\\n\\t\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getReference()\\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEClass REFERENCE = eINSTANCE.getReference();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Entity' container reference feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference REFERENCE__ENTITY = eINSTANCE.getReference_Entity();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Is Composite' attribute feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEAttribute REFERENCE__IS_COMPOSITE = eINSTANCE.getReference_IsComposite();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Opposite Of' reference feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference REFERENCE__OPPOSITE_OF = eINSTANCE.getReference_OppositeOf();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Type' reference feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference REFERENCE__TYPE = eINSTANCE.getReference_Type();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Navigable' attribute feature.\\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEAttribute REFERENCE__NAVIGABLE = eINSTANCE.getReference_Navigable();\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -53,7 +53,7 @@ public interface EntityPackage extends EPackage {\\n \\t * \\n \\t * @generated\\n \\t */\\n-\\tString eNS_URI = \\\"http://www.obeonetwork.org/dsl/entity/2.0.0\\\";\\n+\\tString eNS_URI = \\\"http://www.obeonetwork.org/dsl/entity/3.0.0\\\";\\n \\n \\t/**\\n \\t * The package namespace name.\\n@@ -85,7 +85,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ROOT__METADATAS = EnvironmentPackage.NAMESPACE__METADATAS;\\n+\\tint ROOT__METADATAS = EnvironmentPackage.TYPES_DEFINITION__METADATAS;\\n \\n \\t/**\\n \\t * The feature id for the 'Description' attribute.\\n@@ -94,7 +94,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ROOT__DESCRIPTION = EnvironmentPackage.NAMESPACE__DESCRIPTION;\\n+\\tint ROOT__DESCRIPTION = EnvironmentPackage.TYPES_DEFINITION__DESCRIPTION;\\n \\n \\t/**\\n \\t * The feature id for the 'Keywords' attribute list.\\n@@ -103,7 +103,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ROOT__KEYWORDS = EnvironmentPackage.NAMESPACE__KEYWORDS;\\n+\\tint ROOT__KEYWORDS = EnvironmentPackage.TYPES_DEFINITION__KEYWORDS;\\n \\n \\t/**\\n \\t * The feature id for the 'Behaviours' containment reference list.\\n@@ -112,7 +112,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ROOT__BEHAVIOURS = EnvironmentPackage.NAMESPACE__BEHAVIOURS;\\n+\\tint ROOT__BEHAVIOURS = EnvironmentPackage.TYPES_DEFINITION__BEHAVIOURS;\\n \\n \\t/**\\n \\t * The feature id for the 'Binding Registries' reference list.\\n@@ -121,7 +121,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ROOT__BINDING_REGISTRIES = EnvironmentPackage.NAMESPACE__BINDING_REGISTRIES;\\n+\\tint ROOT__BINDING_REGISTRIES = EnvironmentPackage.TYPES_DEFINITION__BINDING_REGISTRIES;\\n \\n \\t/**\\n \\t * The feature id for the 'Version' attribute.\\n@@ -130,7 +130,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ROOT__VERSION = EnvironmentPackage.NAMESPACE__VERSION;\\n+\\tint ROOT__VERSION = EnvironmentPackage.TYPES_DEFINITION__VERSION;\\n \\n \\t/**\\n \\t * The feature id for the 'Created On' attribute.\\n@@ -139,7 +139,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ROOT__CREATED_ON = EnvironmentPackage.NAMESPACE__CREATED_ON;\\n+\\tint ROOT__CREATED_ON = EnvironmentPackage.TYPES_DEFINITION__CREATED_ON;\\n \\n \\t/**\\n \\t * The feature id for the 'Modified On' attribute.\\n@@ -148,42 +148,34 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ROOT__MODIFIED_ON = EnvironmentPackage.NAMESPACE__MODIFIED_ON;\\n+\\tint ROOT__MODIFIED_ON = EnvironmentPackage.TYPES_DEFINITION__MODIFIED_ON;\\n \\n \\t/**\\n-\\t * The feature id for the 'Owned Namespaces' containment reference list.\\n+\\t * The feature id for the 'Types' containment reference list.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ROOT__OWNED_NAMESPACES = EnvironmentPackage.NAMESPACE__OWNED_NAMESPACES;\\n+\\tint ROOT__TYPES = EnvironmentPackage.TYPES_DEFINITION__TYPES;\\n \\n \\t/**\\n-\\t * The feature id for the 'Owner' container reference.\\n+\\t * The feature id for the 'Name' attribute.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ROOT__OWNER = EnvironmentPackage.NAMESPACE__OWNER;\\n+\\tint ROOT__NAME = EnvironmentPackage.TYPES_DEFINITION_FEATURE_COUNT + 0;\\n \\n \\t/**\\n-\\t * The feature id for the 'Name' attribute.\\n+\\t * The feature id for the 'Namespaces' containment reference list.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ROOT__NAME = EnvironmentPackage.NAMESPACE__NAME;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Blocks' containment reference list.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint ROOT__BLOCKS = EnvironmentPackage.NAMESPACE_FEATURE_COUNT + 0;\\n+\\tint ROOT__NAMESPACES = EnvironmentPackage.TYPES_DEFINITION_FEATURE_COUNT + 1;\\n \\n \\t/**\\n \\t * The number of structural features of the 'Root' class. \\n-\\t * @see org.obeonetwork.dsl.entity.impl.BlockImpl\\n-\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getBlock()\\n+\\t * @see org.obeonetwork.dsl.entity.impl.EntityImpl\\n+\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getEntity()\\n \\t * @generated\\n \\t */\\n-\\tint BLOCK = 1;\\n+\\tint ENTITY = 1;\\n \\n \\t/**\\n \\t * The feature id for the 'Metadatas' containment reference.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint BLOCK__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\\n+\\tint ENTITY__METADATAS = EnvironmentPackage.STRUCTURED_TYPE__METADATAS;\\n \\n \\t/**\\n \\t * The feature id for the 'Description' attribute.\\n@@ -218,7 +210,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint BLOCK__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\\n+\\tint ENTITY__DESCRIPTION = EnvironmentPackage.STRUCTURED_TYPE__DESCRIPTION;\\n \\n \\t/**\\n \\t * The feature id for the 'Keywords' attribute list.\\n@@ -227,7 +219,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint BLOCK__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\\n+\\tint ENTITY__KEYWORDS = EnvironmentPackage.STRUCTURED_TYPE__KEYWORDS;\\n \\n \\t/**\\n \\t * The feature id for the 'Behaviours' containment reference list.\\n@@ -236,7 +228,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint BLOCK__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\\n+\\tint ENTITY__BEHAVIOURS = EnvironmentPackage.STRUCTURED_TYPE__BEHAVIOURS;\\n \\n \\t/**\\n \\t * The feature id for the 'Binding Registries' reference list.\\n@@ -245,7 +237,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint BLOCK__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n+\\tint ENTITY__BINDING_REGISTRIES = EnvironmentPackage.STRUCTURED_TYPE__BINDING_REGISTRIES;\\n \\n \\t/**\\n \\t * The feature id for the 'Version' attribute.\\n@@ -254,7 +246,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint BLOCK__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\\n+\\tint ENTITY__VERSION = EnvironmentPackage.STRUCTURED_TYPE__VERSION;\\n \\n \\t/**\\n \\t * The feature id for the 'Created On' attribute.\\n@@ -263,7 +255,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint BLOCK__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\\n+\\tint ENTITY__CREATED_ON = EnvironmentPackage.STRUCTURED_TYPE__CREATED_ON;\\n \\n \\t/**\\n \\t * The feature id for the 'Modified On' attribute.\\n@@ -272,7 +264,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint BLOCK__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\\n+\\tint ENTITY__MODIFIED_ON = EnvironmentPackage.STRUCTURED_TYPE__MODIFIED_ON;\\n \\n \\t/**\\n \\t * The feature id for the 'Name' attribute. \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint BLOCK__ENTITIES = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\\n+\\tint ENTITY__TYPE_DEFINITION = EnvironmentPackage.STRUCTURED_TYPE__TYPE_DEFINITION;\\n \\n \\t/**\\n-\\t * The feature id for the 'Subblocks' containment reference list.\\n-\\t * \\n+\\t * The feature id for the 'Supertype' reference. \\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint BLOCK__SUBBLOCKS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n+\\tint ENTITY__SUPERTYPE = EnvironmentPackage.STRUCTURED_TYPE__SUPERTYPE;\\n \\n \\t/**\\n-\\t * The number of structural features of the 'Block' class. \\n-\\t * \\n+\\t * The feature id for the 'Associated Types' reference list.\\n+\\t * \\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint BLOCK_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\\n+\\tint ENTITY__ASSOCIATED_TYPES = EnvironmentPackage.STRUCTURED_TYPE__ASSOCIATED_TYPES;\\n \\n \\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.EntityImpl Entity}' class.\\n+\\t * The feature id for the 'Owned Attributes' containment reference list.\\n \\t * \\n-\\t * @see org.obeonetwork.dsl.entity.impl.EntityImpl\\n-\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getEntity()\\n \\t * @generated\\n+\\t * @ordered\\n \\t */\\n-\\tint ENTITY = 2;\\n+\\tint ENTITY__OWNED_ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES;\\n \\n \\t/**\\n-\\t * The feature id for the 'Metadatas' containment reference.\\n+\\t * The feature id for the 'Attributes' reference list.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__METADATAS = EnvironmentPackage.STRUCTURED_TYPE__METADATAS;\\n+\\tint ENTITY__ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE__ATTRIBUTES;\\n \\n \\t/**\\n-\\t * The feature id for the 'Description' attribute.\\n-\\t * \\n-\\t * \\n+\\t * The feature id for the 'Owned References' containment reference list.\\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__DESCRIPTION = EnvironmentPackage.STRUCTURED_TYPE__DESCRIPTION;\\n+\\tint ENTITY__OWNED_REFERENCES = EnvironmentPackage.STRUCTURED_TYPE__OWNED_REFERENCES;\\n \\n \\t/**\\n-\\t * The feature id for the 'Keywords' attribute list.\\n-\\t * \\n-\\t * \\n+\\t * The feature id for the 'References' reference list.\\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__KEYWORDS = EnvironmentPackage.STRUCTURED_TYPE__KEYWORDS;\\n+\\tint ENTITY__REFERENCES = EnvironmentPackage.STRUCTURED_TYPE__REFERENCES;\\n \\n \\t/**\\n-\\t * The feature id for the 'Behaviours' containment reference list.\\n-\\t * \\n-\\t * \\n+\\t * The feature id for the 'Properties' reference list.\\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__BEHAVIOURS = EnvironmentPackage.STRUCTURED_TYPE__BEHAVIOURS;\\n+\\tint ENTITY__PROPERTIES = EnvironmentPackage.STRUCTURED_TYPE__PROPERTIES;\\n \\n \\t/**\\n-\\t * The feature id for the 'Binding Registries' reference list.\\n-\\t * \\n-\\t * \\n+\\t * The feature id for the 'Estimated Volumetry' attribute.\\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__BINDING_REGISTRIES = EnvironmentPackage.STRUCTURED_TYPE__BINDING_REGISTRIES;\\n+\\tint ENTITY__ESTIMATED_VOLUMETRY = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 0;\\n \\n \\t/**\\n-\\t * The feature id for the 'Version' attribute.\\n-\\t * \\n-\\t * \\n+\\t * The feature id for the 'Estimated Access' attribute.\\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__VERSION = EnvironmentPackage.STRUCTURED_TYPE__VERSION;\\n+\\tint ENTITY__ESTIMATED_ACCESS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 1;\\n \\n \\t/**\\n-\\t * The feature id for the 'Created On' attribute.\\n-\\t * \\n-\\t * \\n+\\t * The feature id for the 'Historized' attribute. \\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__CREATED_ON = EnvironmentPackage.STRUCTURED_TYPE__CREATED_ON;\\n+\\tint ENTITY__HISTORIZED = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 2;\\n \\n \\t/**\\n-\\t * The feature id for the 'Modified On' attribute.\\n-\\t * \\n-\\t * \\n+\\t * The feature id for the 'Owned Finders' containment reference list.\\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__MODIFIED_ON = EnvironmentPackage.STRUCTURED_TYPE__MODIFIED_ON;\\n+\\tint ENTITY__OWNED_FINDERS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 3;\\n \\n \\t/**\\n-\\t * The feature id for the 'Name' attribute. \\n-\\t * \\n+\\t * The feature id for the 'Inheritance Kind' attribute.\\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__NAME = EnvironmentPackage.STRUCTURED_TYPE__NAME;\\n+\\tint ENTITY__INHERITANCE_KIND = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 4;\\n \\n \\t/**\\n-\\t * The feature id for the 'Type Definition' container reference.\\n+\\t * The number of structural features of the 'Entity' class.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__TYPE_DEFINITION = EnvironmentPackage.STRUCTURED_TYPE__TYPE_DEFINITION;\\n+\\tint ENTITY_FEATURE_COUNT = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 5;\\n \\n \\t/**\\n-\\t * The feature id for the 'Owned Attributes' containment reference list.\\n+\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl Finder}' class.\\n \\t * \\n+\\t * @see org.obeonetwork.dsl.entity.impl.FinderImpl\\n+\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getFinder()\\n \\t * @generated\\n-\\t * @ordered\\n \\t */\\n-\\tint ENTITY__OWNED_ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 0;\\n+\\tint FINDER = 2;\\n \\n \\t/**\\n-\\t * The feature id for the 'Owned References' containment reference list.\\n+\\t * The feature id for the 'Metadatas' containment reference.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__OWNED_REFERENCES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 1;\\n+\\tint FINDER__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\\n \\n \\t/**\\n-\\t * The feature id for the 'Supertype' reference. \\n-\\t * \\n+\\t * The feature id for the 'Description' attribute.\\n+\\t * \\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__SUPERTYPE = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 2;\\n+\\tint FINDER__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\\n \\n \\t/**\\n-\\t * The feature id for the 'Attributes' reference list.\\n-\\t * \\n+\\t * The feature id for the 'Keywords' attribute list.\\n+\\t * \\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__ATTRIBUTES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 3;\\n+\\tint FINDER__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\\n \\n \\t/**\\n-\\t * The feature id for the 'References' reference list.\\n-\\t * \\n+\\t * The feature id for the 'Behaviours' containment reference list.\\n+\\t * \\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__REFERENCES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 4;\\n+\\tint FINDER__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\\n \\n \\t/**\\n-\\t * The feature id for the 'Properties' reference list.\\n-\\t * \\n+\\t * The feature id for the 'Binding Registries' reference list.\\n+\\t * \\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__PROPERTIES = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 5;\\n+\\tint FINDER__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n \\n \\t/**\\n-\\t * The feature id for the 'Estimated Volumetry' attribute.\\n-\\t * \\n+\\t * The feature id for the 'Version' attribute.\\n+\\t * \\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__ESTIMATED_VOLUMETRY = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 6;\\n+\\tint FINDER__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\\n \\n \\t/**\\n-\\t * The feature id for the 'Estimated Access' attribute.\\n-\\t * \\n+\\t * The feature id for the 'Created On' attribute.\\n+\\t * \\n+\\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__ESTIMATED_ACCESS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 7;\\n+\\tint FINDER__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\\n \\n \\t/**\\n-\\t * The feature id for the 'Historized' attribute. \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint FINDER__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\\n+\\n+\\t/**\\n+\\t * The feature id for the 'Name' attribute. \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__HISTORIZED = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 8;\\n+\\tint FINDER__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\\n \\n \\t/**\\n-\\t * The feature id for the 'Owned Finders' containment reference list.\\n+\\t * The feature id for the 'Entity' container reference.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__OWNED_FINDERS = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 9;\\n+\\tint FINDER__ENTITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\\n \\n \\t/**\\n-\\t * The feature id for the 'Block' container reference.\\n+\\t * The feature id for the 'Customized Name' attribute.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__BLOCK = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 10;\\n+\\tint FINDER__CUSTOMIZED_NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n \\n \\t/**\\n-\\t * The feature id for the 'Inheritance Kind' attribute.\\n+\\t * The feature id for the 'Criterions' containment reference list.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY__INHERITANCE_KIND = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 11;\\n+\\tint FINDER__CRITERIONS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\\n \\n \\t/**\\n-\\t * The number of structural features of the 'Entity' class.\\n+\\t * The feature id for the 'Multiplicity' attribute.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint FINDER__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\\n+\\n+\\t/**\\n+\\t * The number of structural features of the 'Finder' class.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENTITY_FEATURE_COUNT = EnvironmentPackage.STRUCTURED_TYPE_FEATURE_COUNT + 12;\\n+\\tint FINDER_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\\n \\n \\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.PropertyImpl Property}' class.\\n+\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.CriterionImpl Criterion}' class.\\n \\t * \\n-\\t * @see org.obeonetwork.dsl.entity.impl.PropertyImpl\\n-\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getProperty()\\n+\\t * @see org.obeonetwork.dsl.entity.impl.CriterionImpl\\n+\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getCriterion()\\n \\t * @generated\\n \\t */\\n-\\tint PROPERTY = 3;\\n+\\tint CRITERION = 4;\\n \\n \\t/**\\n \\t * The feature id for the 'Metadatas' containment reference.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint PROPERTY__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\\n+\\tint CRITERION__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\\n \\n \\t/**\\n \\t * The feature id for the 'Description' attribute.\\n@@ -535,7 +544,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint PROPERTY__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\\n+\\tint CRITERION__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\\n \\n \\t/**\\n \\t * The feature id for the 'Keywords' attribute list.\\n@@ -544,7 +553,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint PROPERTY__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\\n+\\tint CRITERION__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\\n \\n \\t/**\\n \\t * The feature id for the 'Behaviours' containment reference list.\\n@@ -553,7 +562,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint PROPERTY__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\\n+\\tint CRITERION__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\\n \\n \\t/**\\n \\t * The feature id for the 'Binding Registries' reference list.\\n@@ -562,7 +571,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint PROPERTY__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n+\\tint CRITERION__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n \\n \\t/**\\n \\t * The feature id for the 'Version' attribute.\\n@@ -571,7 +580,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint PROPERTY__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\\n+\\tint CRITERION__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\\n \\n \\t/**\\n \\t * The feature id for the 'Created On' attribute.\\n@@ -580,7 +589,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint PROPERTY__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\\n+\\tint CRITERION__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\\n \\n \\t/**\\n \\t * The feature id for the 'Modified On' attribute.\\n@@ -589,57 +598,32 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint PROPERTY__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Name' attribute. \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint PROPERTY__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Multiplicity' attribute.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint PROPERTY__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Is Primary Key' attribute.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint PROPERTY__IS_PRIMARY_KEY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n+\\tint CRITERION__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\\n \\n \\t/**\\n-\\t * The number of structural features of the 'Property' class.\\n+\\t * The number of structural features of the 'Criterion' class.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint PROPERTY_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\\n+\\tint CRITERION_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\\n \\n \\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.AttributeImpl Attribute}' class.\\n+\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.InternalCriterionImpl Internal Criterion}' class.\\n \\t * \\n-\\t * @see org.obeonetwork.dsl.entity.impl.AttributeImpl\\n-\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getAttribute()\\n+\\t * @see org.obeonetwork.dsl.entity.impl.InternalCriterionImpl\\n+\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInternalCriterion()\\n \\t * @generated\\n \\t */\\n-\\tint ATTRIBUTE = 4;\\n+\\tint INTERNAL_CRITERION = 3;\\n \\n \\t/**\\n \\t * The feature id for the 'Metadatas' containment reference.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ATTRIBUTE__METADATAS = PROPERTY__METADATAS;\\n+\\tint INTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\\n \\n \\t/**\\n \\t * The feature id for the 'Description' attribute.\\n@@ -648,7 +632,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ATTRIBUTE__DESCRIPTION = PROPERTY__DESCRIPTION;\\n+\\tint INTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\\n \\n \\t/**\\n \\t * The feature id for the 'Keywords' attribute list.\\n@@ -657,7 +641,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ATTRIBUTE__KEYWORDS = PROPERTY__KEYWORDS;\\n+\\tint INTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\\n \\n \\t/**\\n \\t * The feature id for the 'Behaviours' containment reference list.\\n@@ -666,7 +650,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ATTRIBUTE__BEHAVIOURS = PROPERTY__BEHAVIOURS;\\n+\\tint INTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\\n \\n \\t/**\\n \\t * The feature id for the 'Binding Registries' reference list.\\n@@ -675,7 +659,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ATTRIBUTE__BINDING_REGISTRIES = PROPERTY__BINDING_REGISTRIES;\\n+\\tint INTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\\n \\n \\t/**\\n \\t * The feature id for the 'Version' attribute.\\n@@ -684,7 +668,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ATTRIBUTE__VERSION = PROPERTY__VERSION;\\n+\\tint INTERNAL_CRITERION__VERSION = CRITERION__VERSION;\\n \\n \\t/**\\n \\t * The feature id for the 'Created On' attribute.\\n@@ -693,7 +677,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ATTRIBUTE__CREATED_ON = PROPERTY__CREATED_ON;\\n+\\tint INTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\\n \\n \\t/**\\n \\t * The feature id for the 'Modified On' attribute.\\n@@ -702,74 +686,50 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ATTRIBUTE__MODIFIED_ON = PROPERTY__MODIFIED_ON;\\n+\\tint INTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\\n \\n \\t/**\\n-\\t * The feature id for the 'Name' attribute. \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ATTRIBUTE__NAME = PROPERTY__NAME;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Multiplicity' attribute.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint ATTRIBUTE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Is Primary Key' attribute.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint ATTRIBUTE__IS_PRIMARY_KEY = PROPERTY__IS_PRIMARY_KEY;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Entity' container reference.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint ATTRIBUTE__ENTITY = PROPERTY_FEATURE_COUNT + 0;\\n+\\tint INTERNAL_CRITERION__TARGET = CRITERION_FEATURE_COUNT + 0;\\n \\n \\t/**\\n-\\t * The feature id for the 'Type' reference. \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ATTRIBUTE__TYPE = PROPERTY_FEATURE_COUNT + 1;\\n+\\tint INTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 1;\\n \\n \\t/**\\n-\\t * The number of structural features of the 'Attribute' class.\\n+\\t * The number of structural features of the 'Internal Criterion' class.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ATTRIBUTE_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 2;\\n+\\tint INTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\\n \\n \\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ReferenceImpl Reference}' class.\\n+\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl External Criterion}' class.\\n \\t * \\n-\\t * @see org.obeonetwork.dsl.entity.impl.ReferenceImpl\\n-\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getReference()\\n+\\t * @see org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl\\n+\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getExternalCriterion()\\n \\t * @generated\\n \\t */\\n-\\tint REFERENCE = 5;\\n+\\tint EXTERNAL_CRITERION = 5;\\n \\n \\t/**\\n \\t * The feature id for the 'Metadatas' containment reference.\\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint REFERENCE__METADATAS = PROPERTY__METADATAS;\\n+\\tint EXTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\\n \\n \\t/**\\n \\t * The feature id for the 'Description' attribute.\\n@@ -778,7 +738,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint REFERENCE__DESCRIPTION = PROPERTY__DESCRIPTION;\\n+\\tint EXTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\\n \\n \\t/**\\n \\t * The feature id for the 'Keywords' attribute list.\\n@@ -787,7 +747,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint REFERENCE__KEYWORDS = PROPERTY__KEYWORDS;\\n+\\tint EXTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\\n \\n \\t/**\\n \\t * The feature id for the 'Behaviours' containment reference list.\\n@@ -796,7 +756,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint REFERENCE__BEHAVIOURS = PROPERTY__BEHAVIOURS;\\n+\\tint EXTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\\n \\n \\t/**\\n \\t * The feature id for the 'Binding Registries' reference list.\\n@@ -805,7 +765,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint REFERENCE__BINDING_REGISTRIES = PROPERTY__BINDING_REGISTRIES;\\n+\\tint EXTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\\n \\n \\t/**\\n \\t * The feature id for the 'Version' attribute.\\n@@ -814,7 +774,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint REFERENCE__VERSION = PROPERTY__VERSION;\\n+\\tint EXTERNAL_CRITERION__VERSION = CRITERION__VERSION;\\n \\n \\t/**\\n \\t * The feature id for the 'Created On' attribute.\\n@@ -823,7 +783,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint REFERENCE__CREATED_ON = PROPERTY__CREATED_ON;\\n+\\tint EXTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\\n \\n \\t/**\\n \\t * The feature id for the 'Modified On' attribute.\\n@@ -832,7 +792,7 @@ public interface EntityPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint REFERENCE__MODIFIED_ON = PROPERTY__MODIFIED_ON;\\n+\\tint EXTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\\n \\n \\t/**\\n \\t * The feature id for the 'Name' attribute. \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint REFERENCE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Is Primary Key' attribute.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint REFERENCE__IS_PRIMARY_KEY = PROPERTY__IS_PRIMARY_KEY;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Entity' container reference.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint REFERENCE__ENTITY = PROPERTY_FEATURE_COUNT + 0;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Is Composite' attribute.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint REFERENCE__IS_COMPOSITE = PROPERTY_FEATURE_COUNT + 1;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Opposite Of' reference. \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint REFERENCE__OPPOSITE_OF = PROPERTY_FEATURE_COUNT + 2;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Type' reference. \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint REFERENCE__TYPE = PROPERTY_FEATURE_COUNT + 3;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Navigable' attribute. \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint REFERENCE__NAVIGABLE = PROPERTY_FEATURE_COUNT + 4;\\n-\\n-\\t/**\\n-\\t * The number of structural features of the 'Reference' class.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint REFERENCE_FEATURE_COUNT = PROPERTY_FEATURE_COUNT + 5;\\n-\\n-\\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl Finder}' class.\\n-\\t * \\n-\\t * @see org.obeonetwork.dsl.entity.impl.FinderImpl\\n-\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getFinder()\\n-\\t * @generated\\n-\\t */\\n-\\tint FINDER = 6;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Metadatas' containment reference.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Description' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Keywords' attribute list.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Behaviours' containment reference list.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Binding Registries' reference list.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Version' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Created On' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Modified On' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Name' attribute. \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Entity' container reference.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__ENTITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Customized Name' attribute.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__CUSTOMIZED_NAME = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Criterions' containment reference list.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__CRITERIONS = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Multiplicity' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER__MULTIPLICITY = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\\n-\\n-\\t/**\\n-\\t * The number of structural features of the 'Finder' class.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint FINDER_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\\n-\\n-\\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.CriterionImpl Criterion}' class.\\n-\\t * \\n-\\t * @see org.obeonetwork.dsl.entity.impl.CriterionImpl\\n-\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getCriterion()\\n-\\t * @generated\\n-\\t */\\n-\\tint CRITERION = 8;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Metadatas' containment reference.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint CRITERION__METADATAS = EnvironmentPackage.OBEO_DSM_OBJECT__METADATAS;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Description' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint CRITERION__DESCRIPTION = EnvironmentPackage.OBEO_DSM_OBJECT__DESCRIPTION;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Keywords' attribute list.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint CRITERION__KEYWORDS = EnvironmentPackage.OBEO_DSM_OBJECT__KEYWORDS;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Behaviours' containment reference list.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint CRITERION__BEHAVIOURS = EnvironmentPackage.OBEO_DSM_OBJECT__BEHAVIOURS;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Binding Registries' reference list.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint CRITERION__BINDING_REGISTRIES = EnvironmentPackage.OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Version' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint CRITERION__VERSION = EnvironmentPackage.OBEO_DSM_OBJECT__VERSION;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Created On' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint CRITERION__CREATED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__CREATED_ON;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Modified On' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint CRITERION__MODIFIED_ON = EnvironmentPackage.OBEO_DSM_OBJECT__MODIFIED_ON;\\n-\\n-\\t/**\\n-\\t * The number of structural features of the 'Criterion' class.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint CRITERION_FEATURE_COUNT = EnvironmentPackage.OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\\n-\\n-\\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.InternalCriterionImpl Internal Criterion}' class.\\n-\\t * \\n-\\t * @see org.obeonetwork.dsl.entity.impl.InternalCriterionImpl\\n-\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInternalCriterion()\\n-\\t * @generated\\n-\\t */\\n-\\tint INTERNAL_CRITERION = 7;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Metadatas' containment reference.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint INTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Description' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint INTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Keywords' attribute list.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint INTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Behaviours' containment reference list.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint INTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Binding Registries' reference list.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint INTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Version' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint INTERNAL_CRITERION__VERSION = CRITERION__VERSION;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Created On' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint INTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Modified On' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint INTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Target' reference. \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint INTERNAL_CRITERION__TARGET = CRITERION_FEATURE_COUNT + 0;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Name' attribute. \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint INTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 1;\\n-\\n-\\t/**\\n-\\t * The number of structural features of the 'Internal Criterion' class.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint INTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\\n-\\n-\\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl External Criterion}' class.\\n-\\t * \\n-\\t * @see org.obeonetwork.dsl.entity.impl.ExternalCriterionImpl\\n-\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getExternalCriterion()\\n-\\t * @generated\\n-\\t */\\n-\\tint EXTERNAL_CRITERION = 9;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Metadatas' containment reference.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint EXTERNAL_CRITERION__METADATAS = CRITERION__METADATAS;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Description' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint EXTERNAL_CRITERION__DESCRIPTION = CRITERION__DESCRIPTION;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Keywords' attribute list.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint EXTERNAL_CRITERION__KEYWORDS = CRITERION__KEYWORDS;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Behaviours' containment reference list.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint EXTERNAL_CRITERION__BEHAVIOURS = CRITERION__BEHAVIOURS;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Binding Registries' reference list.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint EXTERNAL_CRITERION__BINDING_REGISTRIES = CRITERION__BINDING_REGISTRIES;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Version' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint EXTERNAL_CRITERION__VERSION = CRITERION__VERSION;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Created On' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint EXTERNAL_CRITERION__CREATED_ON = CRITERION__CREATED_ON;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Modified On' attribute.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint EXTERNAL_CRITERION__MODIFIED_ON = CRITERION__MODIFIED_ON;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Name' attribute. \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint EXTERNAL_CRITERION__NAME = CRITERION_FEATURE_COUNT + 0;\\n-\\n-\\t/**\\n-\\t * The feature id for the 'Type' reference. \\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint EXTERNAL_CRITERION__TYPE = CRITERION_FEATURE_COUNT + 1;\\n-\\n-\\t/**\\n-\\t * The number of structural features of the 'External Criterion' class.\\n-\\t * \\n-\\t * @generated\\n-\\t * @ordered\\n-\\t */\\n-\\tint EXTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\\n-\\n-\\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.InheritanceKind Inheritance Kind}' enum.\\n-\\t * \\n-\\t * @see org.obeonetwork.dsl.entity.InheritanceKind\\n-\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInheritanceKind()\\n-\\t * @generated\\n-\\t */\\n-\\tint INHERITANCE_KIND = 10;\\n-\\n-\\t/**\\n-\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Root Root}'.\\n-\\t * \\n-\\t * @return the meta object for class 'Root'.\\n-\\t * @see org.obeonetwork.dsl.entity.Root\\n-\\t * @generated\\n-\\t */\\n-\\tEClass getRoot();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Root#getBlocks Blocks}'.\\n-\\t * \\n-\\t * @return the meta object for the containment reference list 'Blocks'.\\n-\\t * @see org.obeonetwork.dsl.entity.Root#getBlocks()\\n-\\t * @see #getRoot()\\n-\\t * @generated\\n-\\t */\\n-\\tEReference getRoot_Blocks();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Block Block}'.\\n-\\t * \\n-\\t * @return the meta object for class 'Block'.\\n-\\t * @see org.obeonetwork.dsl.entity.Block\\n-\\t * @generated\\n-\\t */\\n-\\tEClass getBlock();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Block#getName Name}'.\\n-\\t * \\n-\\t * @return the meta object for the attribute 'Name'.\\n-\\t * @see org.obeonetwork.dsl.entity.Block#getName()\\n-\\t * @see #getBlock()\\n-\\t * @generated\\n-\\t */\\n-\\tEAttribute getBlock_Name();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Block#getEntities Entities}'.\\n-\\t * \\n-\\t * @return the meta object for the containment reference list 'Entities'.\\n-\\t * @see org.obeonetwork.dsl.entity.Block#getEntities()\\n-\\t * @see #getBlock()\\n-\\t * @generated\\n-\\t */\\n-\\tEReference getBlock_Entities();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Block#getSubblocks Subblocks}'.\\n-\\t * \\n-\\t * @return the meta object for the containment reference list 'Subblocks'.\\n-\\t * @see org.obeonetwork.dsl.entity.Block#getSubblocks()\\n-\\t * @see #getBlock()\\n-\\t * @generated\\n-\\t */\\n-\\tEReference getBlock_Subblocks();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Entity Entity}'.\\n-\\t * \\n-\\t * @return the meta object for class 'Entity'.\\n-\\t * @see org.obeonetwork.dsl.entity.Entity\\n+\\t * The feature id for the 'Type' reference. \\n+\\t * \\n \\t * @generated\\n+\\t * @ordered\\n \\t */\\n-\\tEClass getEntity();\\n+\\tint EXTERNAL_CRITERION__TYPE = CRITERION_FEATURE_COUNT + 1;\\n \\n \\t/**\\n-\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Entity#getOwnedAttributes Owned Attributes}'.\\n+\\t * The number of structural features of the 'External Criterion' class.\\n \\t * \\n-\\t * @return the meta object for the containment reference list 'Owned Attributes'.\\n-\\t * @see org.obeonetwork.dsl.entity.Entity#getOwnedAttributes()\\n-\\t * @see #getEntity()\\n \\t * @generated\\n+\\t * @ordered\\n \\t */\\n-\\tEReference getEntity_OwnedAttributes();\\n+\\tint EXTERNAL_CRITERION_FEATURE_COUNT = CRITERION_FEATURE_COUNT + 2;\\n \\n \\t/**\\n-\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Entity#getOwnedReferences Owned References}'.\\n+\\t * The meta object id for the '{@link org.obeonetwork.dsl.entity.InheritanceKind Inheritance Kind}' enum.\\n \\t * \\n-\\t * @return the meta object for the containment reference list 'Owned References'.\\n-\\t * @see org.obeonetwork.dsl.entity.Entity#getOwnedReferences()\\n-\\t * @see #getEntity()\\n+\\t * @see org.obeonetwork.dsl.entity.InheritanceKind\\n+\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getInheritanceKind()\\n \\t * @generated\\n \\t */\\n-\\tEReference getEntity_OwnedReferences();\\n+\\tint INHERITANCE_KIND = 6;\\n \\n \\t/**\\n-\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Entity#getSupertype Supertype}'.\\n+\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Root Root}'.\\n \\t * \\n-\\t * @return the meta object for the reference 'Supertype'.\\n-\\t * @see org.obeonetwork.dsl.entity.Entity#getSupertype()\\n-\\t * @see #getEntity()\\n+\\t * @return the meta object for class 'Root'.\\n+\\t * @see org.obeonetwork.dsl.entity.Root\\n \\t * @generated\\n \\t */\\n-\\tEReference getEntity_Supertype();\\n+\\tEClass getRoot();\\n \\n \\t/**\\n-\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getAttributes Attributes}'.\\n-\\t * \\n-\\t * @return the meta object for the reference list 'Attributes'.\\n-\\t * @see org.obeonetwork.dsl.entity.Entity#getAttributes()\\n-\\t * @see #getEntity()\\n+\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Root#getName Name}'.\\n+\\t * \\n+\\t * \\n+\\t * @return the meta object for the attribute 'Name'.\\n+\\t * @see org.obeonetwork.dsl.entity.Root#getName()\\n+\\t * @see #getRoot()\\n \\t * @generated\\n \\t */\\n-\\tEReference getEntity_Attributes();\\n+\\tEAttribute getRoot_Name();\\n \\n \\t/**\\n-\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getReferences References}'.\\n-\\t * \\n-\\t * @return the meta object for the reference list 'References'.\\n-\\t * @see org.obeonetwork.dsl.entity.Entity#getReferences()\\n-\\t * @see #getEntity()\\n+\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.entity.Root#getNamespaces Namespaces}'.\\n+\\t * \\n+\\t * \\n+\\t * @return the meta object for the containment reference list 'Namespaces'.\\n+\\t * @see org.obeonetwork.dsl.entity.Root#getNamespaces()\\n+\\t * @see #getRoot()\\n \\t * @generated\\n \\t */\\n-\\tEReference getEntity_References();\\n+\\tEReference getRoot_Namespaces();\\n \\n \\t/**\\n-\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.entity.Entity#getProperties Properties}'.\\n+\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Entity Entity}'.\\n \\t * \\n-\\t * @return the meta object for the reference list 'Properties'.\\n-\\t * @see org.obeonetwork.dsl.entity.Entity#getProperties()\\n-\\t * @see #getEntity()\\n+\\t * @return the meta object for class 'Entity'.\\n+\\t * @see org.obeonetwork.dsl.entity.Entity\\n \\t * @generated\\n \\t */\\n-\\tEReference getEntity_Properties();\\n+\\tEClass getEntity();\\n \\n \\t/**\\n \\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Entity#getEstimatedVolumetry Estimated Volumetry}'.\\n@@ -1516,16 +909,6 @@ public interface EntityPackage extends EPackage {\\n \\t */\\n \\tEReference getEntity_OwnedFinders();\\n \\n-\\t/**\\n-\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Entity#getBlock Block}'.\\n-\\t * \\n-\\t * @return the meta object for the container reference 'Block'.\\n-\\t * @see org.obeonetwork.dsl.entity.Entity#getBlock()\\n-\\t * @see #getEntity()\\n-\\t * @generated\\n-\\t */\\n-\\tEReference getEntity_Block();\\n-\\n \\t/**\\n \\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Entity#getInheritanceKind Inheritance Kind}'.\\n \\t * \\n@@ -1536,133 +919,6 @@ public interface EntityPackage extends EPackage {\\n \\t */\\n \\tEAttribute getEntity_InheritanceKind();\\n \\n-\\t/**\\n-\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Property Property}'.\\n-\\t * \\n-\\t * @return the meta object for class 'Property'.\\n-\\t * @see org.obeonetwork.dsl.entity.Property\\n-\\t * @generated\\n-\\t */\\n-\\tEClass getProperty();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#getName Name}'.\\n-\\t * \\n-\\t * @return the meta object for the attribute 'Name'.\\n-\\t * @see org.obeonetwork.dsl.entity.Property#getName()\\n-\\t * @see #getProperty()\\n-\\t * @generated\\n-\\t */\\n-\\tEAttribute getProperty_Name();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#getMultiplicity Multiplicity}'.\\n-\\t * \\n-\\t * @return the meta object for the attribute 'Multiplicity'.\\n-\\t * @see org.obeonetwork.dsl.entity.Property#getMultiplicity()\\n-\\t * @see #getProperty()\\n-\\t * @generated\\n-\\t */\\n-\\tEAttribute getProperty_Multiplicity();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Property#isIsPrimaryKey Is Primary Key}'.\\n-\\t * \\n-\\t * @return the meta object for the attribute 'Is Primary Key'.\\n-\\t * @see org.obeonetwork.dsl.entity.Property#isIsPrimaryKey()\\n-\\t * @see #getProperty()\\n-\\t * @generated\\n-\\t */\\n-\\tEAttribute getProperty_IsPrimaryKey();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Attribute Attribute}'.\\n-\\t * \\n-\\t * @return the meta object for class 'Attribute'.\\n-\\t * @see org.obeonetwork.dsl.entity.Attribute\\n-\\t * @generated\\n-\\t */\\n-\\tEClass getAttribute();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Attribute#getEntity Entity}'.\\n-\\t * \\n-\\t * @return the meta object for the container reference 'Entity'.\\n-\\t * @see org.obeonetwork.dsl.entity.Attribute#getEntity()\\n-\\t * @see #getAttribute()\\n-\\t * @generated\\n-\\t */\\n-\\tEReference getAttribute_Entity();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Attribute#getType Type}'.\\n-\\t * \\n-\\t * @return the meta object for the reference 'Type'.\\n-\\t * @see org.obeonetwork.dsl.entity.Attribute#getType()\\n-\\t * @see #getAttribute()\\n-\\t * @generated\\n-\\t */\\n-\\tEReference getAttribute_Type();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Reference Reference}'.\\n-\\t * \\n-\\t * @return the meta object for class 'Reference'.\\n-\\t * @see org.obeonetwork.dsl.entity.Reference\\n-\\t * @generated\\n-\\t */\\n-\\tEClass getReference();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.entity.Reference#getEntity Entity}'.\\n-\\t * \\n-\\t * @return the meta object for the container reference 'Entity'.\\n-\\t * @see org.obeonetwork.dsl.entity.Reference#getEntity()\\n-\\t * @see #getReference()\\n-\\t * @generated\\n-\\t */\\n-\\tEReference getReference_Entity();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Reference#isIsComposite Is Composite}'.\\n-\\t * \\n-\\t * @return the meta object for the attribute 'Is Composite'.\\n-\\t * @see org.obeonetwork.dsl.entity.Reference#isIsComposite()\\n-\\t * @see #getReference()\\n-\\t * @generated\\n-\\t */\\n-\\tEAttribute getReference_IsComposite();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Reference#getOppositeOf Opposite Of}'.\\n-\\t * \\n-\\t * @return the meta object for the reference 'Opposite Of'.\\n-\\t * @see org.obeonetwork.dsl.entity.Reference#getOppositeOf()\\n-\\t * @see #getReference()\\n-\\t * @generated\\n-\\t */\\n-\\tEReference getReference_OppositeOf();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.entity.Reference#getType Type}'.\\n-\\t * \\n-\\t * @return the meta object for the reference 'Type'.\\n-\\t * @see org.obeonetwork.dsl.entity.Reference#getType()\\n-\\t * @see #getReference()\\n-\\t * @generated\\n-\\t */\\n-\\tEReference getReference_Type();\\n-\\n-\\t/**\\n-\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.entity.Reference#isNavigable Navigable}'.\\n-\\t * \\n-\\t * @return the meta object for the attribute 'Navigable'.\\n-\\t * @see org.obeonetwork.dsl.entity.Reference#isNavigable()\\n-\\t * @see #getReference()\\n-\\t * @generated\\n-\\t */\\n-\\tEAttribute getReference_Navigable();\\n-\\n \\t/**\\n \\t * Returns the meta object for class '{@link org.obeonetwork.dsl.entity.Finder Finder}'.\\n \\t * \\n@@ -1830,45 +1086,21 @@ interface Literals {\\n \\t\\t */\\n \\t\\tEClass ROOT = eINSTANCE.getRoot();\\n \\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Blocks' containment reference list feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference ROOT__BLOCKS = eINSTANCE.getRoot_Blocks();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.BlockImpl Block}' class.\\n-\\t\\t * \\n-\\t\\t * @see org.obeonetwork.dsl.entity.impl.BlockImpl\\n-\\t\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getBlock()\\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEClass BLOCK = eINSTANCE.getBlock();\\n-\\n \\t\\t/**\\n \\t\\t * The meta object literal for the 'Name' attribute feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEAttribute BLOCK__NAME = eINSTANCE.getBlock_Name();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Entities' containment reference list feature.\\n-\\t\\t * \\n+\\t\\t * \\n+\\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference BLOCK__ENTITIES = eINSTANCE.getBlock_Entities();\\n+\\t\\tEAttribute ROOT__NAME = eINSTANCE.getRoot_Name();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the 'Subblocks' containment reference list feature.\\n-\\t\\t * \\n+\\t\\t * The meta object literal for the 'Namespaces' containment reference list feature.\\n+\\t\\t * \\n+\\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference BLOCK__SUBBLOCKS = eINSTANCE.getBlock_Subblocks();\\n+\\t\\tEReference ROOT__NAMESPACES = eINSTANCE.getRoot_Namespaces();\\n \\n \\t\\t/**\\n \\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.EntityImpl Entity}' class.\\n@@ -1879,50 +1111,6 @@ interface Literals {\\n \\t\\t */\\n \\t\\tEClass ENTITY = eINSTANCE.getEntity();\\n \\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Owned Attributes' containment reference list feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference ENTITY__OWNED_ATTRIBUTES = eINSTANCE.getEntity_OwnedAttributes();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Owned References' containment reference list feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference ENTITY__OWNED_REFERENCES = eINSTANCE.getEntity_OwnedReferences();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Supertype' reference feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference ENTITY__SUPERTYPE = eINSTANCE.getEntity_Supertype();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Attributes' reference list feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference ENTITY__ATTRIBUTES = eINSTANCE.getEntity_Attributes();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'References' reference list feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference ENTITY__REFERENCES = eINSTANCE.getEntity_References();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Properties' reference list feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference ENTITY__PROPERTIES = eINSTANCE.getEntity_Properties();\\n-\\n \\t\\t/**\\n \\t\\t * The meta object literal for the 'Estimated Volumetry' attribute feature.\\n \\t\\t * \\n@@ -1952,120 +1140,13 @@ interface Literals {\\n \\t\\t */\\n \\t\\tEReference ENTITY__OWNED_FINDERS = eINSTANCE.getEntity_OwnedFinders();\\n \\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Block' container reference feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference ENTITY__BLOCK = eINSTANCE.getEntity_Block();\\n-\\n \\t\\t/**\\n \\t\\t * The meta object literal for the 'Inheritance Kind' attribute feature.\\n \\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n \\t\\tEAttribute ENTITY__INHERITANCE_KIND = eINSTANCE.getEntity_InheritanceKind();\\n \\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.PropertyImpl Property}' class.\\n-\\t\\t * \\n-\\t\\t * @see org.obeonetwork.dsl.entity.impl.PropertyImpl\\n-\\t\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getProperty()\\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEClass PROPERTY = eINSTANCE.getProperty();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Name' attribute feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEAttribute PROPERTY__NAME = eINSTANCE.getProperty_Name();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Multiplicity' attribute feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEAttribute PROPERTY__MULTIPLICITY = eINSTANCE.getProperty_Multiplicity();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Is Primary Key' attribute feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEAttribute PROPERTY__IS_PRIMARY_KEY = eINSTANCE.getProperty_IsPrimaryKey();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.AttributeImpl Attribute}' class.\\n-\\t\\t * \\n-\\t\\t * @see org.obeonetwork.dsl.entity.impl.AttributeImpl\\n-\\t\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getAttribute()\\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEClass ATTRIBUTE = eINSTANCE.getAttribute();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Entity' container reference feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference ATTRIBUTE__ENTITY = eINSTANCE.getAttribute_Entity();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Type' reference feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference ATTRIBUTE__TYPE = eINSTANCE.getAttribute_Type();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.ReferenceImpl Reference}' class.\\n-\\t\\t * \\n-\\t\\t * @see org.obeonetwork.dsl.entity.impl.ReferenceImpl\\n-\\t\\t * @see org.obeonetwork.dsl.entity.impl.EntityPackageImpl#getReference()\\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEClass REFERENCE = eINSTANCE.getReference();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Entity' container reference feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference REFERENCE__ENTITY = eINSTANCE.getReference_Entity();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Is Composite' attribute feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEAttribute REFERENCE__IS_COMPOSITE = eINSTANCE.getReference_IsComposite();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Opposite Of' reference feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference REFERENCE__OPPOSITE_OF = eINSTANCE.getReference_OppositeOf();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Type' reference feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEReference REFERENCE__TYPE = eINSTANCE.getReference_Type();\\n-\\n-\\t\\t/**\\n-\\t\\t * The meta object literal for the 'Navigable' attribute feature.\\n-\\t\\t * \\n-\\t\\t * @generated\\n-\\t\\t */\\n-\\t\\tEAttribute REFERENCE__NAVIGABLE = eINSTANCE.getReference_Navigable();\\n-\\n \\t\\t/**\\n \\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.entity.impl.FinderImpl Finder}' class.\\n \\t\\t * \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FEntityPackage.java\",\n \"sha\": \"14c3d4bb8c77170a81ed8f65adda6b569fd79b2f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FInternalCriterion.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FInternalCriterion.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/InternalCriterion.java\",\n \"new_code\": \"import org.obeonetwork.dsl.environment.Attribute;\\n\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -12,6 +12,8 @@\\n */\\n package org.obeonetwork.dsl.entity;\\n \\n+import org.obeonetwork.dsl.environment.Attribute;\\n+\\n /**\\n * A representation of the model object 'Internal Criterion'.\\n * \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FInternalCriterion.java\",\n \"sha\": \"900d7d53d0d169f943e7592ec0265e42f7f99a26\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 37,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FRoot.java\",\n \"changes\": 46,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FRoot.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 9,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/Root.java\",\n \"new_code\": \"import org.obeonetwork.dsl.environment.TypesDefinition;\\n *
  • {@link org.obeonetwork.dsl.entity.Root#getName Name}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.Root#getNamespaces Namespaces}
    • \\npublic interface Root extends TypesDefinition {\\n\\t * Returns the value of the 'Name' attribute.\\n\\t * If the meaning of the 'Name' attribute isn't clear,\\n\\t * there really should be more of a description here...\\n\\t * @return the value of the 'Name' attribute.\\n\\t * @see #setName(String)\\n\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Name()\\n\\t * @model\\n\\t * @generated\\n\\t */\\n\\tString getName();\\n\\n\\t/**\\n\\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Root#getName Name}' attribute.\\n\\t * \\n\\t * \\n\\t * @param value the new value of the 'Name' attribute.\\n\\t * @see #getName()\\n\\t * @generated\\n\\t */\\n\\tvoid setName(String value);\\n\\n\\t/**\\n\\t * Returns the value of the 'Namespaces' containment reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Namespace}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Namespaces' containment reference list isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Namespaces' containment reference list.\\n\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Namespaces()\\n\\tEList getNamespaces();\",\n \"new_methods\": [],\n \"old_code\": \" *
  • {@link org.obeonetwork.dsl.entity.Root#getBlocks Blocks}
    • \\npublic interface Root extends Namespace {\\n\\t * Returns the value of the 'Blocks' containment reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Block}.\\n\\t * If the meaning of the 'Blocks' containment reference list\\n\\t * isn't clear, there really should be more of a description here...\\n\\t * @return the value of the 'Blocks' containment reference list.\\n\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Blocks()\\n\\tEList getBlocks();\",\n \"old_methods\": [],\n \"patch\": \"@@ -14,6 +14,7 @@\\n \\n import org.eclipse.emf.common.util.EList;\\n import org.obeonetwork.dsl.environment.Namespace;\\n+import org.obeonetwork.dsl.environment.TypesDefinition;\\n \\n /**\\n * A representation of the model object 'Root'.\\n@@ -22,15 +23,16 @@\\n *

    \\n * The following features are supported:\\n *

      \\n- *
    • {@link org.obeonetwork.dsl.entity.Root#getBlocks Blocks}
      • \\n+ *
    • {@link org.obeonetwork.dsl.entity.Root#getName Name}
      • \\n+ *
    • {@link org.obeonetwork.dsl.entity.Root#getNamespaces Namespaces}
      • \\n *
    \\n *

    \\n *\\n * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot()\\n * @model\\n * @generated\\n */\\n-public interface Root extends Namespace {\\n+public interface Root extends TypesDefinition {\\n \\t/**\\n \\t * \\n \\t * \\n@@ -39,19 +41,45 @@ public interface Root extends Namespace {\\n \\tString copyright = \\\"Copyright (c) 2008-2009 Obeo.\\\\nAll rights reserved. This program and the accompanying materials\\\\nare made available under the terms of the Eclipse Public License v1.0\\\\nwhich accompanies this distribution, and is available at\\\\nhttp://www.eclipse.org/legal/epl-v10.html\\\\n\\\\nContributors:\\\\n Obeo - initial API and implementation\\\";\\n \\n \\t/**\\n-\\t * Returns the value of the 'Blocks' containment reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Block}.\\n+\\t * Returns the value of the 'Name' attribute.\\n \\t * \\n \\t *

    \\n-\\t * If the meaning of the 'Blocks' containment reference list\\n-\\t * isn't clear, there really should be more of a description here...\\n+\\t * If the meaning of the 'Name' attribute isn't clear,\\n+\\t * there really should be more of a description here...\\n \\t *

    \\n \\t * \\n-\\t * @return the value of the 'Blocks' containment reference list.\\n-\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Blocks()\\n+\\t * @return the value of the 'Name' attribute.\\n+\\t * @see #setName(String)\\n+\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Name()\\n+\\t * @model\\n+\\t * @generated\\n+\\t */\\n+\\tString getName();\\n+\\n+\\t/**\\n+\\t * Sets the value of the '{@link org.obeonetwork.dsl.entity.Root#getName Name}' attribute.\\n+\\t * \\n+\\t * \\n+\\t * @param value the new value of the 'Name' attribute.\\n+\\t * @see #getName()\\n+\\t * @generated\\n+\\t */\\n+\\tvoid setName(String value);\\n+\\n+\\t/**\\n+\\t * Returns the value of the 'Namespaces' containment reference list.\\n+\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Namespace}.\\n+\\t * \\n+\\t *

    \\n+\\t * If the meaning of the 'Namespaces' containment reference list isn't clear,\\n+\\t * there really should be more of a description here...\\n+\\t *

    \\n+\\t * \\n+\\t * @return the value of the 'Namespaces' containment reference list.\\n+\\t * @see org.obeonetwork.dsl.entity.EntityPackage#getRoot_Namespaces()\\n \\t * @model containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n \\t * @generated\\n \\t */\\n-\\tEList getBlocks();\\n+\\tEList getNamespaces();\\n \\n } // Root\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FRoot.java\",\n \"sha\": \"c63c83ff05c50157b57c9bea3628643643870180\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 6,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2FEntityFilter.java\",\n \"changes\": 12,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2FEntityFilter.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 6,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/EntityFilter.java\",\n \"new_code\": \"import org.obeonetwork.dsl.environment.Attribute;\\nimport org.obeonetwork.dsl.environment.Property;\\nimport org.obeonetwork.dsl.environment.Reference;\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\",\n \"new_methods\": [],\n \"old_code\": \"import org.obeonetwork.dsl.entity.Attribute;\\nimport org.obeonetwork.dsl.entity.Property;\\nimport org.obeonetwork.dsl.entity.Reference;\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Property}.\",\n \"old_methods\": [],\n \"patch\": \"@@ -13,11 +13,11 @@\\n package org.obeonetwork.dsl.entity.extensionUtilities;\\n \\n import org.eclipse.emf.common.util.EList;\\n-import org.obeonetwork.dsl.entity.Attribute;\\n import org.obeonetwork.dsl.entity.Entity;\\n-import org.obeonetwork.dsl.entity.Property;\\n-import org.obeonetwork.dsl.entity.Reference;\\n+import org.obeonetwork.dsl.environment.Attribute;\\n import org.obeonetwork.dsl.environment.Filter;\\n+import org.obeonetwork.dsl.environment.Property;\\n+import org.obeonetwork.dsl.environment.Reference;\\n \\n /**\\n * A representation of the model object 'Entity Filter'.\\n@@ -47,7 +47,7 @@ public interface EntityFilter extends Filter {\\n \\n \\t/**\\n \\t * Returns the value of the 'Attribute References' reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Attribute}.\\n+\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\\n \\t * \\n \\t *

    \\n \\t * If the meaning of the 'Attribute References' reference list\\n@@ -63,7 +63,7 @@ public interface EntityFilter extends Filter {\\n \\n \\t/**\\n \\t * Returns the value of the 'Reference References' reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Reference}.\\n+\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\\n \\t * \\n \\t *

    \\n \\t * If the meaning of the 'Reference References' reference list\\n@@ -79,7 +79,7 @@ public interface EntityFilter extends Filter {\\n \\n \\t/**\\n \\t * Returns the value of the 'Owned Property References' reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.entity.Property}.\\n+\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\\n \\t * \\n \\t *

    \\n \\t * If the meaning of the 'Owned Property References' reference\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2FEntityFilter.java\",\n \"sha\": \"c1a8de5ec12c4a7f45120d7daf3af06680d2fe87\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 24,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FEntityFilterImpl.java\",\n \"changes\": 48,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FEntityFilterImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 24,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/impl/EntityFilterImpl.java\",\n \"new_code\": \"import org.obeonetwork.dsl.environment.Attribute;\\nimport org.obeonetwork.dsl.environment.Property;\\nimport org.obeonetwork.dsl.environment.Reference;\\n\\n\\n\\t * \\n\\t * \\n\\tpublic EList getAttributeReferences() {\\n\\t\\tBasicEList result = new UniqueEList() {\\n\\t\\t\\tprivate static final long serialVersionUID = 971586213550724954L;\\n\\n\\t\\tfor (Property property : getOwnedPropertyReferences()) {\\n\\t\\t\\t\\tresult.add((Attribute)property);\\n\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\\n\\t\\t\\t\\tthis, ExtensionUtilitiesPackage.Literals.ENTITY_FILTER__ATTRIBUTE_REFERENCES, result.size(),\\n\\t * \\n\\t * \\n\\tpublic EList getReferenceReferences() {\\n\\t\\tBasicEList result = new UniqueEList() {\\n\\t\\t\\tprivate static final long serialVersionUID = 5391913769894408421L;\\n\\n\\t\\tfor (Property property : getOwnedPropertyReferences()) {\\n\\t\\t\\t\\tresult.add((Reference)property);\\n\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\",\n \"new_methods\": [],\n \"old_code\": \"import java.util.Iterator;\\nimport org.obeonetwork.dsl.entity.Attribute;\\nimport org.obeonetwork.dsl.entity.Property;\\nimport org.obeonetwork.dsl.entity.Reference;\\n\\t * \\n\\t * \\n\\tpublic EList getAttributeReferences() {\\n\\t\\tBasicEList result = new UniqueEList() {\\n\\t\\tCollection properties = getOwnedPropertyReferences();\\n\\t\\tfor (Iterator iter = properties.iterator(); iter.hasNext();) {\\n\\t\\t\\tProperty property = (Property) iter.next();\\n\\t\\t\\t\\tresult.add(property);\\n\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\\n\\t\\t\\t\\tthis, ExtensionUtilitiesPackage.eINSTANCE\\n\\t\\t\\t\\t\\t\\t.getEntityFilter_AttributeReferences(), result.size(),\\n\\t * \\n\\t * \\n\\tpublic EList getReferenceReferences() {\\n\\t\\tBasicEList result = new UniqueEList() {\\n\\t\\tCollection properties = getOwnedPropertyReferences();\\n\\t\\tfor (Iterator iter = properties.iterator(); iter.hasNext();) {\\n\\t\\t\\tProperty property = (Property) iter.next();\\n\\t\\t\\t\\tresult.add(property);\\n\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\",\n \"old_methods\": [],\n \"patch\": \"@@ -13,19 +13,18 @@\\n package org.obeonetwork.dsl.entity.extensionUtilities.impl;\\n \\n import java.util.Collection;\\n-import java.util.Iterator;\\n \\n import org.eclipse.emf.common.util.BasicEList;\\n import org.eclipse.emf.common.util.EList;\\n import org.eclipse.emf.common.util.UniqueEList;\\n import org.eclipse.emf.ecore.EClass;\\n import org.eclipse.emf.ecore.util.EcoreEList;\\n-import org.obeonetwork.dsl.entity.Attribute;\\n import org.obeonetwork.dsl.entity.Entity;\\n-import org.obeonetwork.dsl.entity.Property;\\n-import org.obeonetwork.dsl.entity.Reference;\\n import org.obeonetwork.dsl.entity.extensionUtilities.EntityFilter;\\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\\n+import org.obeonetwork.dsl.environment.Attribute;\\n+import org.obeonetwork.dsl.environment.Property;\\n+import org.obeonetwork.dsl.environment.Reference;\\n import org.obeonetwork.dsl.environment.impl.FilterImpl;\\n \\n /**\\n@@ -68,13 +67,17 @@ protected EClass eStaticClass() {\\n \\t\\treturn ExtensionUtilitiesPackage.Literals.ENTITY_FILTER;\\n \\t}\\n \\n+\\n+\\n \\t/**\\n-\\t * \\n-\\t * \\n+\\t * \\n+\\t * \\n \\t * @generated NOT\\n \\t */\\n-\\tpublic EList getAttributeReferences() {\\n-\\t\\tBasicEList result = new UniqueEList() {\\n+\\tpublic EList getAttributeReferences() {\\n+\\t\\tBasicEList result = new UniqueEList() {\\n+\\t\\t\\tprivate static final long serialVersionUID = 971586213550724954L;\\n+\\n \\t\\t\\tprotected Object[] newData(int capacity) {\\n \\t\\t\\t\\treturn new Attribute[capacity];\\n \\t\\t\\t}\\n@@ -83,28 +86,27 @@ protected boolean useEquals() {\\n \\t\\t\\t\\treturn false;\\n \\t\\t\\t}\\n \\t\\t};\\n-\\t\\tCollection properties = getOwnedPropertyReferences();\\n-\\t\\tfor (Iterator iter = properties.iterator(); iter.hasNext();) {\\n-\\t\\t\\tProperty property = (Property) iter.next();\\n+\\t\\tfor (Property property : getOwnedPropertyReferences()) {\\n \\t\\t\\tif (property instanceof Attribute) {\\n-\\t\\t\\t\\tresult.add(property);\\n+\\t\\t\\t\\tresult.add((Attribute)property);\\n \\t\\t\\t}\\n \\t\\t}\\n \\t\\tresult.shrink();\\n-\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\\n-\\t\\t\\t\\tthis, ExtensionUtilitiesPackage.eINSTANCE\\n-\\t\\t\\t\\t\\t\\t.getEntityFilter_AttributeReferences(), result.size(),\\n+\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\\n+\\t\\t\\t\\tthis, ExtensionUtilitiesPackage.Literals.ENTITY_FILTER__ATTRIBUTE_REFERENCES, result.size(),\\n \\t\\t\\t\\tresult.data());\\n \\t\\treturn unmodifiableResult;\\n \\t}\\n \\n \\t/**\\n-\\t * \\n-\\t * \\n+\\t * \\n+\\t * \\n \\t * @generated NOT\\n \\t */\\n-\\tpublic EList getReferenceReferences() {\\n-\\t\\tBasicEList result = new UniqueEList() {\\n+\\tpublic EList getReferenceReferences() {\\n+\\t\\tBasicEList result = new UniqueEList() {\\n+\\t\\t\\tprivate static final long serialVersionUID = 5391913769894408421L;\\n+\\n \\t\\t\\tprotected Object[] newData(int capacity) {\\n \\t\\t\\t\\treturn new Reference[capacity];\\n \\t\\t\\t}\\n@@ -113,15 +115,13 @@ protected boolean useEquals() {\\n \\t\\t\\t\\treturn false;\\n \\t\\t\\t}\\n \\t\\t};\\n-\\t\\tCollection properties = getOwnedPropertyReferences();\\n-\\t\\tfor (Iterator iter = properties.iterator(); iter.hasNext();) {\\n-\\t\\t\\tProperty property = (Property) iter.next();\\n+\\t\\tfor (Property property : getOwnedPropertyReferences()) {\\n \\t\\t\\tif (property instanceof Reference) {\\n-\\t\\t\\t\\tresult.add(property);\\n+\\t\\t\\t\\tresult.add((Reference)property);\\n \\t\\t\\t}\\n \\t\\t}\\n \\t\\tresult.shrink();\\n-\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\\n+\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\\n \\t\\t\\t\\tthis, ExtensionUtilitiesPackage.eINSTANCE\\n \\t\\t\\t\\t\\t\\t.getEntityFilter_ReferenceReferences(), result.size(),\\n \\t\\t\\t\\tresult.data());\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FEntityFilterImpl.java\",\n \"sha\": \"3175c5e3cd8c17cbd66b3193b033119fceb5f195\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesFactoryImpl.java\",\n \"changes\": 3,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesFactoryImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 1,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/impl/ExtensionUtilitiesFactoryImpl.java\",\n \"new_code\": \"import org.obeonetwork.dsl.entity.extensionUtilities.*;\\n\\t\\t\\tExtensionUtilitiesFactory theExtensionUtilitiesFactory = (ExtensionUtilitiesFactory)EPackage.Registry.INSTANCE.getEFactory(ExtensionUtilitiesPackage.eNS_URI);\",\n \"new_methods\": [],\n \"old_code\": \"\\t\\t\\tExtensionUtilitiesFactory theExtensionUtilitiesFactory = (ExtensionUtilitiesFactory)EPackage.Registry.INSTANCE.getEFactory(\\\"http://www.obeonetwork.org/dsl/entity/2.0.0/utilities\\\"); \",\n \"old_methods\": [],\n \"patch\": \"@@ -17,6 +17,7 @@\\n import org.eclipse.emf.ecore.EPackage;\\n import org.eclipse.emf.ecore.impl.EFactoryImpl;\\n import org.eclipse.emf.ecore.plugin.EcorePlugin;\\n+import org.obeonetwork.dsl.entity.extensionUtilities.*;\\n import org.obeonetwork.dsl.entity.extensionUtilities.EntityFilter;\\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesFactory;\\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\\n@@ -43,7 +44,7 @@ public class ExtensionUtilitiesFactoryImpl extends EFactoryImpl implements\\n \\t */\\n \\tpublic static ExtensionUtilitiesFactory init() {\\n \\t\\ttry {\\n-\\t\\t\\tExtensionUtilitiesFactory theExtensionUtilitiesFactory = (ExtensionUtilitiesFactory)EPackage.Registry.INSTANCE.getEFactory(\\\"http://www.obeonetwork.org/dsl/entity/2.0.0/utilities\\\"); \\n+\\t\\t\\tExtensionUtilitiesFactory theExtensionUtilitiesFactory = (ExtensionUtilitiesFactory)EPackage.Registry.INSTANCE.getEFactory(ExtensionUtilitiesPackage.eNS_URI);\\n \\t\\t\\tif (theExtensionUtilitiesFactory != null) {\\n \\t\\t\\t\\treturn theExtensionUtilitiesFactory;\\n \\t\\t\\t}\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesFactoryImpl.java\",\n \"sha\": \"98c6a05bfb87fa174bb2d96f093d870c452e917f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesPackageImpl.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesPackageImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 3,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/impl/ExtensionUtilitiesPackageImpl.java\",\n \"new_code\": \"\\t\\tinitEReference(getEntityFilter_AttributeReferences(), theEnvironmentPackage.getAttribute(), null, \\\"attributeReferences\\\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getEntityFilter_ReferenceReferences(), theEnvironmentPackage.getReference(), null, \\\"referenceReferences\\\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getEntityFilter_OwnedPropertyReferences(), theEnvironmentPackage.getProperty(), null, \\\"ownedPropertyReferences\\\", null, 0, -1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\",\n \"new_methods\": [],\n \"old_code\": \"\\t\\tinitEReference(getEntityFilter_AttributeReferences(), theEntityPackage.getAttribute(), null, \\\"attributeReferences\\\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getEntityFilter_ReferenceReferences(), theEntityPackage.getReference(), null, \\\"referenceReferences\\\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getEntityFilter_OwnedPropertyReferences(), theEntityPackage.getProperty(), null, \\\"ownedPropertyReferences\\\", null, 0, -1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\",\n \"old_methods\": [],\n \"patch\": \"@@ -217,9 +217,9 @@ public void initializePackageContents() {\\n \\n \\t\\t// Initialize classes and features; add operations and parameters\\n \\t\\tinitEClass(entityFilterEClass, EntityFilter.class, \\\"EntityFilter\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n-\\t\\tinitEReference(getEntityFilter_AttributeReferences(), theEntityPackage.getAttribute(), null, \\\"attributeReferences\\\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getEntityFilter_ReferenceReferences(), theEntityPackage.getReference(), null, \\\"referenceReferences\\\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getEntityFilter_OwnedPropertyReferences(), theEntityPackage.getProperty(), null, \\\"ownedPropertyReferences\\\", null, 0, -1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+\\t\\tinitEReference(getEntityFilter_AttributeReferences(), theEnvironmentPackage.getAttribute(), null, \\\"attributeReferences\\\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n+\\t\\tinitEReference(getEntityFilter_ReferenceReferences(), theEnvironmentPackage.getReference(), null, \\\"referenceReferences\\\", null, 0, -1, EntityFilter.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n+\\t\\tinitEReference(getEntityFilter_OwnedPropertyReferences(), theEnvironmentPackage.getProperty(), null, \\\"ownedPropertyReferences\\\", null, 0, -1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\t\\tinitEReference(getEntityFilter_Entity(), theEntityPackage.getEntity(), null, \\\"entity\\\", null, 1, 1, EntityFilter.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\t}\\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Fimpl%2FExtensionUtilitiesPackageImpl.java\",\n \"sha\": \"e9d6b7d5daecb5c2895ea1b7da848560dd0fc78e\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesAdapterFactory.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/util/ExtensionUtilitiesAdapterFactory.java\",\n \"new_code\": \"import org.obeonetwork.dsl.entity.extensionUtilities.*;\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -16,6 +16,7 @@\\n import org.eclipse.emf.common.notify.Notifier;\\n import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;\\n import org.eclipse.emf.ecore.EObject;\\n+import org.obeonetwork.dsl.entity.extensionUtilities.*;\\n import org.obeonetwork.dsl.entity.extensionUtilities.EntityFilter;\\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\\n import org.obeonetwork.dsl.environment.Filter;\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesAdapterFactory.java\",\n \"sha\": \"ce3d029830d89793d3504cad4bfc4e8ccaa01586\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesSwitch.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesSwitch.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/extensionUtilities/util/ExtensionUtilitiesSwitch.java\",\n \"new_code\": \"import org.obeonetwork.dsl.entity.extensionUtilities.*;\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -16,6 +16,7 @@\\n \\n import org.eclipse.emf.ecore.EClass;\\n import org.eclipse.emf.ecore.EObject;\\n+import org.obeonetwork.dsl.entity.extensionUtilities.*;\\n import org.obeonetwork.dsl.entity.extensionUtilities.EntityFilter;\\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\\n import org.obeonetwork.dsl.environment.Filter;\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2FextensionUtilities%2Futil%2FExtensionUtilitiesSwitch.java\",\n \"sha\": \"7c50391393d39bd6e2ff1e6c29e7056b8057015d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityFactoryImpl.java\",\n \"changes\": 37,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityFactoryImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 35,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityFactoryImpl.java\",\n \"new_code\": \"import org.obeonetwork.dsl.entity.*;\\n\\t\\t\\tEntityFactory theEntityFactory = (EntityFactory)EPackage.Registry.INSTANCE.getEFactory(EntityPackage.eNS_URI);\",\n \"new_methods\": [],\n \"old_code\": \"import org.obeonetwork.dsl.entity.Attribute;\\nimport org.obeonetwork.dsl.entity.Block;\\nimport org.obeonetwork.dsl.entity.Reference;\\nimport org.obeonetwork.dsl.entity.spec.ReferenceSpec;\\n\\t\\t\\tEntityFactory theEntityFactory = (EntityFactory)EPackage.Registry.INSTANCE.getEFactory(\\\"http://www.obeonetwork.org/dsl/entity/2.0.0\\\"); \\n\\t\\t\\tcase EntityPackage.BLOCK: return (EObject)createBlock();\\n\\t\\t\\tcase EntityPackage.ATTRIBUTE: return (EObject)createAttribute();\\n\\t\\t\\tcase EntityPackage.REFERENCE: return (EObject)createReference();\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic Block createBlock() {\\n\\t\\tBlockImpl block = new BlockImpl();\\n\\t\\treturn block;\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic Attribute createAttribute() {\\n\\t\\tAttributeImpl attribute = new AttributeImpl();\\n\\t\\treturn attribute;\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated Not\\n\\t */\\n\\tpublic Reference createReference() {\\n\\t\\tReferenceImpl reference = new ReferenceSpec();\\n\\t\\treturn reference;\\n\\t}\\n\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityFactoryImpl.java\",\n \"implementation\": \"BlockImpl block = new BlockImpl();\\n\\t\\treturn block;\",\n \"signature\": \"Block createBlock()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityFactoryImpl.java\",\n \"implementation\": \"AttributeImpl attribute = new AttributeImpl();\\n\\t\\treturn attribute;\",\n \"signature\": \"Attribute createAttribute()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityFactoryImpl.java\",\n \"implementation\": \"ReferenceImpl reference = new ReferenceSpec();\\n\\t\\treturn reference;\",\n \"signature\": \"Reference createReference()\"\n }\n ],\n \"patch\": \"@@ -18,18 +18,15 @@\\n import org.eclipse.emf.ecore.EPackage;\\n import org.eclipse.emf.ecore.impl.EFactoryImpl;\\n import org.eclipse.emf.ecore.plugin.EcorePlugin;\\n-import org.obeonetwork.dsl.entity.Attribute;\\n-import org.obeonetwork.dsl.entity.Block;\\n+import org.obeonetwork.dsl.entity.*;\\n import org.obeonetwork.dsl.entity.Entity;\\n import org.obeonetwork.dsl.entity.EntityFactory;\\n import org.obeonetwork.dsl.entity.EntityPackage;\\n import org.obeonetwork.dsl.entity.ExternalCriterion;\\n import org.obeonetwork.dsl.entity.Finder;\\n import org.obeonetwork.dsl.entity.InheritanceKind;\\n import org.obeonetwork.dsl.entity.InternalCriterion;\\n-import org.obeonetwork.dsl.entity.Reference;\\n import org.obeonetwork.dsl.entity.Root;\\n-import org.obeonetwork.dsl.entity.spec.ReferenceSpec;\\n \\n /**\\n * An implementation of the model Factory. \\n-\\t * @generated\\n-\\t */\\n-\\tpublic Block createBlock() {\\n-\\t\\tBlockImpl block = new BlockImpl();\\n-\\t\\treturn block;\\n-\\t}\\n-\\n \\t/**\\n \\t * \\n \\t * @generated\\n@@ -148,24 +133,6 @@ public Entity createEntity() {\\n \\t\\treturn entity;\\n \\t}\\n \\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic Attribute createAttribute() {\\n-\\t\\tAttributeImpl attribute = new AttributeImpl();\\n-\\t\\treturn attribute;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated Not\\n-\\t */\\n-\\tpublic Reference createReference() {\\n-\\t\\tReferenceImpl reference = new ReferenceSpec();\\n-\\t\\treturn reference;\\n-\\t}\\n-\\n \\t/**\\n \\t * \\n \\t * @generated\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityFactoryImpl.java\",\n \"sha\": \"abadb34c5276f1a33ec1734109c04af0f9632128\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityImpl.java\",\n \"changes\": 266,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 266,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"import org.eclipse.emf.common.util.BasicEList;\\nimport org.eclipse.emf.common.util.UniqueEList;\\nimport org.eclipse.emf.ecore.util.EcoreEList;\\nimport org.eclipse.emf.ecore.util.EcoreUtil;\\nimport org.obeonetwork.dsl.entity.Attribute;\\nimport org.obeonetwork.dsl.entity.Block;\\nimport org.obeonetwork.dsl.entity.Property;\\nimport org.obeonetwork.dsl.entity.Reference;\\n *

  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedAttributes Owned Attributes}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedReferences Owned References}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getSupertype Supertype}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getAttributes Attributes}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getReferences References}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getProperties Properties}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getBlock Block}
    • \\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\t@SuppressWarnings(\\\"unchecked\\\")\\n\\tpublic EList getOwnedAttributes() {\\n\\t\\treturn (EList)eDynamicGet(EntityPackage.ENTITY__OWNED_ATTRIBUTES, EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES, true, true);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\t@SuppressWarnings(\\\"unchecked\\\")\\n\\tpublic EList getOwnedReferences() {\\n\\t\\treturn (EList)eDynamicGet(EntityPackage.ENTITY__OWNED_REFERENCES, EntityPackage.Literals.ENTITY__OWNED_REFERENCES, true, true);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic Entity getSupertype() {\\n\\t\\treturn (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, true, true);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic Entity basicGetSupertype() {\\n\\t\\treturn (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, false, true);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic void setSupertype(Entity newSupertype) {\\n\\t\\teDynamicSet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, newSupertype);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @generated NOT\\n\\t */\\n\\tpublic EList getAttributes() {\\n\\t\\tBasicEList result = new UniqueEList() {\\n\\t\\t\\tprotected Object[] newData(int capacity) {\\n\\t\\t\\t\\treturn new Attribute[capacity];\\n\\t\\t\\t}\\n\\n\\t\\t\\tprotected boolean useEquals() {\\n\\t\\t\\t\\treturn false;\\n\\t\\t\\t}\\n\\t\\t};\\n\\t\\tresult.addAll(getOwnedAttributes());\\n\\t\\tif (getSupertype() != null)\\n\\t\\t\\tresult.addAll(getSupertype().getAttributes());\\n\\t\\tresult.shrink();\\n\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\\n\\t\\t\\t\\tthis, EntityPackage.eINSTANCE.getEntity_Attributes(), result\\n\\t\\t\\t\\t\\t\\t.size(), result.data());\\n\\t\\treturn unmodifiableResult;\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @generated NOT\\n\\t */\\n\\tpublic EList getReferences() {\\n\\t\\tBasicEList result = new UniqueEList() {\\n\\t\\t\\tprotected Object[] newData(int capacity) {\\n\\t\\t\\t\\treturn new Reference[capacity];\\n\\t\\t\\t}\\n\\n\\t\\t\\tprotected boolean useEquals() {\\n\\t\\t\\t\\treturn false;\\n\\t\\t\\t}\\n\\t\\t};\\n\\t\\tresult.addAll(getOwnedReferences());\\n\\t\\tif (getSupertype() != null)\\n\\t\\t\\tresult.addAll(getSupertype().getReferences());\\n\\t\\tresult.shrink();\\n\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\\n\\t\\t\\t\\tthis, EntityPackage.eINSTANCE.getEntity_References(), result\\n\\t\\t\\t\\t\\t\\t.size(), result.data());\\n\\t\\treturn unmodifiableResult;\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @generated NOT\\n\\t */\\n\\tpublic EList getProperties() {\\n\\t\\tBasicEList result = new UniqueEList() {\\n\\t\\t\\tprotected Object[] newData(int capacity) {\\n\\t\\t\\t\\treturn new Property[capacity];\\n\\t\\t\\t}\\n\\n\\t\\t\\tprotected boolean useEquals() {\\n\\t\\t\\t\\treturn false;\\n\\t\\t\\t}\\n\\t\\t};\\n\\t\\tresult.addAll(getAttributes());\\n\\t\\tresult.addAll(getReferences());\\n\\t\\tresult.shrink();\\n\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\\n\\t\\t\\t\\tthis, EntityPackage.eINSTANCE.getEntity_Attributes(), result\\n\\t\\t\\t\\t\\t\\t.size(), result.data());\\n\\t\\treturn unmodifiableResult;\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic Block getBlock() {\\n\\t\\treturn (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, true, true);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic Block basicGetBlock() {\\n\\t\\treturn (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, false, true);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic NotificationChain basicSetBlock(Block newBlock, NotificationChain msgs) {\\n\\t\\tmsgs = eBasicSetContainer((InternalEObject)newBlock, EntityPackage.ENTITY__BLOCK, msgs);\\n\\t\\treturn msgs;\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic void setBlock(Block newBlock) {\\n\\t\\teDynamicSet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, newBlock);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @generated NOT\\n\\t */\\n\\tpublic boolean isSubtypeOf(Entity entity) {\\n\\t\\t// An entity A is a subtype of an entity B\\n\\t\\t// - A and B are both the same entity\\n\\t\\t// - the supertype of A is B\\n\\t\\t// - the supertype of A is a subtype of B\\n\\t\\treturn (EcoreUtil.equals(this, entity)\\n\\t\\t\\t\\t|| (getSupertype() != null\\n\\t\\t\\t\\t\\t\\t&& (EcoreUtil.equals(getSupertype(), entity) || getSupertype().isSubtypeOf(entity))));\\n\\t}\\n\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n\\t\\t\\t\\treturn ((InternalEList)(InternalEList)getOwnedAttributes()).basicAdd(otherEnd, msgs);\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n\\t\\t\\t\\treturn ((InternalEList)(InternalEList)getOwnedReferences()).basicAdd(otherEnd, msgs);\\n\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n\\t\\t\\t\\tif (eInternalContainer() != null)\\n\\t\\t\\t\\t\\tmsgs = eBasicRemoveFromContainer(msgs);\\n\\t\\t\\t\\treturn basicSetBlock((Block)otherEnd, msgs);\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n\\t\\t\\t\\treturn ((InternalEList)getOwnedAttributes()).basicRemove(otherEnd, msgs);\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n\\t\\t\\t\\treturn ((InternalEList)getOwnedReferences()).basicRemove(otherEnd, msgs);\\n\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n\\t\\t\\t\\treturn basicSetBlock(null, msgs);\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\t@Override\\n\\tpublic NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {\\n\\t\\tswitch (eContainerFeatureID()) {\\n\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n\\t\\t\\t\\treturn eInternalContainer().eInverseRemove(this, EntityPackage.BLOCK__ENTITIES, Block.class, msgs);\\n\\t\\t}\\n\\t\\treturn super.eBasicRemoveFromContainerFeature(msgs);\\n\\t}\\n\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n\\t\\t\\t\\treturn getOwnedAttributes();\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n\\t\\t\\t\\treturn getOwnedReferences();\\n\\t\\t\\tcase EntityPackage.ENTITY__SUPERTYPE:\\n\\t\\t\\t\\tif (resolve) return getSupertype();\\n\\t\\t\\t\\treturn basicGetSupertype();\\n\\t\\t\\tcase EntityPackage.ENTITY__ATTRIBUTES:\\n\\t\\t\\t\\treturn getAttributes();\\n\\t\\t\\tcase EntityPackage.ENTITY__REFERENCES:\\n\\t\\t\\t\\treturn getReferences();\\n\\t\\t\\tcase EntityPackage.ENTITY__PROPERTIES:\\n\\t\\t\\t\\treturn getProperties();\\n\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n\\t\\t\\t\\tif (resolve) return getBlock();\\n\\t\\t\\t\\treturn basicGetBlock();\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n\\t\\t\\t\\tgetOwnedAttributes().clear();\\n\\t\\t\\t\\tgetOwnedAttributes().addAll((Collection)newValue);\\n\\t\\t\\t\\treturn;\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n\\t\\t\\t\\tgetOwnedReferences().clear();\\n\\t\\t\\t\\tgetOwnedReferences().addAll((Collection)newValue);\\n\\t\\t\\t\\treturn;\\n\\t\\t\\tcase EntityPackage.ENTITY__SUPERTYPE:\\n\\t\\t\\t\\tsetSupertype((Entity)newValue);\\n\\t\\t\\t\\treturn;\\n\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n\\t\\t\\t\\tsetBlock((Block)newValue);\\n\\t\\t\\t\\treturn;\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n\\t\\t\\t\\tgetOwnedAttributes().clear();\\n\\t\\t\\t\\treturn;\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n\\t\\t\\t\\tgetOwnedReferences().clear();\\n\\t\\t\\t\\treturn;\\n\\t\\t\\tcase EntityPackage.ENTITY__SUPERTYPE:\\n\\t\\t\\t\\tsetSupertype((Entity)null);\\n\\t\\t\\t\\treturn;\\n\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n\\t\\t\\t\\tsetBlock((Block)null);\\n\\t\\t\\t\\treturn;\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n\\t\\t\\t\\treturn !getOwnedAttributes().isEmpty();\\n\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n\\t\\t\\t\\treturn !getOwnedReferences().isEmpty();\\n\\t\\t\\tcase EntityPackage.ENTITY__SUPERTYPE:\\n\\t\\t\\t\\treturn basicGetSupertype() != null;\\n\\t\\t\\tcase EntityPackage.ENTITY__ATTRIBUTES:\\n\\t\\t\\t\\treturn !getAttributes().isEmpty();\\n\\t\\t\\tcase EntityPackage.ENTITY__REFERENCES:\\n\\t\\t\\t\\treturn !getReferences().isEmpty();\\n\\t\\t\\tcase EntityPackage.ENTITY__PROPERTIES:\\n\\t\\t\\t\\treturn !getProperties().isEmpty();\\n\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n\\t\\t\\t\\treturn basicGetBlock() != null;\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"return (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, true, true);\",\n \"signature\": \"Entity getSupertype()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"return (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, false, true);\",\n \"signature\": \"Entity basicGetSupertype()\"\n },\n {\n \"arguments\": [\n \"Entity newSupertype\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"eDynamicSet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, newSupertype);\",\n \"signature\": \"void setSupertype(Entity newSupertype)\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"BasicEList result = new UniqueEList() {\\n\\t\\t\\tprotected Object[] newData(int capacity) {\\n\\t\\t\\t\\treturn new Attribute[capacity];\",\n \"signature\": \"EList getAttributes()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"return false;\",\n \"signature\": \"boolean useEquals()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"BasicEList result = new UniqueEList() {\\n\\t\\t\\tprotected Object[] newData(int capacity) {\\n\\t\\t\\t\\treturn new Reference[capacity];\",\n \"signature\": \"EList getReferences()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"return false;\",\n \"signature\": \"boolean useEquals()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"BasicEList result = new UniqueEList() {\\n\\t\\t\\tprotected Object[] newData(int capacity) {\\n\\t\\t\\t\\treturn new Property[capacity];\",\n \"signature\": \"EList getProperties()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"return false;\",\n \"signature\": \"boolean useEquals()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"return (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, true, true);\",\n \"signature\": \"Block getBlock()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"return (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, false, true);\",\n \"signature\": \"Block basicGetBlock()\"\n },\n {\n \"arguments\": [\n \"Block newBlock\",\n \" NotificationChain msgs\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"msgs = eBasicSetContainer((InternalEObject)newBlock, EntityPackage.ENTITY__BLOCK, msgs);\\n\\t\\treturn msgs;\",\n \"signature\": \"NotificationChain basicSetBlock(Block newBlock, NotificationChain msgs)\"\n },\n {\n \"arguments\": [\n \"Block newBlock\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"eDynamicSet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, newBlock);\",\n \"signature\": \"void setBlock(Block newBlock)\"\n },\n {\n \"arguments\": [\n \"Entity entity\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"// An entity A is a subtype of an entity B\\n\\t\\t// - A and B are both the same entity\\n\\t\\t// - the supertype of A is B\\n\\t\\t// - the supertype of A is a subtype of B\\n\\t\\treturn (EcoreUtil.equals(this, entity)\\n\\t\\t\\t\\t|| (getSupertype() != null\\n\\t\\t\\t\\t\\t\\t&& (EcoreUtil.equals(getSupertype(), entity) || getSupertype().isSubtypeOf(entity))));\",\n \"signature\": \"boolean isSubtypeOf(Entity entity)\"\n },\n {\n \"arguments\": [\n \"NotificationChain msgs\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityImpl.java\",\n \"implementation\": \"switch (eContainerFeatureID()) {\\n\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n\\t\\t\\t\\treturn eInternalContainer().eInverseRemove(this, EntityPackage.BLOCK__ENTITIES, Block.class, msgs);\",\n \"signature\": \"NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs)\"\n }\n ],\n \"patch\": \"@@ -15,22 +15,14 @@\\n import java.util.Collection;\\n \\n import org.eclipse.emf.common.notify.NotificationChain;\\n-import org.eclipse.emf.common.util.BasicEList;\\n import org.eclipse.emf.common.util.EList;\\n-import org.eclipse.emf.common.util.UniqueEList;\\n import org.eclipse.emf.ecore.EClass;\\n import org.eclipse.emf.ecore.InternalEObject;\\n-import org.eclipse.emf.ecore.util.EcoreEList;\\n-import org.eclipse.emf.ecore.util.EcoreUtil;\\n import org.eclipse.emf.ecore.util.InternalEList;\\n-import org.obeonetwork.dsl.entity.Attribute;\\n-import org.obeonetwork.dsl.entity.Block;\\n import org.obeonetwork.dsl.entity.Entity;\\n import org.obeonetwork.dsl.entity.EntityPackage;\\n import org.obeonetwork.dsl.entity.Finder;\\n import org.obeonetwork.dsl.entity.InheritanceKind;\\n-import org.obeonetwork.dsl.entity.Property;\\n-import org.obeonetwork.dsl.entity.Reference;\\n import org.obeonetwork.dsl.environment.impl.StructuredTypeImpl;\\n \\n /**\\n@@ -39,17 +31,10 @@\\n *

    \\n * The following features are implemented:\\n *

      \\n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedAttributes Owned Attributes}
      • \\n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedReferences Owned References}
      • \\n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getSupertype Supertype}
      • \\n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getAttributes Attributes}
      • \\n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getReferences References}
      • \\n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getProperties Properties}
      • \\n *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getEstimatedVolumetry Estimated Volumetry}
      • \\n *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getEstimatedAccess Estimated Access}
      • \\n *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#isHistorized Historized}
      • \\n *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getOwnedFinders Owned Finders}
      • \\n- *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getBlock Block}
      • \\n *
    • {@link org.obeonetwork.dsl.entity.impl.EntityImpl#getInheritanceKind Inheritance Kind}
      • \\n *
    \\n *

    \\n@@ -118,123 +103,6 @@ protected EClass eStaticClass() {\\n \\t\\treturn EntityPackage.Literals.ENTITY;\\n \\t}\\n \\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\t@SuppressWarnings(\\\"unchecked\\\")\\n-\\tpublic EList getOwnedAttributes() {\\n-\\t\\treturn (EList)eDynamicGet(EntityPackage.ENTITY__OWNED_ATTRIBUTES, EntityPackage.Literals.ENTITY__OWNED_ATTRIBUTES, true, true);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\t@SuppressWarnings(\\\"unchecked\\\")\\n-\\tpublic EList getOwnedReferences() {\\n-\\t\\treturn (EList)eDynamicGet(EntityPackage.ENTITY__OWNED_REFERENCES, EntityPackage.Literals.ENTITY__OWNED_REFERENCES, true, true);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic Entity getSupertype() {\\n-\\t\\treturn (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, true, true);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic Entity basicGetSupertype() {\\n-\\t\\treturn (Entity)eDynamicGet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, false, true);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic void setSupertype(Entity newSupertype) {\\n-\\t\\teDynamicSet(EntityPackage.ENTITY__SUPERTYPE, EntityPackage.Literals.ENTITY__SUPERTYPE, newSupertype);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * \\n-\\t * @generated NOT\\n-\\t */\\n-\\tpublic EList getAttributes() {\\n-\\t\\tBasicEList result = new UniqueEList() {\\n-\\t\\t\\tprotected Object[] newData(int capacity) {\\n-\\t\\t\\t\\treturn new Attribute[capacity];\\n-\\t\\t\\t}\\n-\\n-\\t\\t\\tprotected boolean useEquals() {\\n-\\t\\t\\t\\treturn false;\\n-\\t\\t\\t}\\n-\\t\\t};\\n-\\t\\tresult.addAll(getOwnedAttributes());\\n-\\t\\tif (getSupertype() != null)\\n-\\t\\t\\tresult.addAll(getSupertype().getAttributes());\\n-\\t\\tresult.shrink();\\n-\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\\n-\\t\\t\\t\\tthis, EntityPackage.eINSTANCE.getEntity_Attributes(), result\\n-\\t\\t\\t\\t\\t\\t.size(), result.data());\\n-\\t\\treturn unmodifiableResult;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * \\n-\\t * @generated NOT\\n-\\t */\\n-\\tpublic EList getReferences() {\\n-\\t\\tBasicEList result = new UniqueEList() {\\n-\\t\\t\\tprotected Object[] newData(int capacity) {\\n-\\t\\t\\t\\treturn new Reference[capacity];\\n-\\t\\t\\t}\\n-\\n-\\t\\t\\tprotected boolean useEquals() {\\n-\\t\\t\\t\\treturn false;\\n-\\t\\t\\t}\\n-\\t\\t};\\n-\\t\\tresult.addAll(getOwnedReferences());\\n-\\t\\tif (getSupertype() != null)\\n-\\t\\t\\tresult.addAll(getSupertype().getReferences());\\n-\\t\\tresult.shrink();\\n-\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\\n-\\t\\t\\t\\tthis, EntityPackage.eINSTANCE.getEntity_References(), result\\n-\\t\\t\\t\\t\\t\\t.size(), result.data());\\n-\\t\\treturn unmodifiableResult;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * \\n-\\t * @generated NOT\\n-\\t */\\n-\\tpublic EList getProperties() {\\n-\\t\\tBasicEList result = new UniqueEList() {\\n-\\t\\t\\tprotected Object[] newData(int capacity) {\\n-\\t\\t\\t\\treturn new Property[capacity];\\n-\\t\\t\\t}\\n-\\n-\\t\\t\\tprotected boolean useEquals() {\\n-\\t\\t\\t\\treturn false;\\n-\\t\\t\\t}\\n-\\t\\t};\\n-\\t\\tresult.addAll(getAttributes());\\n-\\t\\tresult.addAll(getReferences());\\n-\\t\\tresult.shrink();\\n-\\t\\tEList unmodifiableResult = new EcoreEList.UnmodifiableEList.FastCompare(\\n-\\t\\t\\t\\tthis, EntityPackage.eINSTANCE.getEntity_Attributes(), result\\n-\\t\\t\\t\\t\\t\\t.size(), result.data());\\n-\\t\\treturn unmodifiableResult;\\n-\\t}\\n-\\n \\t/**\\n \\t * \\n \\t * @generated\\n@@ -292,41 +160,6 @@ public EList getOwnedFinders() {\\n \\t\\treturn (EList)eDynamicGet(EntityPackage.ENTITY__OWNED_FINDERS, EntityPackage.Literals.ENTITY__OWNED_FINDERS, true, true);\\n \\t}\\n \\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic Block getBlock() {\\n-\\t\\treturn (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, true, true);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic Block basicGetBlock() {\\n-\\t\\treturn (Block)eDynamicGet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, false, true);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic NotificationChain basicSetBlock(Block newBlock, NotificationChain msgs) {\\n-\\t\\tmsgs = eBasicSetContainer((InternalEObject)newBlock, EntityPackage.ENTITY__BLOCK, msgs);\\n-\\t\\treturn msgs;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic void setBlock(Block newBlock) {\\n-\\t\\teDynamicSet(EntityPackage.ENTITY__BLOCK, EntityPackage.Literals.ENTITY__BLOCK, newBlock);\\n-\\t}\\n-\\n \\t/**\\n \\t * \\n \\t * @generated\\n@@ -343,21 +176,6 @@ public void setInheritanceKind(InheritanceKind newInheritanceKind) {\\n \\t\\teDynamicSet(EntityPackage.ENTITY__INHERITANCE_KIND, EntityPackage.Literals.ENTITY__INHERITANCE_KIND, newInheritanceKind);\\n \\t}\\n \\n-\\t/**\\n-\\t * \\n-\\t * \\n-\\t * @generated NOT\\n-\\t */\\n-\\tpublic boolean isSubtypeOf(Entity entity) {\\n-\\t\\t// An entity A is a subtype of an entity B\\n-\\t\\t// - A and B are both the same entity\\n-\\t\\t// - the supertype of A is B\\n-\\t\\t// - the supertype of A is a subtype of B\\n-\\t\\treturn (EcoreUtil.equals(this, entity)\\n-\\t\\t\\t\\t|| (getSupertype() != null\\n-\\t\\t\\t\\t\\t\\t&& (EcoreUtil.equals(getSupertype(), entity) || getSupertype().isSubtypeOf(entity))));\\n-\\t}\\n-\\n \\t/**\\n \\t * \\n \\t * \\n@@ -367,16 +185,8 @@ public boolean isSubtypeOf(Entity entity) {\\n \\t@Override\\n \\tpublic NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, NotificationChain msgs) {\\n \\t\\tswitch (featureID) {\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n-\\t\\t\\t\\treturn ((InternalEList)(InternalEList)getOwnedAttributes()).basicAdd(otherEnd, msgs);\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n-\\t\\t\\t\\treturn ((InternalEList)(InternalEList)getOwnedReferences()).basicAdd(otherEnd, msgs);\\n \\t\\t\\tcase EntityPackage.ENTITY__OWNED_FINDERS:\\n \\t\\t\\t\\treturn ((InternalEList)(InternalEList)getOwnedFinders()).basicAdd(otherEnd, msgs);\\n-\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n-\\t\\t\\t\\tif (eInternalContainer() != null)\\n-\\t\\t\\t\\t\\tmsgs = eBasicRemoveFromContainer(msgs);\\n-\\t\\t\\t\\treturn basicSetBlock((Block)otherEnd, msgs);\\n \\t\\t}\\n \\t\\treturn super.eInverseAdd(otherEnd, featureID, msgs);\\n \\t}\\n@@ -389,32 +199,12 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd, int featureID, No\\n \\t@Override\\n \\tpublic NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {\\n \\t\\tswitch (featureID) {\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n-\\t\\t\\t\\treturn ((InternalEList)getOwnedAttributes()).basicRemove(otherEnd, msgs);\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n-\\t\\t\\t\\treturn ((InternalEList)getOwnedReferences()).basicRemove(otherEnd, msgs);\\n \\t\\t\\tcase EntityPackage.ENTITY__OWNED_FINDERS:\\n \\t\\t\\t\\treturn ((InternalEList)getOwnedFinders()).basicRemove(otherEnd, msgs);\\n-\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n-\\t\\t\\t\\treturn basicSetBlock(null, msgs);\\n \\t\\t}\\n \\t\\treturn super.eInverseRemove(otherEnd, featureID, msgs);\\n \\t}\\n \\n-\\t/**\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\t@Override\\n-\\tpublic NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs) {\\n-\\t\\tswitch (eContainerFeatureID()) {\\n-\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n-\\t\\t\\t\\treturn eInternalContainer().eInverseRemove(this, EntityPackage.BLOCK__ENTITIES, Block.class, msgs);\\n-\\t\\t}\\n-\\t\\treturn super.eBasicRemoveFromContainerFeature(msgs);\\n-\\t}\\n-\\n \\t/**\\n \\t * \\n \\t * \\n@@ -423,19 +213,6 @@ public NotificationChain eBasicRemoveFromContainerFeature(NotificationChain msgs\\n \\t@Override\\n \\tpublic Object eGet(int featureID, boolean resolve, boolean coreType) {\\n \\t\\tswitch (featureID) {\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n-\\t\\t\\t\\treturn getOwnedAttributes();\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n-\\t\\t\\t\\treturn getOwnedReferences();\\n-\\t\\t\\tcase EntityPackage.ENTITY__SUPERTYPE:\\n-\\t\\t\\t\\tif (resolve) return getSupertype();\\n-\\t\\t\\t\\treturn basicGetSupertype();\\n-\\t\\t\\tcase EntityPackage.ENTITY__ATTRIBUTES:\\n-\\t\\t\\t\\treturn getAttributes();\\n-\\t\\t\\tcase EntityPackage.ENTITY__REFERENCES:\\n-\\t\\t\\t\\treturn getReferences();\\n-\\t\\t\\tcase EntityPackage.ENTITY__PROPERTIES:\\n-\\t\\t\\t\\treturn getProperties();\\n \\t\\t\\tcase EntityPackage.ENTITY__ESTIMATED_VOLUMETRY:\\n \\t\\t\\t\\treturn getEstimatedVolumetry();\\n \\t\\t\\tcase EntityPackage.ENTITY__ESTIMATED_ACCESS:\\n@@ -444,9 +221,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {\\n \\t\\t\\t\\treturn isHistorized();\\n \\t\\t\\tcase EntityPackage.ENTITY__OWNED_FINDERS:\\n \\t\\t\\t\\treturn getOwnedFinders();\\n-\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n-\\t\\t\\t\\tif (resolve) return getBlock();\\n-\\t\\t\\t\\treturn basicGetBlock();\\n \\t\\t\\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\\n \\t\\t\\t\\treturn getInheritanceKind();\\n \\t\\t}\\n@@ -462,17 +236,6 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {\\n \\t@Override\\n \\tpublic void eSet(int featureID, Object newValue) {\\n \\t\\tswitch (featureID) {\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n-\\t\\t\\t\\tgetOwnedAttributes().clear();\\n-\\t\\t\\t\\tgetOwnedAttributes().addAll((Collection)newValue);\\n-\\t\\t\\t\\treturn;\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n-\\t\\t\\t\\tgetOwnedReferences().clear();\\n-\\t\\t\\t\\tgetOwnedReferences().addAll((Collection)newValue);\\n-\\t\\t\\t\\treturn;\\n-\\t\\t\\tcase EntityPackage.ENTITY__SUPERTYPE:\\n-\\t\\t\\t\\tsetSupertype((Entity)newValue);\\n-\\t\\t\\t\\treturn;\\n \\t\\t\\tcase EntityPackage.ENTITY__ESTIMATED_VOLUMETRY:\\n \\t\\t\\t\\tsetEstimatedVolumetry((Integer)newValue);\\n \\t\\t\\t\\treturn;\\n@@ -486,9 +249,6 @@ public void eSet(int featureID, Object newValue) {\\n \\t\\t\\t\\tgetOwnedFinders().clear();\\n \\t\\t\\t\\tgetOwnedFinders().addAll((Collection)newValue);\\n \\t\\t\\t\\treturn;\\n-\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n-\\t\\t\\t\\tsetBlock((Block)newValue);\\n-\\t\\t\\t\\treturn;\\n \\t\\t\\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\\n \\t\\t\\t\\tsetInheritanceKind((InheritanceKind)newValue);\\n \\t\\t\\t\\treturn;\\n@@ -504,15 +264,6 @@ public void eSet(int featureID, Object newValue) {\\n \\t@Override\\n \\tpublic void eUnset(int featureID) {\\n \\t\\tswitch (featureID) {\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n-\\t\\t\\t\\tgetOwnedAttributes().clear();\\n-\\t\\t\\t\\treturn;\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n-\\t\\t\\t\\tgetOwnedReferences().clear();\\n-\\t\\t\\t\\treturn;\\n-\\t\\t\\tcase EntityPackage.ENTITY__SUPERTYPE:\\n-\\t\\t\\t\\tsetSupertype((Entity)null);\\n-\\t\\t\\t\\treturn;\\n \\t\\t\\tcase EntityPackage.ENTITY__ESTIMATED_VOLUMETRY:\\n \\t\\t\\t\\tsetEstimatedVolumetry(ESTIMATED_VOLUMETRY_EDEFAULT);\\n \\t\\t\\t\\treturn;\\n@@ -525,9 +276,6 @@ public void eUnset(int featureID) {\\n \\t\\t\\tcase EntityPackage.ENTITY__OWNED_FINDERS:\\n \\t\\t\\t\\tgetOwnedFinders().clear();\\n \\t\\t\\t\\treturn;\\n-\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n-\\t\\t\\t\\tsetBlock((Block)null);\\n-\\t\\t\\t\\treturn;\\n \\t\\t\\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\\n \\t\\t\\t\\tsetInheritanceKind(INHERITANCE_KIND_EDEFAULT);\\n \\t\\t\\t\\treturn;\\n@@ -543,18 +291,6 @@ public void eUnset(int featureID) {\\n \\t@Override\\n \\tpublic boolean eIsSet(int featureID) {\\n \\t\\tswitch (featureID) {\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_ATTRIBUTES:\\n-\\t\\t\\t\\treturn !getOwnedAttributes().isEmpty();\\n-\\t\\t\\tcase EntityPackage.ENTITY__OWNED_REFERENCES:\\n-\\t\\t\\t\\treturn !getOwnedReferences().isEmpty();\\n-\\t\\t\\tcase EntityPackage.ENTITY__SUPERTYPE:\\n-\\t\\t\\t\\treturn basicGetSupertype() != null;\\n-\\t\\t\\tcase EntityPackage.ENTITY__ATTRIBUTES:\\n-\\t\\t\\t\\treturn !getAttributes().isEmpty();\\n-\\t\\t\\tcase EntityPackage.ENTITY__REFERENCES:\\n-\\t\\t\\t\\treturn !getReferences().isEmpty();\\n-\\t\\t\\tcase EntityPackage.ENTITY__PROPERTIES:\\n-\\t\\t\\t\\treturn !getProperties().isEmpty();\\n \\t\\t\\tcase EntityPackage.ENTITY__ESTIMATED_VOLUMETRY:\\n \\t\\t\\t\\treturn getEstimatedVolumetry() != ESTIMATED_VOLUMETRY_EDEFAULT;\\n \\t\\t\\tcase EntityPackage.ENTITY__ESTIMATED_ACCESS:\\n@@ -563,8 +299,6 @@ public boolean eIsSet(int featureID) {\\n \\t\\t\\t\\treturn isHistorized() != HISTORIZED_EDEFAULT;\\n \\t\\t\\tcase EntityPackage.ENTITY__OWNED_FINDERS:\\n \\t\\t\\t\\treturn !getOwnedFinders().isEmpty();\\n-\\t\\t\\tcase EntityPackage.ENTITY__BLOCK:\\n-\\t\\t\\t\\treturn basicGetBlock() != null;\\n \\t\\t\\tcase EntityPackage.ENTITY__INHERITANCE_KIND:\\n \\t\\t\\t\\treturn getInheritanceKind() != INHERITANCE_KIND_EDEFAULT;\\n \\t\\t}\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityImpl.java\",\n \"sha\": \"442e18967f0f9cf412423c25bf61fd10bed95b34\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 19,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityPackageImpl.java\",\n \"changes\": 314,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityPackageImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 295,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"new_code\": \"\\t * \\n\\t * \\n\\tpublic EAttribute getRoot_Name() {\\n\\t\\treturn (EAttribute)rootEClass.getEStructuralFeatures().get(0);\\n\\t * \\n\\t * \\n\\tpublic EReference getRoot_Namespaces() {\\n\\t\\treturn (EReference)rootEClass.getEStructuralFeatures().get(1);\\n\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(0);\\n\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(1);\\n\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(2);\\n\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(3);\\n\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(4);\\n\\t\\tcreateEAttribute(rootEClass, ROOT__NAME);\\n\\t\\tcreateEReference(rootEClass, ROOT__NAMESPACES);\\n\\t\\trootEClass.getESuperTypes().add(theEnvironmentPackage.getTypesDefinition());\\n\\t\\tinitEAttribute(getRoot_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getRoot_Namespaces(), theEnvironmentPackage.getNamespace(), null, \\\"namespaces\\\", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getInternalCriterion_Target(), theEnvironmentPackage.getAttribute(), null, \\\"target\\\", null, 1, 1, InternalCriterion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\",\n \"new_methods\": [],\n \"old_code\": \"import org.eclipse.emf.ecore.EOperation;\\nimport org.obeonetwork.dsl.entity.Attribute;\\nimport org.obeonetwork.dsl.entity.Block;\\nimport org.obeonetwork.dsl.entity.Property;\\nimport org.obeonetwork.dsl.entity.Reference;\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprivate EClass blockEClass = null;\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprivate EClass propertyEClass = null;\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprivate EClass attributeEClass = null;\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprivate EClass referenceEClass = null;\\n\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getRoot_Blocks() {\\n\\t\\treturn (EReference)rootEClass.getEStructuralFeatures().get(0);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EClass getBlock() {\\n\\t\\treturn blockEClass;\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EAttribute getBlock_Name() {\\n\\t\\treturn (EAttribute)blockEClass.getEStructuralFeatures().get(0);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\tpublic EReference getBlock_Entities() {\\n\\t\\treturn (EReference)blockEClass.getEStructuralFeatures().get(1);\\n\\t * \\n\\tpublic EReference getBlock_Subblocks() {\\n\\t\\treturn (EReference)blockEClass.getEStructuralFeatures().get(2);\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getEntity_OwnedAttributes() {\\n\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(0);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getEntity_OwnedReferences() {\\n\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(1);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getEntity_Supertype() {\\n\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(2);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getEntity_Attributes() {\\n\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(3);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getEntity_References() {\\n\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(4);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getEntity_Properties() {\\n\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(5);\\n\\t}\\n\\n\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(6);\\n\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(7);\\n\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(8);\\n\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(9);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getEntity_Block() {\\n\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(10);\\n\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(11);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EClass getProperty() {\\n\\t\\treturn propertyEClass;\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EAttribute getProperty_Name() {\\n\\t\\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(0);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EAttribute getProperty_Multiplicity() {\\n\\t\\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(1);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EAttribute getProperty_IsPrimaryKey() {\\n\\t\\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(2);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EClass getAttribute() {\\n\\t\\treturn attributeEClass;\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getAttribute_Entity() {\\n\\t\\treturn (EReference)attributeEClass.getEStructuralFeatures().get(0);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getAttribute_Type() {\\n\\t\\treturn (EReference)attributeEClass.getEStructuralFeatures().get(1);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EClass getReference() {\\n\\t\\treturn referenceEClass;\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getReference_Entity() {\\n\\t\\treturn (EReference)referenceEClass.getEStructuralFeatures().get(0);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EAttribute getReference_IsComposite() {\\n\\t\\treturn (EAttribute)referenceEClass.getEStructuralFeatures().get(1);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getReference_OppositeOf() {\\n\\t\\treturn (EReference)referenceEClass.getEStructuralFeatures().get(2);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getReference_Type() {\\n\\t\\treturn (EReference)referenceEClass.getEStructuralFeatures().get(3);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EAttribute getReference_Navigable() {\\n\\t\\treturn (EAttribute)referenceEClass.getEStructuralFeatures().get(4);\\n\\t\\tcreateEReference(rootEClass, ROOT__BLOCKS);\\n\\n\\t\\tblockEClass = createEClass(BLOCK);\\n\\t\\tcreateEAttribute(blockEClass, BLOCK__NAME);\\n\\t\\tcreateEReference(blockEClass, BLOCK__ENTITIES);\\n\\t\\tcreateEReference(blockEClass, BLOCK__SUBBLOCKS);\\n\\t\\tcreateEReference(entityEClass, ENTITY__OWNED_ATTRIBUTES);\\n\\t\\tcreateEReference(entityEClass, ENTITY__OWNED_REFERENCES);\\n\\t\\tcreateEReference(entityEClass, ENTITY__SUPERTYPE);\\n\\t\\tcreateEReference(entityEClass, ENTITY__ATTRIBUTES);\\n\\t\\tcreateEReference(entityEClass, ENTITY__REFERENCES);\\n\\t\\tcreateEReference(entityEClass, ENTITY__PROPERTIES);\\n\\t\\tcreateEReference(entityEClass, ENTITY__BLOCK);\\n\\t\\tpropertyEClass = createEClass(PROPERTY);\\n\\t\\tcreateEAttribute(propertyEClass, PROPERTY__NAME);\\n\\t\\tcreateEAttribute(propertyEClass, PROPERTY__MULTIPLICITY);\\n\\t\\tcreateEAttribute(propertyEClass, PROPERTY__IS_PRIMARY_KEY);\\n\\n\\t\\tattributeEClass = createEClass(ATTRIBUTE);\\n\\t\\tcreateEReference(attributeEClass, ATTRIBUTE__ENTITY);\\n\\t\\tcreateEReference(attributeEClass, ATTRIBUTE__TYPE);\\n\\n\\t\\treferenceEClass = createEClass(REFERENCE);\\n\\t\\tcreateEReference(referenceEClass, REFERENCE__ENTITY);\\n\\t\\tcreateEAttribute(referenceEClass, REFERENCE__IS_COMPOSITE);\\n\\t\\tcreateEReference(referenceEClass, REFERENCE__OPPOSITE_OF);\\n\\t\\tcreateEReference(referenceEClass, REFERENCE__TYPE);\\n\\t\\tcreateEAttribute(referenceEClass, REFERENCE__NAVIGABLE);\\n\\n\\t\\trootEClass.getESuperTypes().add(theEnvironmentPackage.getNamespace());\\n\\t\\tblockEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\\n\\t\\tpropertyEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\\n\\t\\tpropertyEClass.getESuperTypes().add(theEnvironmentPackage.getBoundableElement());\\n\\t\\tattributeEClass.getESuperTypes().add(this.getProperty());\\n\\t\\treferenceEClass.getESuperTypes().add(this.getProperty());\\n\\t\\tinitEReference(getRoot_Blocks(), this.getBlock(), null, \\\"blocks\\\", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\n\\t\\tinitEClass(blockEClass, Block.class, \\\"Block\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n\\t\\tinitEAttribute(getBlock_Name(), ecorePackage.getEString(), \\\"name\\\", null, 1, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getBlock_Entities(), this.getEntity(), this.getEntity_Block(), \\\"entities\\\", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getBlock_Subblocks(), this.getBlock(), null, \\\"subblocks\\\", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getEntity_OwnedAttributes(), this.getAttribute(), this.getAttribute_Entity(), \\\"ownedAttributes\\\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getEntity_OwnedReferences(), this.getReference(), this.getReference_Entity(), \\\"ownedReferences\\\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getEntity_Supertype(), this.getEntity(), null, \\\"supertype\\\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getEntity_Attributes(), this.getAttribute(), null, \\\"attributes\\\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getEntity_References(), this.getReference(), null, \\\"references\\\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getEntity_Properties(), this.getProperty(), null, \\\"properties\\\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getEntity_Block(), this.getBlock(), this.getBlock_Entities(), \\\"block\\\", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tEOperation op = addEOperation(entityEClass, ecorePackage.getEBoolean(), \\\"isSubtypeOf\\\", 0, 1, IS_UNIQUE, IS_ORDERED);\\n\\t\\taddEParameter(op, this.getEntity(), \\\"entity\\\", 0, 1, IS_UNIQUE, IS_ORDERED);\\n\\n\\t\\tinitEClass(propertyEClass, Property.class, \\\"Property\\\", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n\\t\\tinitEAttribute(getProperty_Name(), ecorePackage.getEString(), \\\"name\\\", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEAttribute(getProperty_Multiplicity(), theEnvironmentPackage.getMultiplicityKind(), \\\"multiplicity\\\", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEAttribute(getProperty_IsPrimaryKey(), ecorePackage.getEBoolean(), \\\"isPrimaryKey\\\", \\\"false\\\", 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\n\\t\\tinitEClass(attributeEClass, Attribute.class, \\\"Attribute\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n\\t\\tinitEReference(getAttribute_Entity(), this.getEntity(), this.getEntity_OwnedAttributes(), \\\"entity\\\", null, 1, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getAttribute_Type(), theEnvironmentPackage.getPrimitiveType(), null, \\\"type\\\", null, 1, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\n\\t\\tinitEClass(referenceEClass, Reference.class, \\\"Reference\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n\\t\\tinitEReference(getReference_Entity(), this.getEntity(), this.getEntity_OwnedReferences(), \\\"entity\\\", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEAttribute(getReference_IsComposite(), ecorePackage.getEBoolean(), \\\"isComposite\\\", \\\"false\\\", 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getReference_OppositeOf(), this.getReference(), null, \\\"oppositeOf\\\", null, 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEReference(getReference_Type(), this.getEntity(), null, \\\"type\\\", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\t\\tinitEAttribute(getReference_Navigable(), ecorePackage.getEBoolean(), \\\"navigable\\\", \\\"true\\\", 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\n\\t\\top = addEOperation(referenceEClass, ecorePackage.getEBoolean(), \\\"canBeOppositeOf\\\", 1, 1, IS_UNIQUE, IS_ORDERED);\\n\\t\\taddEParameter(op, this.getReference(), \\\"opposite\\\", 0, 1, IS_UNIQUE, IS_ORDERED);\\n\\n\\t\\tinitEReference(getInternalCriterion_Target(), this.getAttribute(), null, \\\"target\\\", null, 1, 1, InternalCriterion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)rootEClass.getEStructuralFeatures().get(0);\",\n \"signature\": \"EReference getRoot_Blocks()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return blockEClass;\",\n \"signature\": \"EClass getBlock()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EAttribute)blockEClass.getEStructuralFeatures().get(0);\",\n \"signature\": \"EAttribute getBlock_Name()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)blockEClass.getEStructuralFeatures().get(1);\\n\\t * \\n\\tpublic EReference getBlock_Subblocks() {\\n\\t\\treturn (EReference)blockEClass.getEStructuralFeatures().get(2);\\n\\t/**\\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic EReference getEntity_OwnedAttributes() {\\n\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(0);\",\n \"signature\": \"EReference getBlock_Entities()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)entityEClass.getEStructuralFeatures().get(1);\",\n \"signature\": \"EReference getEntity_OwnedReferences()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)entityEClass.getEStructuralFeatures().get(2);\",\n \"signature\": \"EReference getEntity_Supertype()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)entityEClass.getEStructuralFeatures().get(3);\",\n \"signature\": \"EReference getEntity_Attributes()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)entityEClass.getEStructuralFeatures().get(4);\",\n \"signature\": \"EReference getEntity_References()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)entityEClass.getEStructuralFeatures().get(5);\",\n \"signature\": \"EReference getEntity_Properties()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)entityEClass.getEStructuralFeatures().get(10);\\n\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(11);\",\n \"signature\": \"EReference getEntity_Block()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return propertyEClass;\",\n \"signature\": \"EClass getProperty()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EAttribute)propertyEClass.getEStructuralFeatures().get(0);\",\n \"signature\": \"EAttribute getProperty_Name()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EAttribute)propertyEClass.getEStructuralFeatures().get(1);\",\n \"signature\": \"EAttribute getProperty_Multiplicity()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EAttribute)propertyEClass.getEStructuralFeatures().get(2);\",\n \"signature\": \"EAttribute getProperty_IsPrimaryKey()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return attributeEClass;\",\n \"signature\": \"EClass getAttribute()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)attributeEClass.getEStructuralFeatures().get(0);\",\n \"signature\": \"EReference getAttribute_Entity()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)attributeEClass.getEStructuralFeatures().get(1);\",\n \"signature\": \"EReference getAttribute_Type()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return referenceEClass;\",\n \"signature\": \"EClass getReference()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)referenceEClass.getEStructuralFeatures().get(0);\",\n \"signature\": \"EReference getReference_Entity()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EAttribute)referenceEClass.getEStructuralFeatures().get(1);\",\n \"signature\": \"EAttribute getReference_IsComposite()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)referenceEClass.getEStructuralFeatures().get(2);\",\n \"signature\": \"EReference getReference_OppositeOf()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/EntityPackageImpl.java\",\n \"implementation\": \"return (EReference)referenceEClass.getEStructuralFeatures().get(3);\",\n \"signature\": \"EReference getReference_Type()\"\n }\n ],\n \"patch\": \"@@ -15,12 +15,9 @@\\n import org.eclipse.emf.ecore.EAttribute;\\n import org.eclipse.emf.ecore.EClass;\\n import org.eclipse.emf.ecore.EEnum;\\n-import org.eclipse.emf.ecore.EOperation;\\n import org.eclipse.emf.ecore.EPackage;\\n import org.eclipse.emf.ecore.EReference;\\n import org.eclipse.emf.ecore.impl.EPackageImpl;\\n-import org.obeonetwork.dsl.entity.Attribute;\\n-import org.obeonetwork.dsl.entity.Block;\\n import org.obeonetwork.dsl.entity.Criterion;\\n import org.obeonetwork.dsl.entity.Entity;\\n import org.obeonetwork.dsl.entity.EntityFactory;\\n@@ -29,8 +26,6 @@\\n import org.obeonetwork.dsl.entity.Finder;\\n import org.obeonetwork.dsl.entity.InheritanceKind;\\n import org.obeonetwork.dsl.entity.InternalCriterion;\\n-import org.obeonetwork.dsl.entity.Property;\\n-import org.obeonetwork.dsl.entity.Reference;\\n import org.obeonetwork.dsl.entity.Root;\\n import org.obeonetwork.dsl.entity.extensionUtilities.ExtensionUtilitiesPackage;\\n import org.obeonetwork.dsl.entity.extensionUtilities.impl.ExtensionUtilitiesPackageImpl;\\n@@ -55,36 +50,12 @@ public class EntityPackageImpl extends EPackageImpl implements EntityPackage {\\n \\t */\\n \\tprivate EClass rootEClass = null;\\n \\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprivate EClass blockEClass = null;\\n-\\n \\t/**\\n \\t * \\n \\t * @generated\\n \\t */\\n \\tprivate EClass entityEClass = null;\\n \\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprivate EClass propertyEClass = null;\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprivate EClass attributeEClass = null;\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprivate EClass referenceEClass = null;\\n-\\n \\t/**\\n \\t * \\n \\t * @generated\\n@@ -191,43 +162,21 @@ public EClass getRoot() {\\n \\t}\\n \\n \\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getRoot_Blocks() {\\n-\\t\\treturn (EReference)rootEClass.getEStructuralFeatures().get(0);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EClass getBlock() {\\n-\\t\\treturn blockEClass;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EAttribute getBlock_Name() {\\n-\\t\\treturn (EAttribute)blockEClass.getEStructuralFeatures().get(0);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n+\\t * \\n+\\t * \\n \\t * @generated\\n \\t */\\n-\\tpublic EReference getBlock_Entities() {\\n-\\t\\treturn (EReference)blockEClass.getEStructuralFeatures().get(1);\\n+\\tpublic EAttribute getRoot_Name() {\\n+\\t\\treturn (EAttribute)rootEClass.getEStructuralFeatures().get(0);\\n \\t}\\n \\n \\t/**\\n-\\t * \\n+\\t * \\n+\\t * \\n \\t * @generated\\n \\t */\\n-\\tpublic EReference getBlock_Subblocks() {\\n-\\t\\treturn (EReference)blockEClass.getEStructuralFeatures().get(2);\\n+\\tpublic EReference getRoot_Namespaces() {\\n+\\t\\treturn (EReference)rootEClass.getEStructuralFeatures().get(1);\\n \\t}\\n \\n \\t/**\\n@@ -238,204 +187,44 @@ public EClass getEntity() {\\n \\t\\treturn entityEClass;\\n \\t}\\n \\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getEntity_OwnedAttributes() {\\n-\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(0);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getEntity_OwnedReferences() {\\n-\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(1);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getEntity_Supertype() {\\n-\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(2);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getEntity_Attributes() {\\n-\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(3);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getEntity_References() {\\n-\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(4);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getEntity_Properties() {\\n-\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(5);\\n-\\t}\\n-\\n \\t/**\\n \\t * \\n \\t * @generated\\n \\t */\\n \\tpublic EAttribute getEntity_EstimatedVolumetry() {\\n-\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(6);\\n+\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(0);\\n \\t}\\n \\n \\t/**\\n \\t * \\n \\t * @generated\\n \\t */\\n \\tpublic EAttribute getEntity_EstimatedAccess() {\\n-\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(7);\\n+\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(1);\\n \\t}\\n \\n \\t/**\\n \\t * \\n \\t * @generated\\n \\t */\\n \\tpublic EAttribute getEntity_Historized() {\\n-\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(8);\\n+\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(2);\\n \\t}\\n \\n \\t/**\\n \\t * \\n \\t * @generated\\n \\t */\\n \\tpublic EReference getEntity_OwnedFinders() {\\n-\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(9);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getEntity_Block() {\\n-\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(10);\\n+\\t\\treturn (EReference)entityEClass.getEStructuralFeatures().get(3);\\n \\t}\\n \\n \\t/**\\n \\t * \\n \\t * @generated\\n \\t */\\n \\tpublic EAttribute getEntity_InheritanceKind() {\\n-\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(11);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EClass getProperty() {\\n-\\t\\treturn propertyEClass;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EAttribute getProperty_Name() {\\n-\\t\\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(0);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EAttribute getProperty_Multiplicity() {\\n-\\t\\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(1);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EAttribute getProperty_IsPrimaryKey() {\\n-\\t\\treturn (EAttribute)propertyEClass.getEStructuralFeatures().get(2);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EClass getAttribute() {\\n-\\t\\treturn attributeEClass;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getAttribute_Entity() {\\n-\\t\\treturn (EReference)attributeEClass.getEStructuralFeatures().get(0);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getAttribute_Type() {\\n-\\t\\treturn (EReference)attributeEClass.getEStructuralFeatures().get(1);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EClass getReference() {\\n-\\t\\treturn referenceEClass;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getReference_Entity() {\\n-\\t\\treturn (EReference)referenceEClass.getEStructuralFeatures().get(0);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EAttribute getReference_IsComposite() {\\n-\\t\\treturn (EAttribute)referenceEClass.getEStructuralFeatures().get(1);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getReference_OppositeOf() {\\n-\\t\\treturn (EReference)referenceEClass.getEStructuralFeatures().get(2);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EReference getReference_Type() {\\n-\\t\\treturn (EReference)referenceEClass.getEStructuralFeatures().get(3);\\n-\\t}\\n-\\n-\\t/**\\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tpublic EAttribute getReference_Navigable() {\\n-\\t\\treturn (EAttribute)referenceEClass.getEStructuralFeatures().get(4);\\n+\\t\\treturn (EAttribute)entityEClass.getEStructuralFeatures().get(4);\\n \\t}\\n \\n \\t/**\\n@@ -578,43 +367,16 @@ public void createPackageContents() {\\n \\n \\t\\t// Create classes and their features\\n \\t\\trootEClass = createEClass(ROOT);\\n-\\t\\tcreateEReference(rootEClass, ROOT__BLOCKS);\\n-\\n-\\t\\tblockEClass = createEClass(BLOCK);\\n-\\t\\tcreateEAttribute(blockEClass, BLOCK__NAME);\\n-\\t\\tcreateEReference(blockEClass, BLOCK__ENTITIES);\\n-\\t\\tcreateEReference(blockEClass, BLOCK__SUBBLOCKS);\\n+\\t\\tcreateEAttribute(rootEClass, ROOT__NAME);\\n+\\t\\tcreateEReference(rootEClass, ROOT__NAMESPACES);\\n \\n \\t\\tentityEClass = createEClass(ENTITY);\\n-\\t\\tcreateEReference(entityEClass, ENTITY__OWNED_ATTRIBUTES);\\n-\\t\\tcreateEReference(entityEClass, ENTITY__OWNED_REFERENCES);\\n-\\t\\tcreateEReference(entityEClass, ENTITY__SUPERTYPE);\\n-\\t\\tcreateEReference(entityEClass, ENTITY__ATTRIBUTES);\\n-\\t\\tcreateEReference(entityEClass, ENTITY__REFERENCES);\\n-\\t\\tcreateEReference(entityEClass, ENTITY__PROPERTIES);\\n \\t\\tcreateEAttribute(entityEClass, ENTITY__ESTIMATED_VOLUMETRY);\\n \\t\\tcreateEAttribute(entityEClass, ENTITY__ESTIMATED_ACCESS);\\n \\t\\tcreateEAttribute(entityEClass, ENTITY__HISTORIZED);\\n \\t\\tcreateEReference(entityEClass, ENTITY__OWNED_FINDERS);\\n-\\t\\tcreateEReference(entityEClass, ENTITY__BLOCK);\\n \\t\\tcreateEAttribute(entityEClass, ENTITY__INHERITANCE_KIND);\\n \\n-\\t\\tpropertyEClass = createEClass(PROPERTY);\\n-\\t\\tcreateEAttribute(propertyEClass, PROPERTY__NAME);\\n-\\t\\tcreateEAttribute(propertyEClass, PROPERTY__MULTIPLICITY);\\n-\\t\\tcreateEAttribute(propertyEClass, PROPERTY__IS_PRIMARY_KEY);\\n-\\n-\\t\\tattributeEClass = createEClass(ATTRIBUTE);\\n-\\t\\tcreateEReference(attributeEClass, ATTRIBUTE__ENTITY);\\n-\\t\\tcreateEReference(attributeEClass, ATTRIBUTE__TYPE);\\n-\\n-\\t\\treferenceEClass = createEClass(REFERENCE);\\n-\\t\\tcreateEReference(referenceEClass, REFERENCE__ENTITY);\\n-\\t\\tcreateEAttribute(referenceEClass, REFERENCE__IS_COMPOSITE);\\n-\\t\\tcreateEReference(referenceEClass, REFERENCE__OPPOSITE_OF);\\n-\\t\\tcreateEReference(referenceEClass, REFERENCE__TYPE);\\n-\\t\\tcreateEAttribute(referenceEClass, REFERENCE__NAVIGABLE);\\n-\\n \\t\\tfinderEClass = createEClass(FINDER);\\n \\t\\tcreateEAttribute(finderEClass, FINDER__NAME);\\n \\t\\tcreateEReference(finderEClass, FINDER__ENTITY);\\n@@ -670,63 +432,25 @@ public void initializePackageContents() {\\n \\t\\t// Set bounds for type parameters\\n \\n \\t\\t// Add supertypes to classes\\n-\\t\\trootEClass.getESuperTypes().add(theEnvironmentPackage.getNamespace());\\n-\\t\\tblockEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\\n+\\t\\trootEClass.getESuperTypes().add(theEnvironmentPackage.getTypesDefinition());\\n \\t\\tentityEClass.getESuperTypes().add(theEnvironmentPackage.getStructuredType());\\n-\\t\\tpropertyEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\\n-\\t\\tpropertyEClass.getESuperTypes().add(theEnvironmentPackage.getBoundableElement());\\n-\\t\\tattributeEClass.getESuperTypes().add(this.getProperty());\\n-\\t\\treferenceEClass.getESuperTypes().add(this.getProperty());\\n \\t\\tfinderEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\\n \\t\\tinternalCriterionEClass.getESuperTypes().add(this.getCriterion());\\n \\t\\tcriterionEClass.getESuperTypes().add(theEnvironmentPackage.getObeoDSMObject());\\n \\t\\texternalCriterionEClass.getESuperTypes().add(this.getCriterion());\\n \\n \\t\\t// Initialize classes and features; add operations and parameters\\n \\t\\tinitEClass(rootEClass, Root.class, \\\"Root\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n-\\t\\tinitEReference(getRoot_Blocks(), this.getBlock(), null, \\\"blocks\\\", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\n-\\t\\tinitEClass(blockEClass, Block.class, \\\"Block\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n-\\t\\tinitEAttribute(getBlock_Name(), ecorePackage.getEString(), \\\"name\\\", null, 1, 1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getBlock_Entities(), this.getEntity(), this.getEntity_Block(), \\\"entities\\\", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getBlock_Subblocks(), this.getBlock(), null, \\\"subblocks\\\", null, 0, -1, Block.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+\\t\\tinitEAttribute(getRoot_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+\\t\\tinitEReference(getRoot_Namespaces(), theEnvironmentPackage.getNamespace(), null, \\\"namespaces\\\", null, 0, -1, Root.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\n \\t\\tinitEClass(entityEClass, Entity.class, \\\"Entity\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n-\\t\\tinitEReference(getEntity_OwnedAttributes(), this.getAttribute(), this.getAttribute_Entity(), \\\"ownedAttributes\\\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getEntity_OwnedReferences(), this.getReference(), this.getReference_Entity(), \\\"ownedReferences\\\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getEntity_Supertype(), this.getEntity(), null, \\\"supertype\\\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getEntity_Attributes(), this.getAttribute(), null, \\\"attributes\\\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getEntity_References(), this.getReference(), null, \\\"references\\\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getEntity_Properties(), this.getProperty(), null, \\\"properties\\\", null, 0, -1, Entity.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n \\t\\tinitEAttribute(getEntity_EstimatedVolumetry(), ecorePackage.getEInt(), \\\"estimatedVolumetry\\\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\t\\tinitEAttribute(getEntity_EstimatedAccess(), ecorePackage.getEInt(), \\\"estimatedAccess\\\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\t\\tinitEAttribute(getEntity_Historized(), ecorePackage.getEBoolean(), \\\"historized\\\", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\t\\tinitEReference(getEntity_OwnedFinders(), this.getFinder(), this.getFinder_Entity(), \\\"ownedFinders\\\", null, 0, -1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getEntity_Block(), this.getBlock(), this.getBlock_Entities(), \\\"block\\\", null, 1, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\t\\tinitEAttribute(getEntity_InheritanceKind(), this.getInheritanceKind(), \\\"inheritanceKind\\\", null, 0, 1, Entity.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\n-\\t\\tEOperation op = addEOperation(entityEClass, ecorePackage.getEBoolean(), \\\"isSubtypeOf\\\", 0, 1, IS_UNIQUE, IS_ORDERED);\\n-\\t\\taddEParameter(op, this.getEntity(), \\\"entity\\\", 0, 1, IS_UNIQUE, IS_ORDERED);\\n-\\n-\\t\\tinitEClass(propertyEClass, Property.class, \\\"Property\\\", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n-\\t\\tinitEAttribute(getProperty_Name(), ecorePackage.getEString(), \\\"name\\\", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEAttribute(getProperty_Multiplicity(), theEnvironmentPackage.getMultiplicityKind(), \\\"multiplicity\\\", null, 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEAttribute(getProperty_IsPrimaryKey(), ecorePackage.getEBoolean(), \\\"isPrimaryKey\\\", \\\"false\\\", 1, 1, Property.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\n-\\t\\tinitEClass(attributeEClass, Attribute.class, \\\"Attribute\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n-\\t\\tinitEReference(getAttribute_Entity(), this.getEntity(), this.getEntity_OwnedAttributes(), \\\"entity\\\", null, 1, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getAttribute_Type(), theEnvironmentPackage.getPrimitiveType(), null, \\\"type\\\", null, 1, 1, Attribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\n-\\t\\tinitEClass(referenceEClass, Reference.class, \\\"Reference\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n-\\t\\tinitEReference(getReference_Entity(), this.getEntity(), this.getEntity_OwnedReferences(), \\\"entity\\\", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEAttribute(getReference_IsComposite(), ecorePackage.getEBoolean(), \\\"isComposite\\\", \\\"false\\\", 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getReference_OppositeOf(), this.getReference(), null, \\\"oppositeOf\\\", null, 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEReference(getReference_Type(), this.getEntity(), null, \\\"type\\\", null, 1, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\t\\tinitEAttribute(getReference_Navigable(), ecorePackage.getEBoolean(), \\\"navigable\\\", \\\"true\\\", 0, 1, Reference.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n-\\n-\\t\\top = addEOperation(referenceEClass, ecorePackage.getEBoolean(), \\\"canBeOppositeOf\\\", 1, 1, IS_UNIQUE, IS_ORDERED);\\n-\\t\\taddEParameter(op, this.getReference(), \\\"opposite\\\", 0, 1, IS_UNIQUE, IS_ORDERED);\\n-\\n \\t\\tinitEClass(finderEClass, Finder.class, \\\"Finder\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n \\t\\tinitEAttribute(getFinder_Name(), ecorePackage.getEString(), \\\"name\\\", null, 1, 1, Finder.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n \\t\\tinitEReference(getFinder_Entity(), this.getEntity(), this.getEntity_OwnedFinders(), \\\"entity\\\", null, 1, 1, Finder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n@@ -735,7 +459,7 @@ public void initializePackageContents() {\\n \\t\\tinitEAttribute(getFinder_Multiplicity(), theEnvironmentPackage.getMultiplicityKind(), \\\"multiplicity\\\", null, 1, 1, Finder.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\n \\t\\tinitEClass(internalCriterionEClass, InternalCriterion.class, \\\"InternalCriterion\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n-\\t\\tinitEReference(getInternalCriterion_Target(), this.getAttribute(), null, \\\"target\\\", null, 1, 1, InternalCriterion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+\\t\\tinitEReference(getInternalCriterion_Target(), theEnvironmentPackage.getAttribute(), null, \\\"target\\\", null, 1, 1, InternalCriterion.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\t\\tinitEAttribute(getInternalCriterion_Name(), ecorePackage.getEString(), \\\"name\\\", null, 1, 1, InternalCriterion.class, IS_TRANSIENT, IS_VOLATILE, !IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, IS_DERIVED, IS_ORDERED);\\n \\n \\t\\tinitEClass(criterionEClass, Criterion.class, \\\"Criterion\\\", IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FEntityPackageImpl.java\",\n \"sha\": \"d7e575abcdcee65011558eedb6ba479f73153d6a\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FFinderImpl.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FFinderImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 2,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/FinderImpl.java\",\n \"new_code\": \"\\t\\t\\tEList listCriterions = getCriterions();\\n\\t\\t\\t\\tfor (Iterator iter = listCriterions.iterator(); iter.hasNext();) {\",\n \"new_methods\": [],\n \"old_code\": \"\\t\\t\\tEList listCriterions = getCriterions();\\n\\t\\t\\t\\tfor (Iterator iter = listCriterions.iterator(); iter.hasNext();) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -110,9 +110,9 @@ public String getName() {\\n \\t\\t\\tresult = customizedName;\\n \\t\\t} else {\\n \\t\\t\\tresult = \\\"finder : \\\";\\n-\\t\\t\\tEList listCriterions = getCriterions();\\n+\\t\\t\\tEList listCriterions = getCriterions();\\n \\t\\t\\tif (listCriterions != null) {\\n-\\t\\t\\t\\tfor (Iterator iter = listCriterions.iterator(); iter.hasNext();) {\\n+\\t\\t\\t\\tfor (Iterator iter = listCriterions.iterator(); iter.hasNext();) {\\n \\t\\t\\t\\t\\tCriterion criterion = (Criterion) iter.next();\\n \\t\\t\\t\\t\\tif (criterion instanceof InternalCriterion) {\\n \\t\\t\\t\\t\\t\\tInternalCriterion internalCriterion = (InternalCriterion) criterion;\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FFinderImpl.java\",\n \"sha\": \"bacbbf45ce7bdee39b4667997638164633522610\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 5,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FInternalCriterionImpl.java\",\n \"changes\": 8,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FInternalCriterionImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 3,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/InternalCriterionImpl.java\",\n \"new_code\": \"import org.obeonetwork.dsl.environment.Attribute;\\n\\t * \\n\\t * \\n\\t\\tif (getTarget() != null) {\\n\\t\\t}\",\n \"new_methods\": [],\n \"old_code\": \"import org.obeonetwork.dsl.entity.Attribute;\\n\\t * \\n\\t\\tif (getTarget() != null)\",\n \"old_methods\": [],\n \"patch\": \"@@ -13,9 +13,9 @@\\n package org.obeonetwork.dsl.entity.impl;\\n \\n import org.eclipse.emf.ecore.EClass;\\n-import org.obeonetwork.dsl.entity.Attribute;\\n import org.obeonetwork.dsl.entity.EntityPackage;\\n import org.obeonetwork.dsl.entity.InternalCriterion;\\n+import org.obeonetwork.dsl.environment.Attribute;\\n \\n /**\\n * An implementation of the model object 'Internal Criterion'.\\n@@ -84,7 +84,8 @@ public Attribute basicGetTarget() {\\n \\t}\\n \\n \\t/**\\n-\\t * \\n+\\t * \\n+\\t * \\n \\t * @generated\\n \\t */\\n \\tpublic void setTarget(Attribute newTarget) {\\n@@ -98,8 +99,9 @@ public void setTarget(Attribute newTarget) {\\n \\t */\\n \\tpublic String getName() {\\n \\t\\tString result = \\\"\\\";\\n-\\t\\tif (getTarget() != null)\\n+\\t\\tif (getTarget() != null) {\\n \\t\\t\\tresult = getTarget().getName();\\n+\\t\\t}\\n \\t\\treturn result;\\n \\t}\\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FInternalCriterionImpl.java\",\n \"sha\": \"7bdfcf9563b821b85d0dbda0f59b871ea6353cd8\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 57,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FRootImpl.java\",\n \"changes\": 75,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FRootImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 18,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/RootImpl.java\",\n \"new_code\": \"import org.obeonetwork.dsl.environment.Namespace;\\nimport org.obeonetwork.dsl.environment.impl.TypesDefinitionImpl;\\n *
  • {@link org.obeonetwork.dsl.entity.impl.RootImpl#getName Name}
    • \\n *
  • {@link org.obeonetwork.dsl.entity.impl.RootImpl#getNamespaces Namespaces}
    • \\npublic class RootImpl extends TypesDefinitionImpl implements Root {\\n\\t/**\\n\\t * The default value of the '{@link #getName() Name}' attribute.\\n\\t * \\n\\t * \\n\\t * @see #getName()\\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tprotected static final String NAME_EDEFAULT = null;\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic String getName() {\\n\\t\\treturn (String)eDynamicGet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, true, true);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tpublic void setName(String newName) {\\n\\t\\teDynamicSet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, newName);\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\tpublic EList getNamespaces() {\\n\\t\\treturn (EList)eDynamicGet(EntityPackage.ROOT__NAMESPACES, EntityPackage.Literals.ROOT__NAMESPACES, true, true);\\n\\t\\t\\tcase EntityPackage.ROOT__NAMESPACES:\\n\\t\\t\\t\\treturn ((InternalEList)getNamespaces()).basicRemove(otherEnd, msgs);\\n\\t\\t\\tcase EntityPackage.ROOT__NAME:\\n\\t\\t\\t\\treturn getName();\\n\\t\\t\\tcase EntityPackage.ROOT__NAMESPACES:\\n\\t\\t\\t\\treturn getNamespaces();\\n\\t\\t\\tcase EntityPackage.ROOT__NAME:\\n\\t\\t\\t\\tsetName((String)newValue);\\n\\t\\t\\t\\treturn;\\n\\t\\t\\tcase EntityPackage.ROOT__NAMESPACES:\\n\\t\\t\\t\\tgetNamespaces().clear();\\n\\t\\t\\t\\tgetNamespaces().addAll((Collection)newValue);\\n\\t\\t\\tcase EntityPackage.ROOT__NAME:\\n\\t\\t\\t\\tsetName(NAME_EDEFAULT);\\n\\t\\t\\t\\treturn;\\n\\t\\t\\tcase EntityPackage.ROOT__NAMESPACES:\\n\\t\\t\\t\\tgetNamespaces().clear();\\n\\t\\t\\tcase EntityPackage.ROOT__NAME:\\n\\t\\t\\t\\treturn NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());\\n\\t\\t\\tcase EntityPackage.ROOT__NAMESPACES:\\n\\t\\t\\t\\treturn !getNamespaces().isEmpty();\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/RootImpl.java\",\n \"implementation\": \"return (String)eDynamicGet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, true, true);\",\n \"signature\": \"String getName()\"\n },\n {\n \"arguments\": [\n \"String newName\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/impl/RootImpl.java\",\n \"implementation\": \"eDynamicSet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, newName);\",\n \"signature\": \"void setName(String newName)\"\n }\n ],\n \"old_code\": \"import org.obeonetwork.dsl.entity.Block;\\nimport org.obeonetwork.dsl.environment.impl.NamespaceImpl;\\n *
  • {@link org.obeonetwork.dsl.entity.impl.RootImpl#getBlocks Blocks}
    • \\npublic class RootImpl extends NamespaceImpl implements Root {\\n\\t * \\n\\tpublic EList getBlocks() {\\n\\t\\treturn (EList)eDynamicGet(EntityPackage.ROOT__BLOCKS, EntityPackage.Literals.ROOT__BLOCKS, true, true);\\n\\t\\t\\tcase EntityPackage.ROOT__BLOCKS:\\n\\t\\t\\t\\treturn ((InternalEList)getBlocks()).basicRemove(otherEnd, msgs);\\n\\t\\t\\tcase EntityPackage.ROOT__BLOCKS:\\n\\t\\t\\t\\treturn getBlocks();\\n\\t\\t\\tcase EntityPackage.ROOT__BLOCKS:\\n\\t\\t\\t\\tgetBlocks().clear();\\n\\t\\t\\t\\tgetBlocks().addAll((Collection)newValue);\\n\\t\\t\\tcase EntityPackage.ROOT__BLOCKS:\\n\\t\\t\\t\\tgetBlocks().clear();\\n\\t\\t\\tcase EntityPackage.ROOT__BLOCKS:\\n\\t\\t\\t\\treturn !getBlocks().isEmpty();\",\n \"old_methods\": [],\n \"patch\": \"@@ -19,30 +19,40 @@\\n import org.eclipse.emf.ecore.EClass;\\n import org.eclipse.emf.ecore.InternalEObject;\\n import org.eclipse.emf.ecore.util.InternalEList;\\n-import org.obeonetwork.dsl.entity.Block;\\n import org.obeonetwork.dsl.entity.EntityPackage;\\n import org.obeonetwork.dsl.entity.Root;\\n-import org.obeonetwork.dsl.environment.impl.NamespaceImpl;\\n+import org.obeonetwork.dsl.environment.Namespace;\\n+import org.obeonetwork.dsl.environment.impl.TypesDefinitionImpl;\\n \\n /**\\n * An implementation of the model object 'Root'.\\n * \\n *

    \\n * The following features are implemented:\\n *

      \\n- *
    • {@link org.obeonetwork.dsl.entity.impl.RootImpl#getBlocks Blocks}
      • \\n+ *
    • {@link org.obeonetwork.dsl.entity.impl.RootImpl#getName Name}
      • \\n+ *
    • {@link org.obeonetwork.dsl.entity.impl.RootImpl#getNamespaces Namespaces}
      • \\n *
    \\n *

    \\n *\\n * @generated\\n */\\n-public class RootImpl extends NamespaceImpl implements Root {\\n+public class RootImpl extends TypesDefinitionImpl implements Root {\\n \\t/**\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t */\\n \\tpublic static final String copyright = \\\"Copyright (c) 2008-2009 Obeo.\\\\nAll rights reserved. This program and the accompanying materials\\\\nare made available under the terms of the Eclipse Public License v1.0\\\\nwhich accompanies this distribution, and is available at\\\\nhttp://www.eclipse.org/legal/epl-v10.html\\\\n\\\\nContributors:\\\\n Obeo - initial API and implementation\\\";\\n+\\t/**\\n+\\t * The default value of the '{@link #getName() Name}' attribute.\\n+\\t * \\n+\\t * \\n+\\t * @see #getName()\\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tprotected static final String NAME_EDEFAULT = null;\\n \\t/**\\n \\t * \\n \\t * @generated\\n@@ -61,12 +71,31 @@ protected EClass eStaticClass() {\\n \\t}\\n \\n \\t/**\\n-\\t * \\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\tpublic String getName() {\\n+\\t\\treturn (String)eDynamicGet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, true, true);\\n+\\t}\\n+\\n+\\t/**\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\tpublic void setName(String newName) {\\n+\\t\\teDynamicSet(EntityPackage.ROOT__NAME, EntityPackage.Literals.ROOT__NAME, newName);\\n+\\t}\\n+\\n+\\t/**\\n+\\t * \\n+\\t * \\n \\t * @generated\\n \\t */\\n \\t@SuppressWarnings(\\\"unchecked\\\")\\n-\\tpublic EList getBlocks() {\\n-\\t\\treturn (EList)eDynamicGet(EntityPackage.ROOT__BLOCKS, EntityPackage.Literals.ROOT__BLOCKS, true, true);\\n+\\tpublic EList getNamespaces() {\\n+\\t\\treturn (EList)eDynamicGet(EntityPackage.ROOT__NAMESPACES, EntityPackage.Literals.ROOT__NAMESPACES, true, true);\\n \\t}\\n \\n \\t/**\\n@@ -77,8 +106,8 @@ public EList getBlocks() {\\n \\t@Override\\n \\tpublic NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {\\n \\t\\tswitch (featureID) {\\n-\\t\\t\\tcase EntityPackage.ROOT__BLOCKS:\\n-\\t\\t\\t\\treturn ((InternalEList)getBlocks()).basicRemove(otherEnd, msgs);\\n+\\t\\t\\tcase EntityPackage.ROOT__NAMESPACES:\\n+\\t\\t\\t\\treturn ((InternalEList)getNamespaces()).basicRemove(otherEnd, msgs);\\n \\t\\t}\\n \\t\\treturn super.eInverseRemove(otherEnd, featureID, msgs);\\n \\t}\\n@@ -91,8 +120,10 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,\\n \\t@Override\\n \\tpublic Object eGet(int featureID, boolean resolve, boolean coreType) {\\n \\t\\tswitch (featureID) {\\n-\\t\\t\\tcase EntityPackage.ROOT__BLOCKS:\\n-\\t\\t\\t\\treturn getBlocks();\\n+\\t\\t\\tcase EntityPackage.ROOT__NAME:\\n+\\t\\t\\t\\treturn getName();\\n+\\t\\t\\tcase EntityPackage.ROOT__NAMESPACES:\\n+\\t\\t\\t\\treturn getNamespaces();\\n \\t\\t}\\n \\t\\treturn super.eGet(featureID, resolve, coreType);\\n \\t}\\n@@ -106,9 +137,12 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {\\n \\t@Override\\n \\tpublic void eSet(int featureID, Object newValue) {\\n \\t\\tswitch (featureID) {\\n-\\t\\t\\tcase EntityPackage.ROOT__BLOCKS:\\n-\\t\\t\\t\\tgetBlocks().clear();\\n-\\t\\t\\t\\tgetBlocks().addAll((Collection)newValue);\\n+\\t\\t\\tcase EntityPackage.ROOT__NAME:\\n+\\t\\t\\t\\tsetName((String)newValue);\\n+\\t\\t\\t\\treturn;\\n+\\t\\t\\tcase EntityPackage.ROOT__NAMESPACES:\\n+\\t\\t\\t\\tgetNamespaces().clear();\\n+\\t\\t\\t\\tgetNamespaces().addAll((Collection)newValue);\\n \\t\\t\\t\\treturn;\\n \\t\\t}\\n \\t\\tsuper.eSet(featureID, newValue);\\n@@ -122,8 +156,11 @@ public void eSet(int featureID, Object newValue) {\\n \\t@Override\\n \\tpublic void eUnset(int featureID) {\\n \\t\\tswitch (featureID) {\\n-\\t\\t\\tcase EntityPackage.ROOT__BLOCKS:\\n-\\t\\t\\t\\tgetBlocks().clear();\\n+\\t\\t\\tcase EntityPackage.ROOT__NAME:\\n+\\t\\t\\t\\tsetName(NAME_EDEFAULT);\\n+\\t\\t\\t\\treturn;\\n+\\t\\t\\tcase EntityPackage.ROOT__NAMESPACES:\\n+\\t\\t\\t\\tgetNamespaces().clear();\\n \\t\\t\\t\\treturn;\\n \\t\\t}\\n \\t\\tsuper.eUnset(featureID);\\n@@ -137,8 +174,10 @@ public void eUnset(int featureID) {\\n \\t@Override\\n \\tpublic boolean eIsSet(int featureID) {\\n \\t\\tswitch (featureID) {\\n-\\t\\t\\tcase EntityPackage.ROOT__BLOCKS:\\n-\\t\\t\\t\\treturn !getBlocks().isEmpty();\\n+\\t\\t\\tcase EntityPackage.ROOT__NAME:\\n+\\t\\t\\t\\treturn NAME_EDEFAULT == null ? getName() != null : !NAME_EDEFAULT.equals(getName());\\n+\\t\\t\\tcase EntityPackage.ROOT__NAMESPACES:\\n+\\t\\t\\t\\treturn !getNamespaces().isEmpty();\\n \\t\\t}\\n \\t\\treturn super.eIsSet(featureID);\\n \\t}\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Fimpl%2FRootImpl.java\",\n \"sha\": \"cbb596c6dd5bc0876d83505b8be3f7f9db4a3b85\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 7,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntityAdapterFactory.java\",\n \"changes\": 85,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntityAdapterFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 78,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java\",\n \"new_code\": \"import org.obeonetwork.dsl.entity.*;\\nimport org.obeonetwork.dsl.environment.TypesDefinition;\\n\\t\\t\\tpublic Adapter caseTypesDefinition(TypesDefinition object) {\\n\\t\\t\\t\\treturn createTypesDefinitionAdapter();\\n\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.TypesDefinition Types Definition}'.\\n\\t * @see org.obeonetwork.dsl.environment.TypesDefinition\\n\\tpublic Adapter createTypesDefinitionAdapter() {\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"TypesDefinition object\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java\",\n \"implementation\": \"return createTypesDefinitionAdapter();\\n\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.TypesDefinition Types Definition\",\n \"signature\": \"Adapter caseTypesDefinition(TypesDefinition object)\"\n }\n ],\n \"old_code\": \"import org.obeonetwork.dsl.entity.Attribute;\\nimport org.obeonetwork.dsl.entity.Block;\\nimport org.obeonetwork.dsl.entity.Property;\\nimport org.obeonetwork.dsl.entity.Reference;\\nimport org.obeonetwork.dsl.environment.Namespace;\\n\\t\\t\\tpublic Adapter caseBlock(Block object) {\\n\\t\\t\\t\\treturn createBlockAdapter();\\n\\t\\t\\t}\\n\\t\\t\\t@Override\\n\\t\\t\\tpublic Adapter caseProperty(Property object) {\\n\\t\\t\\t\\treturn createPropertyAdapter();\\n\\t\\t\\t}\\n\\t\\t\\t@Override\\n\\t\\t\\tpublic Adapter caseAttribute(Attribute object) {\\n\\t\\t\\t\\treturn createAttributeAdapter();\\n\\t\\t\\t}\\n\\t\\t\\t@Override\\n\\t\\t\\tpublic Adapter caseReference(Reference object) {\\n\\t\\t\\t\\treturn createReferenceAdapter();\\n\\t\\t\\t}\\n\\t\\t\\t@Override\\n\\t\\t\\tpublic Adapter caseNamespace(Namespace object) {\\n\\t\\t\\t\\treturn createNamespaceAdapter();\\n\\t/**\\n\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Block Block}'.\\n\\t * This default implementation returns null so that\\n\\t * we can easily ignore cases; it's useful to ignore a case when inheritance\\n\\t * will catch all the cases anyway. \\n\\t * @return the new adapter.\\n\\t * @see org.obeonetwork.dsl.entity.Block\\n\\t * @generated\\n\\t */\\n\\tpublic Adapter createBlockAdapter() {\\n\\t\\treturn null;\\n\\t}\\n\\n\\t/**\\n\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Property Property}'.\\n\\t * This default implementation returns null so that\\n\\t * we can easily ignore cases; it's useful to ignore a case when inheritance\\n\\t * will catch all the cases anyway. \\n\\t * @return the new adapter.\\n\\t * @see org.obeonetwork.dsl.entity.Property\\n\\t * @generated\\n\\t */\\n\\tpublic Adapter createPropertyAdapter() {\\n\\t\\treturn null;\\n\\t}\\n\\n\\t/**\\n\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Attribute Attribute}'.\\n\\t * This default implementation returns null so that\\n\\t * we can easily ignore cases; it's useful to ignore a case when inheritance\\n\\t * will catch all the cases anyway. \\n\\t * @return the new adapter.\\n\\t * @see org.obeonetwork.dsl.entity.Attribute\\n\\t * @generated\\n\\t */\\n\\tpublic Adapter createAttributeAdapter() {\\n\\t\\treturn null;\\n\\t}\\n\\n\\t/**\\n\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Reference Reference}'.\\n\\t * This default implementation returns null so that\\n\\t * we can easily ignore cases; it's useful to ignore a case when inheritance\\n\\t * will catch all the cases anyway. \\n\\t * @return the new adapter.\\n\\t * @see org.obeonetwork.dsl.entity.Reference\\n\\t * @generated\\n\\t */\\n\\tpublic Adapter createReferenceAdapter() {\\n\\t\\treturn null;\\n\\t}\\n\\n\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.Namespace Namespace}'.\\n\\t * @see org.obeonetwork.dsl.environment.Namespace\\n\\tpublic Adapter createNamespaceAdapter() {\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"Block object\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java\",\n \"implementation\": \"return createBlockAdapter();\",\n \"signature\": \"Adapter caseBlock(Block object)\"\n },\n {\n \"arguments\": [\n \"Property object\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java\",\n \"implementation\": \"return createPropertyAdapter();\",\n \"signature\": \"Adapter caseProperty(Property object)\"\n },\n {\n \"arguments\": [\n \"Attribute object\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java\",\n \"implementation\": \"return createAttributeAdapter();\",\n \"signature\": \"Adapter caseAttribute(Attribute object)\"\n },\n {\n \"arguments\": [\n \"Reference object\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java\",\n \"implementation\": \"return createReferenceAdapter();\",\n \"signature\": \"Adapter caseReference(Reference object)\"\n },\n {\n \"arguments\": [\n \"Namespace object\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java\",\n \"implementation\": \"return createNamespaceAdapter();\\n\\t/**\\n\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Block Block\",\n \"signature\": \"Adapter caseNamespace(Namespace object)\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"Adapter createBlockAdapter()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"Adapter createPropertyAdapter()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"Adapter createAttributeAdapter()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntityAdapterFactory.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"Adapter createReferenceAdapter()\"\n }\n ],\n \"patch\": \"@@ -16,22 +16,19 @@\\n import org.eclipse.emf.common.notify.Notifier;\\n import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;\\n import org.eclipse.emf.ecore.EObject;\\n-import org.obeonetwork.dsl.entity.Attribute;\\n-import org.obeonetwork.dsl.entity.Block;\\n+import org.obeonetwork.dsl.entity.*;\\n import org.obeonetwork.dsl.entity.Criterion;\\n import org.obeonetwork.dsl.entity.Entity;\\n import org.obeonetwork.dsl.entity.EntityPackage;\\n import org.obeonetwork.dsl.entity.ExternalCriterion;\\n import org.obeonetwork.dsl.entity.Finder;\\n import org.obeonetwork.dsl.entity.InternalCriterion;\\n-import org.obeonetwork.dsl.entity.Property;\\n-import org.obeonetwork.dsl.entity.Reference;\\n import org.obeonetwork.dsl.entity.Root;\\n import org.obeonetwork.dsl.environment.BoundableElement;\\n-import org.obeonetwork.dsl.environment.Namespace;\\n import org.obeonetwork.dsl.environment.ObeoDSMObject;\\n import org.obeonetwork.dsl.environment.StructuredType;\\n import org.obeonetwork.dsl.environment.Type;\\n+import org.obeonetwork.dsl.environment.TypesDefinition;\\n \\n /**\\n * The Adapter Factory for the model. It\\n@@ -98,26 +95,10 @@ public Adapter caseRoot(Root object) {\\n \\t\\t\\t\\treturn createRootAdapter();\\n \\t\\t\\t}\\n \\t\\t\\t@Override\\n-\\t\\t\\tpublic Adapter caseBlock(Block object) {\\n-\\t\\t\\t\\treturn createBlockAdapter();\\n-\\t\\t\\t}\\n-\\t\\t\\t@Override\\n \\t\\t\\tpublic Adapter caseEntity(Entity object) {\\n \\t\\t\\t\\treturn createEntityAdapter();\\n \\t\\t\\t}\\n \\t\\t\\t@Override\\n-\\t\\t\\tpublic Adapter caseProperty(Property object) {\\n-\\t\\t\\t\\treturn createPropertyAdapter();\\n-\\t\\t\\t}\\n-\\t\\t\\t@Override\\n-\\t\\t\\tpublic Adapter caseAttribute(Attribute object) {\\n-\\t\\t\\t\\treturn createAttributeAdapter();\\n-\\t\\t\\t}\\n-\\t\\t\\t@Override\\n-\\t\\t\\tpublic Adapter caseReference(Reference object) {\\n-\\t\\t\\t\\treturn createReferenceAdapter();\\n-\\t\\t\\t}\\n-\\t\\t\\t@Override\\n \\t\\t\\tpublic Adapter caseFinder(Finder object) {\\n \\t\\t\\t\\treturn createFinderAdapter();\\n \\t\\t\\t}\\n@@ -138,8 +119,8 @@ public Adapter caseObeoDSMObject(ObeoDSMObject object) {\\n \\t\\t\\t\\treturn createObeoDSMObjectAdapter();\\n \\t\\t\\t}\\n \\t\\t\\t@Override\\n-\\t\\t\\tpublic Adapter caseNamespace(Namespace object) {\\n-\\t\\t\\t\\treturn createNamespaceAdapter();\\n+\\t\\t\\tpublic Adapter caseTypesDefinition(TypesDefinition object) {\\n+\\t\\t\\t\\treturn createTypesDefinitionAdapter();\\n \\t\\t\\t}\\n \\t\\t\\t@Override\\n \\t\\t\\tpublic Adapter caseBoundableElement(BoundableElement object) {\\n@@ -186,19 +167,6 @@ public Adapter createRootAdapter() {\\n \\t\\treturn null;\\n \\t}\\n \\n-\\t/**\\n-\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Block Block}'.\\n-\\t * This default implementation returns null so that\\n-\\t * we can easily ignore cases; it's useful to ignore a case when inheritance\\n-\\t * will catch all the cases anyway. \\n-\\t * @return the new adapter.\\n-\\t * @see org.obeonetwork.dsl.entity.Block\\n-\\t * @generated\\n-\\t */\\n-\\tpublic Adapter createBlockAdapter() {\\n-\\t\\treturn null;\\n-\\t}\\n-\\n \\t/**\\n \\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Entity Entity}'.\\n \\t * This default implementation returns null so that\\n@@ -212,45 +180,6 @@ public Adapter createEntityAdapter() {\\n \\t\\treturn null;\\n \\t}\\n \\n-\\t/**\\n-\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Property Property}'.\\n-\\t * This default implementation returns null so that\\n-\\t * we can easily ignore cases; it's useful to ignore a case when inheritance\\n-\\t * will catch all the cases anyway. \\n-\\t * @return the new adapter.\\n-\\t * @see org.obeonetwork.dsl.entity.Property\\n-\\t * @generated\\n-\\t */\\n-\\tpublic Adapter createPropertyAdapter() {\\n-\\t\\treturn null;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Attribute Attribute}'.\\n-\\t * This default implementation returns null so that\\n-\\t * we can easily ignore cases; it's useful to ignore a case when inheritance\\n-\\t * will catch all the cases anyway. \\n-\\t * @return the new adapter.\\n-\\t * @see org.obeonetwork.dsl.entity.Attribute\\n-\\t * @generated\\n-\\t */\\n-\\tpublic Adapter createAttributeAdapter() {\\n-\\t\\treturn null;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Reference Reference}'.\\n-\\t * This default implementation returns null so that\\n-\\t * we can easily ignore cases; it's useful to ignore a case when inheritance\\n-\\t * will catch all the cases anyway. \\n-\\t * @return the new adapter.\\n-\\t * @see org.obeonetwork.dsl.entity.Reference\\n-\\t * @generated\\n-\\t */\\n-\\tpublic Adapter createReferenceAdapter() {\\n-\\t\\treturn null;\\n-\\t}\\n-\\n \\t/**\\n \\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.entity.Finder Finder}'.\\n \\t * This default implementation returns null so that\\n@@ -317,16 +246,16 @@ public Adapter createObeoDSMObjectAdapter() {\\n \\t}\\n \\n \\t/**\\n-\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.Namespace Namespace}'.\\n+\\t * Creates a new adapter for an object of class '{@link org.obeonetwork.dsl.environment.TypesDefinition Types Definition}'.\\n \\t * \\n \\t * This default implementation returns null so that we can easily ignore cases;\\n \\t * it's useful to ignore a case when inheritance will catch all the cases anyway.\\n \\t * \\n \\t * @return the new adapter.\\n-\\t * @see org.obeonetwork.dsl.environment.Namespace\\n+\\t * @see org.obeonetwork.dsl.environment.TypesDefinition\\n \\t * @generated\\n \\t */\\n-\\tpublic Adapter createNamespaceAdapter() {\\n+\\tpublic Adapter createTypesDefinitionAdapter() {\\n \\t\\treturn null;\\n \\t}\\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntityAdapterFactory.java\",\n \"sha\": \"ac05074845bf6ca61ece6632e41fed8c61dc46f0\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 6,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntitySwitch.java\",\n \"changes\": 100,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntitySwitch.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 94,\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java\",\n \"new_code\": \"import org.obeonetwork.dsl.entity.*;\\nimport org.obeonetwork.dsl.environment.TypesDefinition;\\n\\t\\t\\t\\tif (result == null) result = caseTypesDefinition(root);\\n\\t * Returns the result of interpreting the object as an instance of 'Types Definition'.\\n\\t * @return the result of interpreting the object as an instance of 'Types Definition'.\\n\\tpublic T caseTypesDefinition(TypesDefinition object) {\",\n \"new_methods\": [],\n \"old_code\": \"import org.obeonetwork.dsl.entity.Attribute;\\nimport org.obeonetwork.dsl.entity.Block;\\nimport org.obeonetwork.dsl.entity.Property;\\nimport org.obeonetwork.dsl.entity.Reference;\\nimport org.obeonetwork.dsl.environment.Namespace;\\n\\t\\t\\t\\tif (result == null) result = caseNamespace(root);\\n\\t\\t\\tcase EntityPackage.BLOCK: {\\n\\t\\t\\t\\tBlock block = (Block)theEObject;\\n\\t\\t\\t\\tT result = caseBlock(block);\\n\\t\\t\\t\\tif (result == null) result = caseObeoDSMObject(block);\\n\\t\\t\\t\\tif (result == null) result = defaultCase(theEObject);\\n\\t\\t\\t\\treturn result;\\n\\t\\t\\t}\\n\\t\\t\\tcase EntityPackage.PROPERTY: {\\n\\t\\t\\t\\tProperty property = (Property)theEObject;\\n\\t\\t\\t\\tT result = caseProperty(property);\\n\\t\\t\\t\\tif (result == null) result = caseObeoDSMObject(property);\\n\\t\\t\\t\\tif (result == null) result = caseBoundableElement(property);\\n\\t\\t\\t\\tif (result == null) result = defaultCase(theEObject);\\n\\t\\t\\t\\treturn result;\\n\\t\\t\\t}\\n\\t\\t\\tcase EntityPackage.ATTRIBUTE: {\\n\\t\\t\\t\\tAttribute attribute = (Attribute)theEObject;\\n\\t\\t\\t\\tT result = caseAttribute(attribute);\\n\\t\\t\\t\\tif (result == null) result = caseProperty(attribute);\\n\\t\\t\\t\\tif (result == null) result = caseObeoDSMObject(attribute);\\n\\t\\t\\t\\tif (result == null) result = caseBoundableElement(attribute);\\n\\t\\t\\t\\tif (result == null) result = defaultCase(theEObject);\\n\\t\\t\\t\\treturn result;\\n\\t\\t\\t}\\n\\t\\t\\tcase EntityPackage.REFERENCE: {\\n\\t\\t\\t\\tReference reference = (Reference)theEObject;\\n\\t\\t\\t\\tT result = caseReference(reference);\\n\\t\\t\\t\\tif (result == null) result = caseProperty(reference);\\n\\t\\t\\t\\tif (result == null) result = caseObeoDSMObject(reference);\\n\\t\\t\\t\\tif (result == null) result = caseBoundableElement(reference);\\n\\t\\t\\t\\tif (result == null) result = defaultCase(theEObject);\\n\\t\\t\\t\\treturn result;\\n\\t\\t\\t}\\n\\t/**\\n\\t * Returns the result of interpreting the object as an instance of 'Block'.\\n\\t * This implementation returns null; returning a\\n\\t * non-null result will terminate the switch. \\n\\t * @param object the target of the switch.\\n\\t * @return the result of interpreting the object as an instance of 'Block'.\\n\\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n\\t * @generated\\n\\t */\\n\\tpublic T caseBlock(Block object) {\\n\\t\\treturn null;\\n\\t}\\n\\n\\t/**\\n\\t * Returns the result of interpreting the object as an instance of 'Property'.\\n\\t * This implementation returns null; returning a\\n\\t * non-null result will terminate the switch. \\n\\t * @param object the target of the switch.\\n\\t * @return the result of interpreting the object as an instance of 'Property'.\\n\\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n\\t * @generated\\n\\t */\\n\\tpublic T caseProperty(Property object) {\\n\\t\\treturn null;\\n\\t}\\n\\n\\t/**\\n\\t * Returns the result of interpreting the object as an instance of 'Attribute'.\\n\\t * This implementation returns null; returning a\\n\\t * non-null result will terminate the switch. \\n\\t * @param object the target of the switch.\\n\\t * @return the result of interpreting the object as an instance of 'Attribute'.\\n\\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n\\t * @generated\\n\\t */\\n\\tpublic T caseAttribute(Attribute object) {\\n\\t\\treturn null;\\n\\t}\\n\\n\\t/**\\n\\t * Returns the result of interpreting the object as an instance of 'Reference'.\\n\\t * This implementation returns null; returning a\\n\\t * non-null result will terminate the switch. \\n\\t * @param object the target of the switch.\\n\\t * @return the result of interpreting the object as an instance of 'Reference'.\\n\\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n\\t * @generated\\n\\t */\\n\\tpublic T caseReference(Reference object) {\\n\\t\\treturn null;\\n\\t}\\n\\n\\t * Returns the result of interpreting the object as an instance of 'Namespace'.\\n\\t * @return the result of interpreting the object as an instance of 'Namespace'.\\n\\tpublic T caseNamespace(Namespace object) {\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"Block object\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"T caseBlock(Block object)\"\n },\n {\n \"arguments\": [\n \"Property object\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"T caseProperty(Property object)\"\n },\n {\n \"arguments\": [\n \"Attribute object\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"T caseAttribute(Attribute object)\"\n },\n {\n \"arguments\": [\n \"Reference object\"\n ],\n \"filename\": \"models/entity/plugins/org.obeonetwork.dsl.entity/src/org/obeonetwork/dsl/entity/util/EntitySwitch.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"T caseReference(Reference object)\"\n }\n ],\n \"patch\": \"@@ -16,22 +16,19 @@\\n \\n import org.eclipse.emf.ecore.EClass;\\n import org.eclipse.emf.ecore.EObject;\\n-import org.obeonetwork.dsl.entity.Attribute;\\n-import org.obeonetwork.dsl.entity.Block;\\n+import org.obeonetwork.dsl.entity.*;\\n import org.obeonetwork.dsl.entity.Criterion;\\n import org.obeonetwork.dsl.entity.Entity;\\n import org.obeonetwork.dsl.entity.EntityPackage;\\n import org.obeonetwork.dsl.entity.ExternalCriterion;\\n import org.obeonetwork.dsl.entity.Finder;\\n import org.obeonetwork.dsl.entity.InternalCriterion;\\n-import org.obeonetwork.dsl.entity.Property;\\n-import org.obeonetwork.dsl.entity.Reference;\\n import org.obeonetwork.dsl.entity.Root;\\n import org.obeonetwork.dsl.environment.BoundableElement;\\n-import org.obeonetwork.dsl.environment.Namespace;\\n import org.obeonetwork.dsl.environment.ObeoDSMObject;\\n import org.obeonetwork.dsl.environment.StructuredType;\\n import org.obeonetwork.dsl.environment.Type;\\n+import org.obeonetwork.dsl.environment.TypesDefinition;\\n \\n /**\\n * The Switch for the model's inheritance\\n@@ -112,18 +109,11 @@ protected T doSwitch(int classifierID, EObject theEObject) {\\n \\t\\t\\tcase EntityPackage.ROOT: {\\n \\t\\t\\t\\tRoot root = (Root)theEObject;\\n \\t\\t\\t\\tT result = caseRoot(root);\\n-\\t\\t\\t\\tif (result == null) result = caseNamespace(root);\\n+\\t\\t\\t\\tif (result == null) result = caseTypesDefinition(root);\\n \\t\\t\\t\\tif (result == null) result = caseObeoDSMObject(root);\\n \\t\\t\\t\\tif (result == null) result = defaultCase(theEObject);\\n \\t\\t\\t\\treturn result;\\n \\t\\t\\t}\\n-\\t\\t\\tcase EntityPackage.BLOCK: {\\n-\\t\\t\\t\\tBlock block = (Block)theEObject;\\n-\\t\\t\\t\\tT result = caseBlock(block);\\n-\\t\\t\\t\\tif (result == null) result = caseObeoDSMObject(block);\\n-\\t\\t\\t\\tif (result == null) result = defaultCase(theEObject);\\n-\\t\\t\\t\\treturn result;\\n-\\t\\t\\t}\\n \\t\\t\\tcase EntityPackage.ENTITY: {\\n \\t\\t\\t\\tEntity entity = (Entity)theEObject;\\n \\t\\t\\t\\tT result = caseEntity(entity);\\n@@ -134,32 +124,6 @@ protected T doSwitch(int classifierID, EObject theEObject) {\\n \\t\\t\\t\\tif (result == null) result = defaultCase(theEObject);\\n \\t\\t\\t\\treturn result;\\n \\t\\t\\t}\\n-\\t\\t\\tcase EntityPackage.PROPERTY: {\\n-\\t\\t\\t\\tProperty property = (Property)theEObject;\\n-\\t\\t\\t\\tT result = caseProperty(property);\\n-\\t\\t\\t\\tif (result == null) result = caseObeoDSMObject(property);\\n-\\t\\t\\t\\tif (result == null) result = caseBoundableElement(property);\\n-\\t\\t\\t\\tif (result == null) result = defaultCase(theEObject);\\n-\\t\\t\\t\\treturn result;\\n-\\t\\t\\t}\\n-\\t\\t\\tcase EntityPackage.ATTRIBUTE: {\\n-\\t\\t\\t\\tAttribute attribute = (Attribute)theEObject;\\n-\\t\\t\\t\\tT result = caseAttribute(attribute);\\n-\\t\\t\\t\\tif (result == null) result = caseProperty(attribute);\\n-\\t\\t\\t\\tif (result == null) result = caseObeoDSMObject(attribute);\\n-\\t\\t\\t\\tif (result == null) result = caseBoundableElement(attribute);\\n-\\t\\t\\t\\tif (result == null) result = defaultCase(theEObject);\\n-\\t\\t\\t\\treturn result;\\n-\\t\\t\\t}\\n-\\t\\t\\tcase EntityPackage.REFERENCE: {\\n-\\t\\t\\t\\tReference reference = (Reference)theEObject;\\n-\\t\\t\\t\\tT result = caseReference(reference);\\n-\\t\\t\\t\\tif (result == null) result = caseProperty(reference);\\n-\\t\\t\\t\\tif (result == null) result = caseObeoDSMObject(reference);\\n-\\t\\t\\t\\tif (result == null) result = caseBoundableElement(reference);\\n-\\t\\t\\t\\tif (result == null) result = defaultCase(theEObject);\\n-\\t\\t\\t\\treturn result;\\n-\\t\\t\\t}\\n \\t\\t\\tcase EntityPackage.FINDER: {\\n \\t\\t\\t\\tFinder finder = (Finder)theEObject;\\n \\t\\t\\t\\tT result = caseFinder(finder);\\n@@ -207,19 +171,6 @@ public T caseRoot(Root object) {\\n \\t\\treturn null;\\n \\t}\\n \\n-\\t/**\\n-\\t * Returns the result of interpreting the object as an instance of 'Block'.\\n-\\t * This implementation returns null; returning a\\n-\\t * non-null result will terminate the switch. \\n-\\t * @param object the target of the switch.\\n-\\t * @return the result of interpreting the object as an instance of 'Block'.\\n-\\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n-\\t * @generated\\n-\\t */\\n-\\tpublic T caseBlock(Block object) {\\n-\\t\\treturn null;\\n-\\t}\\n-\\n \\t/**\\n \\t * Returns the result of interpreting the object as an instance of 'Entity'.\\n \\t * This implementation returns null; returning a\\n@@ -233,45 +184,6 @@ public T caseEntity(Entity object) {\\n \\t\\treturn null;\\n \\t}\\n \\n-\\t/**\\n-\\t * Returns the result of interpreting the object as an instance of 'Property'.\\n-\\t * This implementation returns null; returning a\\n-\\t * non-null result will terminate the switch. \\n-\\t * @param object the target of the switch.\\n-\\t * @return the result of interpreting the object as an instance of 'Property'.\\n-\\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n-\\t * @generated\\n-\\t */\\n-\\tpublic T caseProperty(Property object) {\\n-\\t\\treturn null;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * Returns the result of interpreting the object as an instance of 'Attribute'.\\n-\\t * This implementation returns null; returning a\\n-\\t * non-null result will terminate the switch. \\n-\\t * @param object the target of the switch.\\n-\\t * @return the result of interpreting the object as an instance of 'Attribute'.\\n-\\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n-\\t * @generated\\n-\\t */\\n-\\tpublic T caseAttribute(Attribute object) {\\n-\\t\\treturn null;\\n-\\t}\\n-\\n-\\t/**\\n-\\t * Returns the result of interpreting the object as an instance of 'Reference'.\\n-\\t * This implementation returns null; returning a\\n-\\t * non-null result will terminate the switch. \\n-\\t * @param object the target of the switch.\\n-\\t * @return the result of interpreting the object as an instance of 'Reference'.\\n-\\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n-\\t * @generated\\n-\\t */\\n-\\tpublic T caseReference(Reference object) {\\n-\\t\\treturn null;\\n-\\t}\\n-\\n \\t/**\\n \\t * Returns the result of interpreting the object as an instance of 'Finder'.\\n \\t * This implementation returns null; returning a\\n@@ -338,17 +250,17 @@ public T caseObeoDSMObject(ObeoDSMObject object) {\\n \\t}\\n \\n \\t/**\\n-\\t * Returns the result of interpreting the object as an instance of 'Namespace'.\\n+\\t * Returns the result of interpreting the object as an instance of 'Types Definition'.\\n \\t * \\n \\t * This implementation returns null;\\n \\t * returning a non-null result will terminate the switch.\\n \\t * \\n \\t * @param object the target of the switch.\\n-\\t * @return the result of interpreting the object as an instance of 'Namespace'.\\n+\\t * @return the result of interpreting the object as an instance of 'Types Definition'.\\n \\t * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n \\t * @generated\\n \\t */\\n-\\tpublic T caseNamespace(Namespace object) {\\n+\\tpublic T caseTypesDefinition(TypesDefinition object) {\\n \\t\\treturn null;\\n \\t}\\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fentity%2Fplugins%2Forg.obeonetwork.dsl.entity%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fentity%2Futil%2FEntitySwitch.java\",\n \"sha\": \"0cf7a11337417ea5adc5bd6fbf14004c9fb76e4a\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2FMETA-INF%2FMANIFEST.MF\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 1,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/META-INF/MANIFEST.MF\",\n \"new_code\": \"Bundle-SymbolicName: org.obeonetwork.dsl.environment.edit;singleton:=true\",\n \"new_methods\": [],\n \"old_code\": \"Bundle-SymbolicName: org.obeonetwork.dsl.environment.edit; singleton:=true\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,7 +1,7 @@\\n Manifest-Version: 1.0\\n Bundle-ManifestVersion: 2\\n Bundle-Name: %pluginName\\n-Bundle-SymbolicName: org.obeonetwork.dsl.environment.edit; singleton:=true\\n+Bundle-SymbolicName: org.obeonetwork.dsl.environment.edit;singleton:=true\\n Bundle-Version: 2.4.0.qualifier\\n Bundle-ClassPath: .\\n Bundle-Activator: org.obeonetwork.dsl.environment.provider.EnvironmentEditPlugin$Implementation\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2FMETA-INF%2FMANIFEST.MF\",\n \"sha\": \"694a9532100ddfb15b88a1cc5f89f6598a66a953\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 48,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fmodel%2Fenvironment.components\",\n \"changes\": 51,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fmodel%2Fenvironment.components?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 3,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/model/environment.components\",\n \"new_code\": \" \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \",\n \"new_methods\": [],\n \"old_code\": \" \\n \\n \",\n \"old_methods\": [],\n \"patch\": \"@@ -132,6 +132,9 @@\\n \\n \\n \\n+ \\n+ \\n+ \\n \\n \\n \\n@@ -142,8 +145,8 @@\\n \\n \\n \\n- \\n- \\n+ \\n+ \\n \\n \\n \\n@@ -157,6 +160,9 @@\\n \\n \\n \\n+ \\n+ \\n+ \\n \\n \\n \\n@@ -202,6 +208,22 @@\\n \\n \\n \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n \\n \\n \\n@@ -339,6 +361,9 @@\\n \\n \\n \\n+ \\n+ \\n+ \\n \\n \\n \\n@@ -350,7 +375,7 @@\\n \\n \\n \\n- \\n+ \\n \\n \\n \\n@@ -365,6 +390,9 @@\\n \\n \\n \\n+ \\n+ \\n+ \\n \\n \\n \\n@@ -420,6 +448,23 @@\\n \\n \\n \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n \\n \\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fmodel%2Fenvironment.components\",\n \"sha\": \"595e8f47e4ad473d574db6b52ed63452855710fe\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 60,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fplugin.properties\",\n \"changes\": 145,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fplugin.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 85,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/plugin.properties\",\n \"new_code\": \"# Copyright (c) 2008-2009 Obeo.\\n# All rights reserved. This program and the accompanying materials\\n# are made available under the terms of the Eclipse Public License v1.0\\n# which accompanies this distribution, and is available at\\n# http://www.eclipse.org/legal/epl-v10.html\\n# \\n# Contributors:\\n# Obeo - initial API and implementation\\nproviderName = www.example.org\\n_UI_PriorityDefinition_type = Priority Definition\\n_UI_Priority_type = Priority\\n_UI_MetaData_type = Meta Data\\n_UI_TypesDefinition_type = Types Definition\\n_UI_Behaviour_type = Behaviour\\n_UI_StructuredType_type = Structured Type\\n_UI_DTO_type = DTO\\n_UI_FilterContainer_type = Filter Container\\n_UI_Filter_type = Filter\\n_UI_Namespace_type = Namespace\\n_UI_Attribute_type = Attribute\\n_UI_Reference_type = Reference\\n_UI_Property_type = Property\\n_UI_BindingInfo_type = Binding Info\\n_UI_BindingReference_type = Binding Reference\\n_UI_BindingElement_type = Binding Element\\n_UI_BindingRegistry_type = Binding Registry\\n_UI_BoundableElement_type = Boundable Element\\n_UI_Environment_priorityDefinitions_feature = Priority Definitions\\n_UI_Environment_typesDefinition_feature = Types Definition\\n_UI_Environment_namespaces_feature = Namespaces\\n_UI_Type_typeDefinition_feature = Type Definition\\n_UI_ObeoDSMObject_description_feature = Description\\n_UI_ObeoDSMObject_keywords_feature = Keywords\\n_UI_ObeoDSMObject_behaviours_feature = Behaviours\\n_UI_ObeoDSMObject_bindingRegistries_feature = Binding Registries\\n_UI_ObeoDSMObject_version_feature = Version\\n_UI_ObeoDSMObject_createdOn_feature = Created On\\n_UI_ObeoDSMObject_modifiedOn_feature = Modified On\\n_UI_MetaDataContainer_metadatas_feature = Metadatas\\n_UI_StructuredType_supertype_feature = Supertype\\n_UI_StructuredType_associatedTypes_feature = Associated Types\\n_UI_StructuredType_ownedAttributes_feature = Owned Attributes\\n_UI_StructuredType_attributes_feature = Attributes\\n_UI_StructuredType_ownedReferences_feature = Owned References\\n_UI_StructuredType_references_feature = References\\n_UI_StructuredType_properties_feature = Properties\\n_UI_Attribute_containingType_feature = Containing Type\\n_UI_Reference_containingType_feature = Containing Type\\n_UI_Reference_referencedType_feature = Referenced Type\\n_UI_Property_isIdentifier_feature = Is Identifier\\n_UI_BindingInfo_references_feature = References\\n_UI_BindingElement_boundElement_feature = Bound Element\\n_UI_BindingElement_bindingExpression_feature = Binding Expression\\n_UI_BindingRegistry_bindingInfos_feature = Binding Infos\\n_UI_Unknown_feature = Unspecified\\n\\n_UI_MultiplicityKind_ZERO_ONE_literal = 0..1\\n_UI_MultiplicityKind_ONE_literal = 1\\n_UI_MultiplicityKind_ZERO_STAR_literal = 0..*\\n_UI_MultiplicityKind_ONE_STAR_literal = 1..*\",\n \"new_methods\": [],\n \"old_code\": \"# \\n# \\n#\\n# $Id$\\n\\n# ====================================================================\\n# To code developer:\\n# Do NOT change the properties between this line and the\\n# \\\"%%% END OF TRANSLATED PROPERTIES %%%\\\" line.\\n# Make a new property name, append to the end of the file and change\\n# the code to use the new property.\\n# ====================================================================\\n\\n# ====================================================================\\n# %%% END OF TRANSLATED PROPERTIES %%%\\n# ====================================================================\\nproviderName = Obeo.fr\\n_UI_Environment_types_feature = Types\\n_UI_MetaDataContainer_annotations_feature = Annotations\\n_UI_Unknown_feature = Unspecified\\n\\n_UI_PriorityDefinition_type = Priority Definition\\n_UI_PriorityKind_type = Priority Kind\\n_UI_Environment_priorityDefinitions_feature = Priority Definitions\\n_UI_PriorityKind_name_feature = Name\\n_UI_MetaData_type = Meta Data\\n_UI_ObeoDSMObject_metadataContainer_feature = Metadata Container\\n_UI_MetaDataContainer_metadatas_feature = Metadatas\\n_UI_Priority_type = Priority\\n_UI_TypesDefinition_type = Types Definition\\n_UI_Environment_typesDefinition_feature = Types Definition\\n_UI_Type_typeDefinition_feature = Type Definition\\n_UI_TypesDefinition_name_feature = Name\\n_UI_Behaviour_type = Behaviour\\n_UI_Environment_behaviours_feature = Behaviours\\n_UI_StructuredType_type = Structured Type\\n_UI_DTO_type = DTO\\n_UI_FilterContainer_type = Filter Container\\n_UI_Filter_type = Filter\\n_UI_MultiplicityKind_ZERO_ONE_literal = 0..1\\n_UI_MultiplicityKind_ONE_literal = 1\\n_UI_MultiplicityKind_ZERO_STAR_literal = 0..*\\n_UI_MultiplicityKind_ONE_STAR_literal = 1..*\\n_UI_DTO_references_feature = References\\n_UI_Container_type = Container\\n_UI_Namespace_type = Namespace\\n_UI_ObeoDSMObject_description_feature = Description\\n_UI_ObeoDSMObject_keywords_feature = Keywords\\n_UI_Attribute_type = Attribute\\n_UI_Reference_type = Reference\\n_UI_Property_type = Property\\n_UI_DTO_properties_feature = Properties\\n_UI_DTO_ownedReferences_feature = Owned References\\n_UI_DTO_attributes_feature = Attributes\\n_UI_DTO_ownedAttributes_feature = Owned Attributes\\n_UI_Attribute_dto_feature = Dto\\n_UI_Reference_type_feature = Type\\n_UI_Reference_dto_feature = Dto\\n_UI_DTO_supertype_feature = Supertype\\n_UI_DTO_associatedTypes_feature = Associated Types\\n_UI_ObeoDSMObject_behaviours_feature = Behaviours\\n_UI_Binding_type = Binding\\n_UI_BindingCluster_type = Binding Cluster\\n_UI_BindingElement_type = Binding Element\\n_UI_ObeoDSMObject_bindings_feature = Bindings\\n_UI_Binding_clusters_feature = Clusters\\n_UI_Binding_left_feature = Left\\n_UI_Binding_right_feature = Right\\n_UI_BindingCluster_left_feature = Left\\n_UI_BindingCluster_right_feature = Right\\n_UI_BindingElement_boundElement_feature = Bound Element\\n_UI_BindingElement_bindingExpression_feature = Binding Expression\\n_UI_BindingInfo_type = Binding Info\\n_UI_BindingInfo_clusters_feature = Clusters\\n_UI_ObeoDSMObject_bindingInfos_feature = Binding Infos\\n_UI_BindingRegistry_type = Binding Registry\\n_UI_ObeoDSMObject_bindingRegistries_feature = Binding Registries\\n_UI_BindingRegistry_bindingInfos_feature = Binding Infos\\n_UI_BindingElement_internalPath_feature = Internal Path\\n_UI_BindingReference_type = Binding Reference\\n_UI_BindingInfo_references_feature = References\\n_UI_BoundableElement_type = Boundable Element\\n_UI_ObeoDSMObject_version_feature = Version\\n_UI_ObeoDSMObject_createdOn_feature = Created On\\n_UI_ObeoDSMObject_modifiedOn_feature = Modified On\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,22 +1,14 @@\\n-# \\n-# \\n-#\\n-# $Id$\\n-\\n-# ====================================================================\\n-# To code developer:\\n-# Do NOT change the properties between this line and the\\n-# \\\"%%% END OF TRANSLATED PROPERTIES %%%\\\" line.\\n-# Make a new property name, append to the end of the file and change\\n-# the code to use the new property.\\n-# ====================================================================\\n-\\n-# ====================================================================\\n-# %%% END OF TRANSLATED PROPERTIES %%%\\n-# ====================================================================\\n+# Copyright (c) 2008-2009 Obeo.\\n+# All rights reserved. This program and the accompanying materials\\n+# are made available under the terms of the Eclipse Public License v1.0\\n+# which accompanies this distribution, and is available at\\n+# http://www.eclipse.org/legal/epl-v10.html\\n+# \\n+# Contributors:\\n+# Obeo - initial API and implementation\\n \\n pluginName = Environment Edit Support\\n-providerName = Obeo.fr\\n+providerName = www.example.org\\n \\n _UI_CreateChild_text = {0}\\n _UI_CreateChild_text2 = {1} {0}\\n@@ -37,112 +29,95 @@ _UI_InterDSMLink_type = Inter DSM Link\\n _UI_ObeoDSMObject_type = Obeo DSM Object\\n _UI_MetaDataContainer_type = Meta Data Container\\n _UI_Annotation_type = Annotation\\n+_UI_PriorityDefinition_type = Priority Definition\\n+_UI_Priority_type = Priority\\n+_UI_MetaData_type = Meta Data\\n+_UI_TypesDefinition_type = Types Definition\\n+_UI_Behaviour_type = Behaviour\\n+_UI_StructuredType_type = Structured Type\\n+_UI_DTO_type = DTO\\n+_UI_FilterContainer_type = Filter Container\\n+_UI_Filter_type = Filter\\n+_UI_Namespace_type = Namespace\\n+_UI_Attribute_type = Attribute\\n+_UI_Reference_type = Reference\\n+_UI_Property_type = Property\\n+_UI_BindingInfo_type = Binding Info\\n+_UI_BindingReference_type = Binding Reference\\n+_UI_BindingElement_type = Binding Element\\n+_UI_BindingRegistry_type = Binding Registry\\n+_UI_BoundableElement_type = Boundable Element\\n _UI_Unknown_type = Object\\n \\n _UI_Unknown_datatype= Value\\n \\n _UI_Environment_name_feature = Name\\n-_UI_Environment_types_feature = Types\\n _UI_Environment_actions_feature = Actions\\n _UI_Environment_links_feature = Links\\n+_UI_Environment_priorityDefinitions_feature = Priority Definitions\\n+_UI_Environment_typesDefinition_feature = Types Definition\\n+_UI_Environment_namespaces_feature = Namespaces\\n _UI_Type_name_feature = Name\\n+_UI_Type_typeDefinition_feature = Type Definition\\n _UI_Enumeration_fields_feature = Fields\\n _UI_Field_name_feature = Name\\n _UI_Action_name_feature = Name\\n _UI_InterDSMLink_name_feature = Name\\n _UI_InterDSMLink_target_feature = Target\\n _UI_ObeoDSMObject_metadatas_feature = Metadatas\\n-_UI_MetaDataContainer_annotations_feature = Annotations\\n+_UI_ObeoDSMObject_description_feature = Description\\n+_UI_ObeoDSMObject_keywords_feature = Keywords\\n+_UI_ObeoDSMObject_behaviours_feature = Behaviours\\n+_UI_ObeoDSMObject_bindingRegistries_feature = Binding Registries\\n+_UI_ObeoDSMObject_version_feature = Version\\n+_UI_ObeoDSMObject_createdOn_feature = Created On\\n+_UI_ObeoDSMObject_modifiedOn_feature = Modified On\\n+_UI_MetaDataContainer_metadatas_feature = Metadatas\\n _UI_Annotation_title_feature = Title\\n _UI_Annotation_body_feature = Body\\n-_UI_Unknown_feature = Unspecified\\n-\\n-_UI_PriorityDefinition_type = Priority Definition\\n-_UI_PriorityKind_type = Priority Kind\\n-_UI_Environment_priorityDefinitions_feature = Priority Definitions\\n _UI_PriorityDefinition_priorities_feature = Priorities\\n-_UI_PriorityKind_name_feature = Name\\n-_UI_MetaData_type = Meta Data\\n-_UI_ObeoDSMObject_metadataContainer_feature = Metadata Container\\n-_UI_MetaDataContainer_metadatas_feature = Metadatas\\n-_UI_Priority_type = Priority\\n-_UI_TypesDefinition_type = Types Definition\\n-_UI_Environment_typesDefinition_feature = Types Definition\\n _UI_Priority_name_feature = Name\\n _UI_TypesDefinition_types_feature = Types\\n-_UI_Type_typeDefinition_feature = Type Definition\\n-_UI_TypesDefinition_name_feature = Name\\n-_UI_Behaviour_type = Behaviour\\n-_UI_Environment_behaviours_feature = Behaviours\\n-_UI_StructuredType_type = Structured Type\\n-_UI_DTO_type = DTO\\n-_UI_FilterContainer_type = Filter Container\\n-_UI_Filter_type = Filter\\n+_UI_StructuredType_supertype_feature = Supertype\\n+_UI_StructuredType_associatedTypes_feature = Associated Types\\n+_UI_StructuredType_ownedAttributes_feature = Owned Attributes\\n+_UI_StructuredType_attributes_feature = Attributes\\n+_UI_StructuredType_ownedReferences_feature = Owned References\\n+_UI_StructuredType_references_feature = References\\n+_UI_StructuredType_properties_feature = Properties\\n _UI_DTO_ownedContainer_feature = Owned Container\\n _UI_FilterContainer_ownedFilters_feature = Owned Filters\\n-_UI_MultiplicityKind_ZERO_ONE_literal = 0..1\\n-_UI_MultiplicityKind_ONE_literal = 1\\n-_UI_MultiplicityKind_ZERO_STAR_literal = 0..*\\n-_UI_MultiplicityKind_ONE_STAR_literal = 1..*\\n-_UI_DTO_references_feature = References\\n-_UI_Container_type = Container\\n-_UI_Namespace_type = Namespace\\n _UI_Namespace_ownedNamespaces_feature = Owned Namespaces\\n _UI_Namespace_owner_feature = Owner\\n _UI_Namespace_name_feature = Name\\n-_UI_ObeoDSMObject_description_feature = Description\\n-_UI_ObeoDSMObject_keywords_feature = Keywords\\n-_UI_Attribute_type = Attribute\\n-_UI_Reference_type = Reference\\n-_UI_Property_type = Property\\n-_UI_DTO_properties_feature = Properties\\n-_UI_DTO_ownedReferences_feature = Owned References\\n-_UI_DTO_attributes_feature = Attributes\\n-_UI_DTO_ownedAttributes_feature = Owned Attributes\\n _UI_Attribute_type_feature = Type\\n-_UI_Attribute_dto_feature = Dto\\n+_UI_Attribute_containingType_feature = Containing Type\\n _UI_Reference_isComposite_feature = Is Composite\\n _UI_Reference_navigable_feature = Navigable\\n _UI_Reference_oppositeOf_feature = Opposite Of\\n-_UI_Reference_type_feature = Type\\n-_UI_Reference_dto_feature = Dto\\n+_UI_Reference_containingType_feature = Containing Type\\n+_UI_Reference_referencedType_feature = Referenced Type\\n _UI_Property_name_feature = Name\\n _UI_Property_multiplicity_feature = Multiplicity\\n-_UI_DTO_supertype_feature = Supertype\\n-_UI_DTO_associatedTypes_feature = Associated Types\\n-_UI_ObeoDSMObject_behaviours_feature = Behaviours\\n-_UI_Binding_type = Binding\\n-_UI_BindingCluster_type = Binding Cluster\\n-_UI_BindingElement_type = Binding Element\\n-_UI_ObeoDSMObject_bindings_feature = Bindings\\n-_UI_Binding_clusters_feature = Clusters\\n-_UI_Binding_left_feature = Left\\n-_UI_Binding_right_feature = Right\\n-_UI_BindingCluster_left_feature = Left\\n-_UI_BindingCluster_right_feature = Right\\n-_UI_BindingElement_boundElement_feature = Bound Element\\n-_UI_BindingElement_bindingExpression_feature = Binding Expression\\n-_UI_BindingInfo_type = Binding Info\\n-_UI_BindingInfo_clusters_feature = Clusters\\n+_UI_Property_isIdentifier_feature = Is Identifier\\n+_UI_BindingInfo_references_feature = References\\n _UI_BindingInfo_left_feature = Left\\n _UI_BindingInfo_right_feature = Right\\n-_UI_ObeoDSMObject_bindingInfos_feature = Binding Infos\\n-_UI_BindingRegistry_type = Binding Registry\\n-_UI_ObeoDSMObject_bindingRegistries_feature = Binding Registries\\n _UI_BindingInfo_subBindingInfos_feature = Sub Binding Infos\\n-_UI_BindingRegistry_bindingInfos_feature = Binding Infos\\n _UI_BindingInfo_targets_feature = Targets\\n-_UI_BindingElement_internalPath_feature = Internal Path\\n-_UI_BindingReference_type = Binding Reference\\n-_UI_BindingInfo_references_feature = References\\n _UI_BindingInfo_elements_feature = Elements\\n _UI_BindingReference_left_feature = Left\\n _UI_BindingReference_right_feature = Right\\n+_UI_BindingElement_boundElement_feature = Bound Element\\n+_UI_BindingElement_bindingExpression_feature = Binding Expression\\n _UI_BindingElement_referencedByAsLeft_feature = Referenced By As Left\\n _UI_BindingElement_referencedByAsRight_feature = Referenced By As Right\\n _UI_BindingElement_referencedBy_feature = Referenced By\\n-_UI_BoundableElement_type = Boundable Element\\n _UI_BindingElement_pathReferences_feature = Path References\\n-_UI_ObeoDSMObject_version_feature = Version\\n-_UI_ObeoDSMObject_createdOn_feature = Created On\\n-_UI_ObeoDSMObject_modifiedOn_feature = Modified On\\n+_UI_BindingRegistry_bindingInfos_feature = Binding Infos\\n+_UI_Unknown_feature = Unspecified\\n+\\n+_UI_MultiplicityKind_ZERO_ONE_literal = 0..1\\n+_UI_MultiplicityKind_ONE_literal = 1\\n+_UI_MultiplicityKind_ZERO_STAR_literal = 0..*\\n+_UI_MultiplicityKind_ONE_STAR_literal = 1..*\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fplugin.properties\",\n \"sha\": \"eab5e4eef17685c805787420281e8966ceb09a8d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 7,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Fenvironment_properties.plugin.xml\",\n \"changes\": 8,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Fenvironment_properties.plugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 1,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/environment_properties.plugin.xml\",\n \"new_code\": \" uri=\\\"http://www.obeonetwork.org/dsl/environment/3.0.0\\\"\\n \\n \\n\",\n \"new_methods\": [],\n \"old_code\": \" uri=\\\"http://www.obeonetwork.org/dsl/environment/2.0.0\\\"\",\n \"old_methods\": [],\n \"patch\": \"@@ -6,7 +6,7 @@\\n \\n \\n \\n \\n@@ -140,6 +140,12 @@\\n category=\\\"default\\\">\\n \\n \\n+ \\n+ \\n+\\n \\n \\n providers = new ArrayList(1);\\n\\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n\\t\\treturn new DTOPropertiesEditionProvider(providers);\\n\\t}\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/EnvironmentEEFAdapterFactory.java\",\n \"implementation\": \"List providers = new ArrayList(1);\\n\\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n\\t\\treturn new DTOPropertiesEditionProvider(providers);\",\n \"signature\": \"Adapter createDTOAdapter()\"\n }\n ],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -114,6 +114,16 @@ public Adapter createTypesDefinitionAdapter() {\\n \\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n \\t\\treturn new TypesDefinitionPropertiesEditionProvider(providers);\\n \\t}\\n+\\t/**\\n+\\t * {@inheritDoc}\\n+\\t * @see org.obeonetwork.dsl.environment.util.EnvironmentAdapterFactory#createDTOAdapter()\\n+\\t * \\n+\\t */\\n+\\tpublic Adapter createDTOAdapter() {\\n+\\t\\tList providers = new ArrayList(1);\\n+\\t\\tproviders.add((PropertiesEditingProvider)createObeoDSMObjectAdapter());\\n+\\t\\treturn new DTOPropertiesEditionProvider(providers);\\n+\\t}\\n \\t/**\\n \\t * {@inheritDoc}\\n \\t * @see org.obeonetwork.dsl.environment.util.EnvironmentAdapterFactory#createFilterContainerAdapter()\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentEEFAdapterFactory.java\",\n \"sha\": \"a64e1e1ebdbb344c4d30bba12e22b2d4dacc3b5e\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 28,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentMessages.java\",\n \"changes\": 29,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentMessages.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 1,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/EnvironmentMessages.java\",\n \"new_code\": \"\\t\\n\\tpublic static String DTOPropertiesEditionPart_PropertiesGroupLabel;\\n\\n\\t\\n\\tpublic static String DTO_ReadOnly;\\n\\n\\t\\n\\tpublic static String DTO_Part_Title;\\n\\n\\tpublic static String AttributePropertiesEditionPart_IdentifierLabel;\\n\\n\\t\\n\\tpublic static String ReferencePropertiesEditionPart_ReferencedTypeLabel;\\n\\tpublic static String ReferencePropertiesEditionPart_IdentifierLabel;\\n\\n\\t\\n\\t\\n\\tpublic static String DTOPropertiesEditionPart_NameLabel;\\n\\n\\t\\n\\tpublic static String DTOPropertiesEditionPart_SupertypeLabel;\\n\\n\\t\\n\\tpublic static String DTOPropertiesEditionPart_AssociatedTypesLabel;\\n\\n\\t\\n\\tpublic static String DTOPropertiesEditionPart_DescriptionLabel;\\n\",\n \"new_methods\": [],\n \"old_code\": \"\\tpublic static String ReferencePropertiesEditionPart_TypeLabel;\",\n \"old_methods\": [],\n \"patch\": \"@@ -64,6 +64,9 @@ public class EnvironmentMessages extends NLS {\\n \\t\\n \\tpublic static String BindingElementPropertiesEditionPart_PropertiesGroupLabel;\\n \\n+\\t\\n+\\tpublic static String DTOPropertiesEditionPart_PropertiesGroupLabel;\\n+\\n \\n \\t\\n \\tpublic static String Environment_ReadOnly;\\n@@ -167,6 +170,12 @@ public class EnvironmentMessages extends NLS {\\n \\t\\n \\tpublic static String BindingElement_Part_Title;\\n \\n+\\t\\n+\\tpublic static String DTO_ReadOnly;\\n+\\n+\\t\\n+\\tpublic static String DTO_Part_Title;\\n+\\n \\n \\t\\n \\tpublic static String EnvironmentPropertiesEditionPart_NameLabel;\\n@@ -241,13 +250,16 @@ public class EnvironmentMessages extends NLS {\\n \\tpublic static String AttributePropertiesEditionPart_MultiplicityLabel;\\n \\n \\t\\n+\\tpublic static String AttributePropertiesEditionPart_IdentifierLabel;\\n+\\n+\\t\\n \\tpublic static String AttributePropertiesEditionPart_DescriptionLabel;\\n \\n \\t\\n \\tpublic static String ReferencePropertiesEditionPart_NameLabel;\\n \\n \\t\\n-\\tpublic static String ReferencePropertiesEditionPart_TypeLabel;\\n+\\tpublic static String ReferencePropertiesEditionPart_ReferencedTypeLabel;\\n \\n \\t\\n \\tpublic static String ReferencePropertiesEditionPart_MultiplicityLabel;\\n@@ -262,6 +274,9 @@ public class EnvironmentMessages extends NLS {\\n \\tpublic static String ReferencePropertiesEditionPart_OppositeOfLabel;\\n \\n \\t\\n+\\tpublic static String ReferencePropertiesEditionPart_IdentifierLabel;\\n+\\n+\\t\\n \\tpublic static String ReferencePropertiesEditionPart_DescriptionLabel;\\n \\n \\t\\n@@ -294,6 +309,18 @@ public class EnvironmentMessages extends NLS {\\n \\t\\n \\tpublic static String BindingElementPropertiesEditionPart_DescriptionLabel;\\n \\n+\\t\\n+\\tpublic static String DTOPropertiesEditionPart_NameLabel;\\n+\\n+\\t\\n+\\tpublic static String DTOPropertiesEditionPart_SupertypeLabel;\\n+\\n+\\t\\n+\\tpublic static String DTOPropertiesEditionPart_AssociatedTypesLabel;\\n+\\n+\\t\\n+\\tpublic static String DTOPropertiesEditionPart_DescriptionLabel;\\n+\\n \\n \\t\\n \\tpublic static String PropertiesEditionPart_DocumentationLabel;\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentMessages.java\",\n \"sha\": \"b1321030c678e24fd8ab99a53421e0f0bc0739e3\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 8,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentPropertiesEditionPartProvider.java\",\n \"changes\": 8,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentPropertiesEditionPartProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/EnvironmentPropertiesEditionPartProvider.java\",\n \"new_code\": \"import org.obeonetwork.dsl.environment.parts.forms.DTOPropertiesEditionPartForm;\\nimport org.obeonetwork.dsl.environment.parts.impl.DTOPropertiesEditionPartImpl;\\n\\t\\tif (key == EnvironmentViewsRepository.DTO.class) {\\n\\t\\t\\tif (kind == EnvironmentViewsRepository.SWT_KIND)\\n\\t\\t\\t\\treturn new DTOPropertiesEditionPartImpl(component);\\n\\t\\t\\tif (kind == EnvironmentViewsRepository.FORM_KIND)\\n\\t\\t\\t\\treturn new DTOPropertiesEditionPartForm(component);\\n\\t\\t}\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -16,6 +16,7 @@\\n import org.obeonetwork.dsl.environment.parts.forms.BindingElementPropertiesEditionPartForm;\\n import org.obeonetwork.dsl.environment.parts.forms.BindingInfoPropertiesEditionPartForm;\\n import org.obeonetwork.dsl.environment.parts.forms.BindingReferencePropertiesEditionPartForm;\\n+import org.obeonetwork.dsl.environment.parts.forms.DTOPropertiesEditionPartForm;\\n import org.obeonetwork.dsl.environment.parts.forms.EnumerationPropertiesEditionPartForm;\\n import org.obeonetwork.dsl.environment.parts.forms.EnvironmentPropertiesEditionPartForm;\\n import org.obeonetwork.dsl.environment.parts.forms.FieldPropertiesEditionPartForm;\\n@@ -34,6 +35,7 @@\\n import org.obeonetwork.dsl.environment.parts.impl.BindingElementPropertiesEditionPartImpl;\\n import org.obeonetwork.dsl.environment.parts.impl.BindingInfoPropertiesEditionPartImpl;\\n import org.obeonetwork.dsl.environment.parts.impl.BindingReferencePropertiesEditionPartImpl;\\n+import org.obeonetwork.dsl.environment.parts.impl.DTOPropertiesEditionPartImpl;\\n import org.obeonetwork.dsl.environment.parts.impl.EnumerationPropertiesEditionPartImpl;\\n import org.obeonetwork.dsl.environment.parts.impl.EnvironmentPropertiesEditionPartImpl;\\n import org.obeonetwork.dsl.environment.parts.impl.FieldPropertiesEditionPartImpl;\\n@@ -170,6 +172,12 @@ public IPropertiesEditionPart getPropertiesEditionPart(Object key, int kind, IPr\\n \\t\\t\\tif (kind == EnvironmentViewsRepository.FORM_KIND)\\n \\t\\t\\t\\treturn new BindingElementPropertiesEditionPartForm(component);\\n \\t\\t}\\n+\\t\\tif (key == EnvironmentViewsRepository.DTO.class) {\\n+\\t\\t\\tif (kind == EnvironmentViewsRepository.SWT_KIND)\\n+\\t\\t\\t\\treturn new DTOPropertiesEditionPartImpl(component);\\n+\\t\\t\\tif (kind == EnvironmentViewsRepository.FORM_KIND)\\n+\\t\\t\\t\\treturn new DTOPropertiesEditionPartForm(component);\\n+\\t\\t}\\n \\t\\treturn null;\\n \\t}\\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FEnvironmentPropertiesEditionPartProvider.java\",\n \"sha\": \"1385a20260f0557f20ef3d8edd1ca2917a23e3da\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 10,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages.properties\",\n \"changes\": 11,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 1,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/environmentMessages.properties\",\n \"new_code\": \"DTOPropertiesEditionPart_PropertiesGroupLabel=Properties\\nDTO_ReadOnly=This property is read only\\nDTO_Part_Title=Base\\nAttributePropertiesEditionPart_IdentifierLabel=Identifier\\nReferencePropertiesEditionPart_ReferencedTypeLabel=ReferencedType : \\nReferencePropertiesEditionPart_IdentifierLabel=Identifier\\nDTOPropertiesEditionPart_NameLabel=Name : \\nDTOPropertiesEditionPart_SupertypeLabel=Supertype : \\nDTOPropertiesEditionPart_AssociatedTypesLabel=AssociatedTypes : \\nDTOPropertiesEditionPart_DescriptionLabel=Description : \",\n \"new_methods\": [],\n \"old_code\": \"ReferencePropertiesEditionPart_TypeLabel=Type : \",\n \"old_methods\": [],\n \"patch\": \"@@ -24,6 +24,7 @@ MetadatasPropertiesEditionPart_PropertiesGroupLabel=Properties\\n BindingInfoPropertiesEditionPart_PropertiesGroupLabel=Properties\\n BindingReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\\n BindingElementPropertiesEditionPart_PropertiesGroupLabel=Properties\\n+DTOPropertiesEditionPart_PropertiesGroupLabel=Properties\\n Environment_ReadOnly=This property is read only\\n Environment_Part_Title=Environment\\n PrimitiveType_ReadOnly=This property is read only\\n@@ -58,6 +59,8 @@ BindingReference_ReadOnly=This property is read only\\n BindingReference_Part_Title=BindingReference\\n BindingElement_ReadOnly=This property is read only\\n BindingElement_Part_Title=BindingElement\\n+DTO_ReadOnly=This property is read only\\n+DTO_Part_Title=Base\\n EnvironmentPropertiesEditionPart_NameLabel=Name : \\n EnvironmentPropertiesEditionPart_DescriptionLabel=Description : \\n PrimitiveTypePropertiesEditionPart_NameLabel=Name : \\n@@ -82,13 +85,15 @@ NamespacePropertiesEditionPart_DescriptionLabel=Description :\\n AttributePropertiesEditionPart_NameLabel=Name : \\n AttributePropertiesEditionPart_TypeLabel=Type : \\n AttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \\n+AttributePropertiesEditionPart_IdentifierLabel=Identifier\\n AttributePropertiesEditionPart_DescriptionLabel=Description : \\n ReferencePropertiesEditionPart_NameLabel=Name : \\n-ReferencePropertiesEditionPart_TypeLabel=Type : \\n+ReferencePropertiesEditionPart_ReferencedTypeLabel=ReferencedType : \\n ReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \\n ReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\\n ReferencePropertiesEditionPart_NavigableLabel=Navigable\\n ReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \\n+ReferencePropertiesEditionPart_IdentifierLabel=Identifier\\n ReferencePropertiesEditionPart_DescriptionLabel=Description : \\n MetadatasPropertiesEditionPart_MetadataLabel=Metadata : \\n BindingInfoPropertiesEditionPart_LeftLabel=Left : \\n@@ -100,6 +105,10 @@ BindingReferencePropertiesEditionPart_DescriptionLabel=Description :\\n BindingElementPropertiesEditionPart_BoundElementLabel=BoundElement : \\n BindingElementPropertiesEditionPart_BindingExpressionLabel=BindingExpression : \\n BindingElementPropertiesEditionPart_DescriptionLabel=Description : \\n+DTOPropertiesEditionPart_NameLabel=Name : \\n+DTOPropertiesEditionPart_SupertypeLabel=Supertype : \\n+DTOPropertiesEditionPart_AssociatedTypesLabel=AssociatedTypes : \\n+DTOPropertiesEditionPart_DescriptionLabel=Description : \\n PropertiesEditionPart_PropertiesGroupLabel=Properties\\n PropertiesEditionPart_EditTableViewerLabel=Edit\\n PropertiesEditionPart_DocumentationLabel=Documentation\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages.properties\",\n \"sha\": \"28dab2df2a7081dc6267d84b3ea828f8f61b586d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 10,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages_fr.properties\",\n \"changes\": 11,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages_fr.properties?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 1,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src-gen/org/obeonetwork/dsl/environment/providers/environmentMessages_fr.properties\",\n \"new_code\": \"DTOPropertiesEditionPart_PropertiesGroupLabel=Properties\\nDTO_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\nDTO_Part_Title=Base\\nAttributePropertiesEditionPart_IdentifierLabel=Identifier\\nReferencePropertiesEditionPart_ReferencedTypeLabel=ReferencedType : \\nReferencePropertiesEditionPart_IdentifierLabel=Identifier\\nDTOPropertiesEditionPart_NameLabel=Name : \\nDTOPropertiesEditionPart_SupertypeLabel=Supertype : \\nDTOPropertiesEditionPart_AssociatedTypesLabel=AssociatedTypes : \\nDTOPropertiesEditionPart_DescriptionLabel=Description : \",\n \"new_methods\": [],\n \"old_code\": \"ReferencePropertiesEditionPart_TypeLabel=Type : \",\n \"old_methods\": [],\n \"patch\": \"@@ -24,6 +24,7 @@ MetadatasPropertiesEditionPart_PropertiesGroupLabel=Properties\\n BindingInfoPropertiesEditionPart_PropertiesGroupLabel=Properties\\n BindingReferencePropertiesEditionPart_PropertiesGroupLabel=Properties\\n BindingElementPropertiesEditionPart_PropertiesGroupLabel=Properties\\n+DTOPropertiesEditionPart_PropertiesGroupLabel=Properties\\n Environment_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n Environment_Part_Title=Environment\\n PrimitiveType_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n@@ -58,6 +59,8 @@ BindingReference_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n BindingReference_Part_Title=BindingReference\\n BindingElement_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n BindingElement_Part_Title=BindingElement\\n+DTO_ReadOnly=Cette propri\\\\u00E9t\\\\u00E9 est en lecture seule\\n+DTO_Part_Title=Base\\n EnvironmentPropertiesEditionPart_NameLabel=Name : \\n EnvironmentPropertiesEditionPart_DescriptionLabel=Description : \\n PrimitiveTypePropertiesEditionPart_NameLabel=Name : \\n@@ -82,13 +85,15 @@ NamespacePropertiesEditionPart_DescriptionLabel=Description :\\n AttributePropertiesEditionPart_NameLabel=Name : \\n AttributePropertiesEditionPart_TypeLabel=Type : \\n AttributePropertiesEditionPart_MultiplicityLabel=Multiplicity : \\n+AttributePropertiesEditionPart_IdentifierLabel=Identifier\\n AttributePropertiesEditionPart_DescriptionLabel=Description : \\n ReferencePropertiesEditionPart_NameLabel=Name : \\n-ReferencePropertiesEditionPart_TypeLabel=Type : \\n+ReferencePropertiesEditionPart_ReferencedTypeLabel=ReferencedType : \\n ReferencePropertiesEditionPart_MultiplicityLabel=Multiplicity : \\n ReferencePropertiesEditionPart_IsCompositeLabel=IsComposite\\n ReferencePropertiesEditionPart_NavigableLabel=Navigable\\n ReferencePropertiesEditionPart_OppositeOfLabel=OppositeOf : \\n+ReferencePropertiesEditionPart_IdentifierLabel=Identifier\\n ReferencePropertiesEditionPart_DescriptionLabel=Description : \\n MetadatasPropertiesEditionPart_MetadataLabel=Metadata : \\n BindingInfoPropertiesEditionPart_LeftLabel=Left : \\n@@ -100,6 +105,10 @@ BindingReferencePropertiesEditionPart_DescriptionLabel=Description :\\n BindingElementPropertiesEditionPart_BoundElementLabel=BoundElement : \\n BindingElementPropertiesEditionPart_BindingExpressionLabel=BindingExpression : \\n BindingElementPropertiesEditionPart_DescriptionLabel=Description : \\n+DTOPropertiesEditionPart_NameLabel=Name : \\n+DTOPropertiesEditionPart_SupertypeLabel=Supertype : \\n+DTOPropertiesEditionPart_AssociatedTypesLabel=AssociatedTypes : \\n+DTOPropertiesEditionPart_DescriptionLabel=Description : \\n PropertiesEditionPart_PropertiesGroupLabel=Propri\\\\u00E9t\\\\u00E9s\\n PropertiesEditionPart_EditTableViewerLabel=Editer\\n PropertiesEditionPart_DocumentationLabel=Documentation\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc-gen%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fproviders%2FenvironmentMessages_fr.properties\",\n \"sha\": \"65ce5974b7b7110052e93f10f6a652c31f2354f5\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FDTOItemProvider.java\",\n \"changes\": 109,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FDTOItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 109,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\t\\t\\taddAssociatedTypesPropertyDescriptor(object);\\n\\t\\t\\taddPropertiesPropertyDescriptor(object);\\n\\t\\t\\taddReferencesPropertyDescriptor(object);\\n\\t\\t\\taddAttributesPropertyDescriptor(object);\\n\\t\\t\\taddSupertypePropertyDescriptor(object);\\n\\t/**\\n\\t * This adds a property descriptor for the Associated Types feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addAssociatedTypesPropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_DTO_associatedTypes_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_associatedTypes_feature\\\", \\\"_UI_DTO_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__ASSOCIATED_TYPES, true, false,\\n\\t\\t\\t\\ttrue, null, null, null));\\n\\t}\\n\\n\\t/**\\n\\t * This adds a property descriptor for the Properties feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addPropertiesPropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_DTO_properties_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_properties_feature\\\", \\\"_UI_DTO_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__PROPERTIES, false, false,\\n\\t\\t\\t\\tfalse, null, null, null));\\n\\t}\\n\\n\\t/**\\n\\t * This adds a property descriptor for the References feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addReferencesPropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_DTO_references_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_references_feature\\\", \\\"_UI_DTO_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__REFERENCES, false, false,\\n\\t\\t\\t\\tfalse, null, null, null));\\n\\t}\\n\\n\\t/**\\n\\t * This adds a property descriptor for the Attributes feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addAttributesPropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_DTO_attributes_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_attributes_feature\\\", \\\"_UI_DTO_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__ATTRIBUTES, false, false,\\n\\t\\t\\t\\tfalse, null, null, null));\\n\\t}\\n\\n\\t/**\\n\\t * This adds a property descriptor for the Supertype feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addSupertypePropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_DTO_supertype_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_supertype_feature\\\", \\\"_UI_DTO_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__SUPERTYPE, true, false, true,\\n\\t\\t\\t\\tnull, null, null));\\n\\t}\\n\\n\\t\\t\\tchildrenFeatures\\n\\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.DTO__OWNED_REFERENCES);\\n\\t\\t\\tchildrenFeatures\\n\\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.DTO__OWNED_ATTRIBUTES);\\n\\t\\tcase EnvironmentPackage.DTO__OWNED_REFERENCES:\\n\\t\\tcase EnvironmentPackage.DTO__OWNED_ATTRIBUTES:\\n\\n\\t\\tnewChildDescriptors.add(createChildParameter(\\n\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__OWNED_REFERENCES,\\n\\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createReference()));\\n\\n\\t\\tnewChildDescriptors.add(createChildParameter(\\n\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__OWNED_ATTRIBUTES,\\n\\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createAttribute()));\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_DTO_associatedTypes_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_associatedTypes_feature\\\", \\\"_UI_DTO_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__ASSOCIATED_TYPES, true, false,\\n\\t\\t\\t\\ttrue, null, null, null));\",\n \"signature\": \"void addAssociatedTypesPropertyDescriptor(Object object)\"\n },\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_DTO_properties_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_properties_feature\\\", \\\"_UI_DTO_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__PROPERTIES, false, false,\\n\\t\\t\\t\\tfalse, null, null, null));\",\n \"signature\": \"void addPropertiesPropertyDescriptor(Object object)\"\n },\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_DTO_references_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_references_feature\\\", \\\"_UI_DTO_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__REFERENCES, false, false,\\n\\t\\t\\t\\tfalse, null, null, null));\",\n \"signature\": \"void addReferencesPropertyDescriptor(Object object)\"\n },\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_DTO_attributes_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_attributes_feature\\\", \\\"_UI_DTO_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__ATTRIBUTES, false, false,\\n\\t\\t\\t\\tfalse, null, null, null));\",\n \"signature\": \"void addAttributesPropertyDescriptor(Object object)\"\n },\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/DTOItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_DTO_supertype_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_supertype_feature\\\", \\\"_UI_DTO_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__SUPERTYPE, true, false, true,\\n\\t\\t\\t\\tnull, null, null));\",\n \"signature\": \"void addSupertypePropertyDescriptor(Object object)\"\n }\n ],\n \"patch\": \"@@ -67,105 +67,10 @@ public List getPropertyDescriptors(Object object) {\\n \\t\\tif (itemPropertyDescriptors == null) {\\n \\t\\t\\tsuper.getPropertyDescriptors(object);\\n \\n-\\t\\t\\taddAssociatedTypesPropertyDescriptor(object);\\n-\\t\\t\\taddPropertiesPropertyDescriptor(object);\\n-\\t\\t\\taddReferencesPropertyDescriptor(object);\\n-\\t\\t\\taddAttributesPropertyDescriptor(object);\\n-\\t\\t\\taddSupertypePropertyDescriptor(object);\\n \\t\\t}\\n \\t\\treturn itemPropertyDescriptors;\\n \\t}\\n \\n-\\t/**\\n-\\t * This adds a property descriptor for the Associated Types feature.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprotected void addAssociatedTypesPropertyDescriptor(Object object) {\\n-\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n-\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n-\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n-\\t\\t\\t\\tgetResourceLocator(),\\n-\\t\\t\\t\\tgetString(\\\"_UI_DTO_associatedTypes_feature\\\"),\\n-\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n-\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_associatedTypes_feature\\\", \\\"_UI_DTO_type\\\"),\\n-\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__ASSOCIATED_TYPES, true, false,\\n-\\t\\t\\t\\ttrue, null, null, null));\\n-\\t}\\n-\\n-\\t/**\\n-\\t * This adds a property descriptor for the Properties feature.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprotected void addPropertiesPropertyDescriptor(Object object) {\\n-\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n-\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n-\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n-\\t\\t\\t\\tgetResourceLocator(),\\n-\\t\\t\\t\\tgetString(\\\"_UI_DTO_properties_feature\\\"),\\n-\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n-\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_properties_feature\\\", \\\"_UI_DTO_type\\\"),\\n-\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__PROPERTIES, false, false,\\n-\\t\\t\\t\\tfalse, null, null, null));\\n-\\t}\\n-\\n-\\t/**\\n-\\t * This adds a property descriptor for the References feature.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprotected void addReferencesPropertyDescriptor(Object object) {\\n-\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n-\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n-\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n-\\t\\t\\t\\tgetResourceLocator(),\\n-\\t\\t\\t\\tgetString(\\\"_UI_DTO_references_feature\\\"),\\n-\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n-\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_references_feature\\\", \\\"_UI_DTO_type\\\"),\\n-\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__REFERENCES, false, false,\\n-\\t\\t\\t\\tfalse, null, null, null));\\n-\\t}\\n-\\n-\\t/**\\n-\\t * This adds a property descriptor for the Attributes feature.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprotected void addAttributesPropertyDescriptor(Object object) {\\n-\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n-\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n-\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n-\\t\\t\\t\\tgetResourceLocator(),\\n-\\t\\t\\t\\tgetString(\\\"_UI_DTO_attributes_feature\\\"),\\n-\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n-\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_attributes_feature\\\", \\\"_UI_DTO_type\\\"),\\n-\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__ATTRIBUTES, false, false,\\n-\\t\\t\\t\\tfalse, null, null, null));\\n-\\t}\\n-\\n-\\t/**\\n-\\t * This adds a property descriptor for the Supertype feature.\\n-\\t * \\n-\\t * \\n-\\t * @generated\\n-\\t */\\n-\\tprotected void addSupertypePropertyDescriptor(Object object) {\\n-\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n-\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n-\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n-\\t\\t\\t\\tgetResourceLocator(),\\n-\\t\\t\\t\\tgetString(\\\"_UI_DTO_supertype_feature\\\"),\\n-\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n-\\t\\t\\t\\t\\t\\t\\\"_UI_DTO_supertype_feature\\\", \\\"_UI_DTO_type\\\"),\\n-\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__SUPERTYPE, true, false, true,\\n-\\t\\t\\t\\tnull, null, null));\\n-\\t}\\n-\\n \\t/**\\n \\t * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an\\n \\t * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or\\n@@ -181,10 +86,6 @@ public Collection getChildrenFeatures(\\n \\t\\t\\tsuper.getChildrenFeatures(object);\\n \\t\\t\\tchildrenFeatures\\n \\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.DTO__OWNED_CONTAINER);\\n-\\t\\t\\tchildrenFeatures\\n-\\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.DTO__OWNED_REFERENCES);\\n-\\t\\t\\tchildrenFeatures\\n-\\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.DTO__OWNED_ATTRIBUTES);\\n \\t\\t}\\n \\t\\treturn childrenFeatures;\\n \\t}\\n@@ -250,8 +151,6 @@ public void notifyChanged(Notification notification) {\\n \\n \\t\\tswitch (notification.getFeatureID(DTO.class)) {\\n \\t\\tcase EnvironmentPackage.DTO__OWNED_CONTAINER:\\n-\\t\\tcase EnvironmentPackage.DTO__OWNED_REFERENCES:\\n-\\t\\tcase EnvironmentPackage.DTO__OWNED_ATTRIBUTES:\\n \\t\\t\\tfireNotifyChanged(new ViewerNotification(notification,\\n \\t\\t\\t\\t\\tnotification.getNotifier(), true, false));\\n \\t\\t\\treturn;\\n@@ -274,14 +173,6 @@ protected void collectNewChildDescriptors(\\n \\t\\tnewChildDescriptors.add(createChildParameter(\\n \\t\\t\\t\\tEnvironmentPackage.Literals.DTO__OWNED_CONTAINER,\\n \\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createFilterContainer()));\\n-\\n-\\t\\tnewChildDescriptors.add(createChildParameter(\\n-\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__OWNED_REFERENCES,\\n-\\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createReference()));\\n-\\n-\\t\\tnewChildDescriptors.add(createChildParameter(\\n-\\t\\t\\t\\tEnvironmentPackage.Literals.DTO__OWNED_ATTRIBUTES,\\n-\\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createAttribute()));\\n \\t}\\n \\n }\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FDTOItemProvider.java\",\n \"sha\": \"0194d6e73db3792fe3e091265b8aeb5baaa58ee7\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 34,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FEnvironmentItemProvider.java\",\n \"changes\": 34,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FEnvironmentItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/EnvironmentItemProvider.java\",\n \"new_code\": \"\\t\\t\\tchildrenFeatures\\n\\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES);\\n\\t\\tcase EnvironmentPackage.ENVIRONMENT__NAMESPACES:\\n\\n\\t\\tnewChildDescriptors.add(createChildParameter(\\n\\t\\t\\t\\tEnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION,\\n\\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createNamespace()));\\n\\n\\t\\tnewChildDescriptors.add(createChildParameter(\\n\\t\\t\\t\\tEnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES,\\n\\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createNamespace()));\\n\\t}\\n\\n\\t/**\\n\\t * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\t@Override\\n\\tpublic String getCreateChildText(Object owner, Object feature,\\n\\t\\t\\tObject child, Collection selection) {\\n\\t\\tObject childFeature = feature;\\n\\t\\tObject childObject = child;\\n\\n\\t\\tboolean qualify = childFeature == EnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION\\n\\t\\t\\t\\t|| childFeature == EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES;\\n\\n\\t\\tif (qualify) {\\n\\t\\t\\treturn getString(\\\"_UI_CreateChild_text2\\\", new Object[] {\\n\\t\\t\\t\\t\\tgetTypeText(childObject), getFeatureText(childFeature),\\n\\t\\t\\t\\t\\tgetTypeText(owner) });\\n\\t\\t}\\n\\t\\treturn super.getCreateChildText(owner, feature, child, selection);\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"Object owner\",\n \" Object feature\",\n \"\\n\\t\\t\\tObject child\",\n \" Collection selection\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/EnvironmentItemProvider.java\",\n \"implementation\": \"Object childFeature = feature;\\n\\t\\tObject childObject = child;\\n\\n\\t\\tboolean qualify = childFeature == EnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION\\n\\t\\t\\t\\t|| childFeature == EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES;\\n\\n\\t\\tif (qualify) {\\n\\t\\t\\treturn getString(\\\"_UI_CreateChild_text2\\\", new Object[] {\\n\\t\\t\\t\\t\\tgetTypeText(childObject), getFeatureText(childFeature),\\n\\t\\t\\t\\t\\tgetTypeText(owner)\",\n \"signature\": \"String getCreateChildText(Object owner, Object feature,\\n\\t\\t\\tObject child, Collection selection)\"\n }\n ],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -115,6 +115,8 @@ public Collection getChildrenFeatures(\\n \\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.ENVIRONMENT__PRIORITY_DEFINITIONS);\\n \\t\\t\\tchildrenFeatures\\n \\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION);\\n+\\t\\t\\tchildrenFeatures\\n+\\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES);\\n \\t\\t}\\n \\t\\treturn childrenFeatures;\\n \\t}\\n@@ -187,6 +189,7 @@ public void notifyChanged(Notification notification) {\\n \\t\\tcase EnvironmentPackage.ENVIRONMENT__LINKS:\\n \\t\\tcase EnvironmentPackage.ENVIRONMENT__PRIORITY_DEFINITIONS:\\n \\t\\tcase EnvironmentPackage.ENVIRONMENT__TYPES_DEFINITION:\\n+\\t\\tcase EnvironmentPackage.ENVIRONMENT__NAMESPACES:\\n \\t\\t\\tfireNotifyChanged(new ViewerNotification(notification,\\n \\t\\t\\t\\t\\tnotification.getNotifier(), true, false));\\n \\t\\t\\treturn;\\n@@ -217,6 +220,37 @@ protected void collectNewChildDescriptors(\\n \\t\\tnewChildDescriptors.add(createChildParameter(\\n \\t\\t\\t\\tEnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION,\\n \\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createTypesDefinition()));\\n+\\n+\\t\\tnewChildDescriptors.add(createChildParameter(\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION,\\n+\\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createNamespace()));\\n+\\n+\\t\\tnewChildDescriptors.add(createChildParameter(\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES,\\n+\\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createNamespace()));\\n+\\t}\\n+\\n+\\t/**\\n+\\t * This returns the label text for {@link org.eclipse.emf.edit.command.CreateChildCommand}.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\t@Override\\n+\\tpublic String getCreateChildText(Object owner, Object feature,\\n+\\t\\t\\tObject child, Collection selection) {\\n+\\t\\tObject childFeature = feature;\\n+\\t\\tObject childObject = child;\\n+\\n+\\t\\tboolean qualify = childFeature == EnvironmentPackage.Literals.ENVIRONMENT__TYPES_DEFINITION\\n+\\t\\t\\t\\t|| childFeature == EnvironmentPackage.Literals.ENVIRONMENT__NAMESPACES;\\n+\\n+\\t\\tif (qualify) {\\n+\\t\\t\\treturn getString(\\\"_UI_CreateChild_text2\\\", new Object[] {\\n+\\t\\t\\t\\t\\tgetTypeText(childObject), getFeatureText(childFeature),\\n+\\t\\t\\t\\t\\tgetTypeText(owner) });\\n+\\t\\t}\\n+\\t\\treturn super.getCreateChildText(owner, feature, child, selection);\\n \\t}\\n \\n }\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FEnvironmentItemProvider.java\",\n \"sha\": \"151eb2014526605c87883bc9e12e8c5fd89232f8\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FNamespaceItemProvider.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FNamespaceItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 3,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/NamespaceItemProvider.java\",\n \"new_code\": \"public class NamespaceItemProvider extends TypesDefinitionItemProvider\\n\\t\\timplements IEditingDomainItemProvider, IStructuredItemContentProvider,\\n\\t\\t\\tif (ns.getOwnedNamespaces().isEmpty() && ns.getTypes().isEmpty()) {\",\n \"new_methods\": [],\n \"old_code\": \"public class NamespaceItemProvider extends ObeoDSMObjectItemProvider implements\\n\\t\\tIEditingDomainItemProvider, IStructuredItemContentProvider,\\n\\t\\t\\tif (ns.getOwnedNamespaces().size() == 0) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -37,8 +37,8 @@\\n * \\n * @generated\\n */\\n-public class NamespaceItemProvider extends ObeoDSMObjectItemProvider implements\\n-\\t\\tIEditingDomainItemProvider, IStructuredItemContentProvider,\\n+public class NamespaceItemProvider extends TypesDefinitionItemProvider\\n+\\t\\timplements IEditingDomainItemProvider, IStructuredItemContentProvider,\\n \\t\\tITreeItemContentProvider, IItemLabelProvider, IItemPropertySource {\\n \\t/**\\n \\t * \\n@@ -133,7 +133,7 @@ protected EStructuralFeature getChildFeature(Object object, Object child) {\\n \\tpublic Object getImage(Object object) {\\n \\t\\tif (object instanceof Namespace) {\\n \\t\\t\\tNamespace ns = (Namespace) object;\\n-\\t\\t\\tif (ns.getOwnedNamespaces().size() == 0) {\\n+\\t\\t\\tif (ns.getOwnedNamespaces().isEmpty() && ns.getTypes().isEmpty()) {\\n \\t\\t\\t\\treturn overlayImage(\\n \\t\\t\\t\\t\\t\\tobject,\\n \\t\\t\\t\\t\\t\\tgetResourceLocator().getImage(\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FNamespaceItemProvider.java\",\n \"sha\": \"9b0dd19622538e630caefefe0417fb4388831c3d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 22,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FPropertyItemProvider.java\",\n \"changes\": 22,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FPropertyItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/PropertyItemProvider.java\",\n \"new_code\": \"\\t\\t\\taddIsIdentifierPropertyDescriptor(object);\\n\\t/**\\n\\t * This adds a property descriptor for the Is Identifier feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addIsIdentifierPropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_Property_isIdentifier_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_Property_isIdentifier_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_Property_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.PROPERTY__IS_IDENTIFIER, true,\\n\\t\\t\\t\\tfalse, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,\\n\\t\\t\\t\\tnull));\\n\\t}\\n\\n\\t\\tcase EnvironmentPackage.PROPERTY__IS_IDENTIFIER:\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/PropertyItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_Property_isIdentifier_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_Property_isIdentifier_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_Property_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.PROPERTY__IS_IDENTIFIER, true,\\n\\t\\t\\t\\tfalse, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,\\n\\t\\t\\t\\tnull));\",\n \"signature\": \"void addIsIdentifierPropertyDescriptor(Object object)\"\n }\n ],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -68,6 +68,7 @@ public List getPropertyDescriptors(Object object) {\\n \\n \\t\\t\\taddNamePropertyDescriptor(object);\\n \\t\\t\\taddMultiplicityPropertyDescriptor(object);\\n+\\t\\t\\taddIsIdentifierPropertyDescriptor(object);\\n \\t\\t}\\n \\t\\treturn itemPropertyDescriptors;\\n \\t}\\n@@ -110,6 +111,26 @@ protected void addMultiplicityPropertyDescriptor(Object object) {\\n \\t\\t\\t\\tnull));\\n \\t}\\n \\n+\\t/**\\n+\\t * This adds a property descriptor for the Is Identifier feature.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\tprotected void addIsIdentifierPropertyDescriptor(Object object) {\\n+\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n+\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n+\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n+\\t\\t\\t\\tgetResourceLocator(),\\n+\\t\\t\\t\\tgetString(\\\"_UI_Property_isIdentifier_feature\\\"),\\n+\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_Property_isIdentifier_feature\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_Property_type\\\"),\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.PROPERTY__IS_IDENTIFIER, true,\\n+\\t\\t\\t\\tfalse, false, ItemPropertyDescriptor.BOOLEAN_VALUE_IMAGE, null,\\n+\\t\\t\\t\\tnull));\\n+\\t}\\n+\\n \\t/**\\n \\t * \\n \\t * \\n@@ -147,6 +168,7 @@ public void notifyChanged(Notification notification) {\\n \\t\\tswitch (notification.getFeatureID(Property.class)) {\\n \\t\\tcase EnvironmentPackage.PROPERTY__NAME:\\n \\t\\tcase EnvironmentPackage.PROPERTY__MULTIPLICITY:\\n+\\t\\tcase EnvironmentPackage.PROPERTY__IS_IDENTIFIER:\\n \\t\\t\\tfireNotifyChanged(new ViewerNotification(notification,\\n \\t\\t\\t\\t\\tnotification.getNotifier(), false, true));\\n \\t\\t\\treturn;\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FPropertyItemProvider.java\",\n \"sha\": \"a61e66ba718b9fbf660e3c431e3bc595f7733831\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 15,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FReferenceItemProvider.java\",\n \"changes\": 32,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FReferenceItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 17,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/ReferenceItemProvider.java\",\n \"new_code\": \"\\t\\t\\taddReferencedTypePropertyDescriptor(object);\\n\\t\\t\\tprotected Collection getComboBoxObjects(Object object) {\\n\\t\\t\\t\\tCollection result = new ArrayList();\\n\\t\\t\\t\\t\\tCollection collection = super.getComboBoxObjects(object);\\n\\t\\t\\t\\t\\tfor (Object object2 : collection) {\\n\\t\\t\\t\\t\\t\\tEObject elem = (EObject)object2;\\n\\t\\t\\t\\t\\t\\tif (elem != null && elem instanceof Reference && ((Reference) elem).canBeOppositeOf((Reference) object)) {\\n\\t\\t\\t\\t\\t\\t\\tresult.add((Reference)elem);\\n\\t * This adds a property descriptor for the Referenced Type feature.\\n\\tprotected void addReferencedTypePropertyDescriptor(Object object) {\\n\\t\\t\\t\\tgetString(\\\"_UI_Reference_referencedType_feature\\\"),\\n\\t\\t\\t\\t\\t\\t\\\"_UI_Reference_referencedType_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_Reference_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.REFERENCE__REFERENCED_TYPE, true,\\n\\t\\t\\t\\tfalse, true, null, null, null));\",\n \"new_methods\": [],\n \"old_code\": \"\\t\\t\\taddTypePropertyDescriptor(object);\\n\\t\\t\\tprotected Collection getComboBoxObjects(Object object) {\\n\\t\\t\\t\\tCollection result = new ArrayList();\\n\\t\\t\\t\\t\\tCollection collection = super.getComboBoxObjects(object);\\n\\t\\t\\t\\t\\tfor (Iterator iter = collection.iterator(); iter.hasNext();) {\\n\\t\\t\\t\\t\\t\\tEObject elem = (EObject) iter.next();\\n\\t\\t\\t\\t\\t\\tif (elem != null\\n\\t\\t\\t\\t\\t\\t\\t\\t&& elem instanceof Reference\\n\\t\\t\\t\\t\\t\\t\\t\\t&& ((Reference) elem)\\n\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t.canBeOppositeOf((Reference) object)) {\\n\\t\\t\\t\\t\\t\\t\\tresult.add(elem);\\n\\t * This adds a property descriptor for the Type feature.\\n\\tprotected void addTypePropertyDescriptor(Object object) {\\n\\t\\t\\t\\tgetString(\\\"_UI_Reference_type_feature\\\"),\\n\\t\\t\\t\\t\\t\\t\\\"_UI_Reference_type_feature\\\", \\\"_UI_Reference_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.REFERENCE__TYPE, true, false, true,\\n\\t\\t\\t\\tnull, null, null));\",\n \"old_methods\": [],\n \"patch\": \"@@ -72,7 +72,7 @@ public List getPropertyDescriptors(Object object) {\\n \\t\\t\\taddIsCompositePropertyDescriptor(object);\\n \\t\\t\\taddNavigablePropertyDescriptor(object);\\n \\t\\t\\taddOppositeOfPropertyDescriptor(object);\\n-\\t\\t\\taddTypePropertyDescriptor(object);\\n+\\t\\t\\taddReferencedTypePropertyDescriptor(object);\\n \\t\\t}\\n \\t\\treturn itemPropertyDescriptors;\\n \\t}\\n@@ -135,20 +135,17 @@ protected void addOppositeOfPropertyDescriptor(Object object) {\\n \\t\\t\\t\\tEnvironmentPackage.Literals.REFERENCE__OPPOSITE_OF, true,\\n \\t\\t\\t\\tfalse, true, null, null, null) {\\n \\n-\\t\\t\\tprotected Collection getComboBoxObjects(Object object) {\\n+\\t\\t\\tprotected Collection getComboBoxObjects(Object object) {\\n \\n-\\t\\t\\t\\tCollection result = new ArrayList();\\n+\\t\\t\\t\\tCollection result = new ArrayList();\\n \\t\\t\\t\\t// We always offer an empty choice\\n \\t\\t\\t\\tresult.add(null);\\n \\t\\t\\t\\tif (object instanceof Reference) {\\n-\\t\\t\\t\\t\\tCollection collection = super.getComboBoxObjects(object);\\n-\\t\\t\\t\\t\\tfor (Iterator iter = collection.iterator(); iter.hasNext();) {\\n-\\t\\t\\t\\t\\t\\tEObject elem = (EObject) iter.next();\\n-\\t\\t\\t\\t\\t\\tif (elem != null\\n-\\t\\t\\t\\t\\t\\t\\t\\t&& elem instanceof Reference\\n-\\t\\t\\t\\t\\t\\t\\t\\t&& ((Reference) elem)\\n-\\t\\t\\t\\t\\t\\t\\t\\t\\t\\t.canBeOppositeOf((Reference) object)) {\\n-\\t\\t\\t\\t\\t\\t\\tresult.add(elem);\\n+\\t\\t\\t\\t\\tCollection collection = super.getComboBoxObjects(object);\\n+\\t\\t\\t\\t\\tfor (Object object2 : collection) {\\n+\\t\\t\\t\\t\\t\\tEObject elem = (EObject)object2;\\n+\\t\\t\\t\\t\\t\\tif (elem != null && elem instanceof Reference && ((Reference) elem).canBeOppositeOf((Reference) object)) {\\n+\\t\\t\\t\\t\\t\\t\\tresult.add((Reference)elem);\\n \\t\\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t}\\n@@ -159,21 +156,22 @@ protected Collection getComboBoxObjects(Object object) {\\n \\t}\\n \\n \\t/**\\n-\\t * This adds a property descriptor for the Type feature.\\n+\\t * This adds a property descriptor for the Referenced Type feature.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t */\\n-\\tprotected void addTypePropertyDescriptor(Object object) {\\n+\\tprotected void addReferencedTypePropertyDescriptor(Object object) {\\n \\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n \\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n \\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n \\t\\t\\t\\tgetResourceLocator(),\\n-\\t\\t\\t\\tgetString(\\\"_UI_Reference_type_feature\\\"),\\n+\\t\\t\\t\\tgetString(\\\"_UI_Reference_referencedType_feature\\\"),\\n \\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n-\\t\\t\\t\\t\\t\\t\\\"_UI_Reference_type_feature\\\", \\\"_UI_Reference_type\\\"),\\n-\\t\\t\\t\\tEnvironmentPackage.Literals.REFERENCE__TYPE, true, false, true,\\n-\\t\\t\\t\\tnull, null, null));\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_Reference_referencedType_feature\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_Reference_type\\\"),\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.REFERENCE__REFERENCED_TYPE, true,\\n+\\t\\t\\t\\tfalse, true, null, null, null));\\n \\t}\\n \\n \\t/**\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FReferenceItemProvider.java\",\n \"sha\": \"8590de77ed3d19187bac61f0dc23e52f9e8283e7\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 155,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FStructuredTypeItemProvider.java\",\n \"changes\": 155,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FStructuredTypeItemProvider.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java\",\n \"new_code\": \"import org.eclipse.emf.ecore.EStructuralFeature;\\nimport org.eclipse.emf.edit.provider.ComposeableAdapterFactory;\\nimport org.eclipse.emf.edit.provider.ViewerNotification;\\nimport org.obeonetwork.dsl.environment.EnvironmentFactory;\\nimport org.obeonetwork.dsl.environment.EnvironmentPackage;\\n\\t\\t\\taddSupertypePropertyDescriptor(object);\\n\\t\\t\\taddAssociatedTypesPropertyDescriptor(object);\\n\\t\\t\\taddAttributesPropertyDescriptor(object);\\n\\t\\t\\taddReferencesPropertyDescriptor(object);\\n\\t\\t\\taddPropertiesPropertyDescriptor(object);\\n\\t/**\\n\\t * This adds a property descriptor for the Supertype feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addSupertypePropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_supertype_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_supertype_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__SUPERTYPE, true,\\n\\t\\t\\t\\tfalse, true, null, null, null));\\n\\t}\\n\\n\\t/**\\n\\t * This adds a property descriptor for the Associated Types feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addAssociatedTypesPropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_associatedTypes_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_associatedTypes_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ASSOCIATED_TYPES,\\n\\t\\t\\t\\ttrue, false, true, null, null, null));\\n\\t}\\n\\n\\t/**\\n\\t * This adds a property descriptor for the Attributes feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addAttributesPropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_attributes_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_attributes_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ATTRIBUTES, false,\\n\\t\\t\\t\\tfalse, false, null, null, null));\\n\\t}\\n\\n\\t/**\\n\\t * This adds a property descriptor for the References feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addReferencesPropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_references_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_references_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__REFERENCES, false,\\n\\t\\t\\t\\tfalse, false, null, null, null));\\n\\t}\\n\\n\\t/**\\n\\t * This adds a property descriptor for the Properties feature.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\tprotected void addPropertiesPropertyDescriptor(Object object) {\\n\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_properties_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_properties_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__PROPERTIES, false,\\n\\t\\t\\t\\tfalse, false, null, null, null));\\n\\t}\\n\\n\\t/**\\n\\t * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an\\n\\t * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or\\n\\t * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\t@Override\\n\\tpublic Collection getChildrenFeatures(\\n\\t\\t\\tObject object) {\\n\\t\\tif (childrenFeatures == null) {\\n\\t\\t\\tsuper.getChildrenFeatures(object);\\n\\t\\t\\tchildrenFeatures\\n\\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_ATTRIBUTES);\\n\\t\\t\\tchildrenFeatures\\n\\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_REFERENCES);\\n\\t\\t}\\n\\t\\treturn childrenFeatures;\\n\\t}\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t */\\n\\t@Override\\n\\tprotected EStructuralFeature getChildFeature(Object object, Object child) {\\n\\t\\t// Check the type of the specified child object and return the proper feature to use for\\n\\t\\t// adding (see {@link AddCommand}) it as a child.\\n\\n\\t\\treturn super.getChildFeature(object, child);\\n\\t}\\n\\n\\n\\t\\tswitch (notification.getFeatureID(StructuredType.class)) {\\n\\t\\tcase EnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES:\\n\\t\\tcase EnvironmentPackage.STRUCTURED_TYPE__OWNED_REFERENCES:\\n\\t\\t\\tfireNotifyChanged(new ViewerNotification(notification,\\n\\t\\t\\t\\t\\tnotification.getNotifier(), true, false));\\n\\t\\t\\treturn;\\n\\t\\t}\\n\\n\\t\\tnewChildDescriptors.add(createChildParameter(\\n\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_ATTRIBUTES,\\n\\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createAttribute()));\\n\\n\\t\\tnewChildDescriptors.add(createChildParameter(\\n\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_REFERENCES,\\n\\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createReference()));\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_supertype_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_supertype_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__SUPERTYPE, true,\\n\\t\\t\\t\\tfalse, true, null, null, null));\",\n \"signature\": \"void addSupertypePropertyDescriptor(Object object)\"\n },\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_associatedTypes_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_associatedTypes_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ASSOCIATED_TYPES,\\n\\t\\t\\t\\ttrue, false, true, null, null, null));\",\n \"signature\": \"void addAssociatedTypesPropertyDescriptor(Object object)\"\n },\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_attributes_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_attributes_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ATTRIBUTES, false,\\n\\t\\t\\t\\tfalse, false, null, null, null));\",\n \"signature\": \"void addAttributesPropertyDescriptor(Object object)\"\n },\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_references_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_references_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__REFERENCES, false,\\n\\t\\t\\t\\tfalse, false, null, null, null));\",\n \"signature\": \"void addReferencesPropertyDescriptor(Object object)\"\n },\n {\n \"arguments\": [\n \"Object object\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java\",\n \"implementation\": \"itemPropertyDescriptors.add(createItemPropertyDescriptor(\\n\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n\\t\\t\\t\\tgetResourceLocator(),\\n\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_properties_feature\\\"),\\n\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_properties_feature\\\",\\n\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__PROPERTIES, false,\\n\\t\\t\\t\\tfalse, false, null, null, null));\",\n \"signature\": \"void addPropertiesPropertyDescriptor(Object object)\"\n },\n {\n \"arguments\": [\n \"Object object\",\n \" Object child\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.edit/src/org/obeonetwork/dsl/environment/provider/StructuredTypeItemProvider.java\",\n \"implementation\": \"// Check the type of the specified child object and return the proper feature to use for\\n\\t\\t// adding (see {@link AddCommand\",\n \"signature\": \"EStructuralFeature getChildFeature(Object object, Object child)\"\n }\n ],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -17,12 +17,17 @@\\n \\n import org.eclipse.emf.common.notify.AdapterFactory;\\n import org.eclipse.emf.common.notify.Notification;\\n+import org.eclipse.emf.ecore.EStructuralFeature;\\n+import org.eclipse.emf.edit.provider.ComposeableAdapterFactory;\\n import org.eclipse.emf.edit.provider.IEditingDomainItemProvider;\\n import org.eclipse.emf.edit.provider.IItemLabelProvider;\\n import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;\\n import org.eclipse.emf.edit.provider.IItemPropertySource;\\n import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;\\n import org.eclipse.emf.edit.provider.ITreeItemContentProvider;\\n+import org.eclipse.emf.edit.provider.ViewerNotification;\\n+import org.obeonetwork.dsl.environment.EnvironmentFactory;\\n+import org.obeonetwork.dsl.environment.EnvironmentPackage;\\n import org.obeonetwork.dsl.environment.StructuredType;\\n \\n /**\\n@@ -62,10 +67,144 @@ public List getPropertyDescriptors(Object object) {\\n \\t\\tif (itemPropertyDescriptors == null) {\\n \\t\\t\\tsuper.getPropertyDescriptors(object);\\n \\n+\\t\\t\\taddSupertypePropertyDescriptor(object);\\n+\\t\\t\\taddAssociatedTypesPropertyDescriptor(object);\\n+\\t\\t\\taddAttributesPropertyDescriptor(object);\\n+\\t\\t\\taddReferencesPropertyDescriptor(object);\\n+\\t\\t\\taddPropertiesPropertyDescriptor(object);\\n \\t\\t}\\n \\t\\treturn itemPropertyDescriptors;\\n \\t}\\n \\n+\\t/**\\n+\\t * This adds a property descriptor for the Supertype feature.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\tprotected void addSupertypePropertyDescriptor(Object object) {\\n+\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n+\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n+\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n+\\t\\t\\t\\tgetResourceLocator(),\\n+\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_supertype_feature\\\"),\\n+\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_supertype_feature\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__SUPERTYPE, true,\\n+\\t\\t\\t\\tfalse, true, null, null, null));\\n+\\t}\\n+\\n+\\t/**\\n+\\t * This adds a property descriptor for the Associated Types feature.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\tprotected void addAssociatedTypesPropertyDescriptor(Object object) {\\n+\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n+\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n+\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n+\\t\\t\\t\\tgetResourceLocator(),\\n+\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_associatedTypes_feature\\\"),\\n+\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_associatedTypes_feature\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ASSOCIATED_TYPES,\\n+\\t\\t\\t\\ttrue, false, true, null, null, null));\\n+\\t}\\n+\\n+\\t/**\\n+\\t * This adds a property descriptor for the Attributes feature.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\tprotected void addAttributesPropertyDescriptor(Object object) {\\n+\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n+\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n+\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n+\\t\\t\\t\\tgetResourceLocator(),\\n+\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_attributes_feature\\\"),\\n+\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_attributes_feature\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__ATTRIBUTES, false,\\n+\\t\\t\\t\\tfalse, false, null, null, null));\\n+\\t}\\n+\\n+\\t/**\\n+\\t * This adds a property descriptor for the References feature.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\tprotected void addReferencesPropertyDescriptor(Object object) {\\n+\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n+\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n+\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n+\\t\\t\\t\\tgetResourceLocator(),\\n+\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_references_feature\\\"),\\n+\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_references_feature\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__REFERENCES, false,\\n+\\t\\t\\t\\tfalse, false, null, null, null));\\n+\\t}\\n+\\n+\\t/**\\n+\\t * This adds a property descriptor for the Properties feature.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\tprotected void addPropertiesPropertyDescriptor(Object object) {\\n+\\t\\titemPropertyDescriptors.add(createItemPropertyDescriptor(\\n+\\t\\t\\t\\t((ComposeableAdapterFactory) adapterFactory)\\n+\\t\\t\\t\\t\\t\\t.getRootAdapterFactory(),\\n+\\t\\t\\t\\tgetResourceLocator(),\\n+\\t\\t\\t\\tgetString(\\\"_UI_StructuredType_properties_feature\\\"),\\n+\\t\\t\\t\\tgetString(\\\"_UI_PropertyDescriptor_description\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_properties_feature\\\",\\n+\\t\\t\\t\\t\\t\\t\\\"_UI_StructuredType_type\\\"),\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__PROPERTIES, false,\\n+\\t\\t\\t\\tfalse, false, null, null, null));\\n+\\t}\\n+\\n+\\t/**\\n+\\t * This specifies how to implement {@link #getChildren} and is used to deduce an appropriate feature for an\\n+\\t * {@link org.eclipse.emf.edit.command.AddCommand}, {@link org.eclipse.emf.edit.command.RemoveCommand} or\\n+\\t * {@link org.eclipse.emf.edit.command.MoveCommand} in {@link #createCommand}.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\t@Override\\n+\\tpublic Collection getChildrenFeatures(\\n+\\t\\t\\tObject object) {\\n+\\t\\tif (childrenFeatures == null) {\\n+\\t\\t\\tsuper.getChildrenFeatures(object);\\n+\\t\\t\\tchildrenFeatures\\n+\\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_ATTRIBUTES);\\n+\\t\\t\\tchildrenFeatures\\n+\\t\\t\\t\\t\\t.add(EnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_REFERENCES);\\n+\\t\\t}\\n+\\t\\treturn childrenFeatures;\\n+\\t}\\n+\\n+\\t/**\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t */\\n+\\t@Override\\n+\\tprotected EStructuralFeature getChildFeature(Object object, Object child) {\\n+\\t\\t// Check the type of the specified child object and return the proper feature to use for\\n+\\t\\t// adding (see {@link AddCommand}) it as a child.\\n+\\n+\\t\\treturn super.getChildFeature(object, child);\\n+\\t}\\n+\\n \\t/**\\n \\t * \\n \\t * \\n@@ -99,6 +238,14 @@ public String getText(Object object) {\\n \\t@Override\\n \\tpublic void notifyChanged(Notification notification) {\\n \\t\\tupdateChildren(notification);\\n+\\n+\\t\\tswitch (notification.getFeatureID(StructuredType.class)) {\\n+\\t\\tcase EnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES:\\n+\\t\\tcase EnvironmentPackage.STRUCTURED_TYPE__OWNED_REFERENCES:\\n+\\t\\t\\tfireNotifyChanged(new ViewerNotification(notification,\\n+\\t\\t\\t\\t\\tnotification.getNotifier(), true, false));\\n+\\t\\t\\treturn;\\n+\\t\\t}\\n \\t\\tsuper.notifyChanged(notification);\\n \\t}\\n \\n@@ -113,6 +260,14 @@ public void notifyChanged(Notification notification) {\\n \\tprotected void collectNewChildDescriptors(\\n \\t\\t\\tCollection newChildDescriptors, Object object) {\\n \\t\\tsuper.collectNewChildDescriptors(newChildDescriptors, object);\\n+\\n+\\t\\tnewChildDescriptors.add(createChildParameter(\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_ATTRIBUTES,\\n+\\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createAttribute()));\\n+\\n+\\t\\tnewChildDescriptors.add(createChildParameter(\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.STRUCTURED_TYPE__OWNED_REFERENCES,\\n+\\t\\t\\t\\tEnvironmentFactory.eINSTANCE.createReference()));\\n \\t}\\n \\n }\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.edit%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fprovider%2FStructuredTypeItemProvider.java\",\n \"sha\": \"bc9f903f86fcda28325fb3e1c84f9899fbc7eb02\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2FMETA-INF%2FMANIFEST.MF\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2FMETA-INF%2FMANIFEST.MF?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 1,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.editor/META-INF/MANIFEST.MF\",\n \"new_code\": \"Bundle-SymbolicName: org.obeonetwork.dsl.environment.editor;singleton:=true\",\n \"new_methods\": [],\n \"old_code\": \"Bundle-SymbolicName: org.obeonetwork.dsl.environment.editor; singleton:=true\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,7 +1,7 @@\\n Manifest-Version: 1.0\\n Bundle-ManifestVersion: 2\\n Bundle-Name: %pluginName\\n-Bundle-SymbolicName: org.obeonetwork.dsl.environment.editor; singleton:=true\\n+Bundle-SymbolicName: org.obeonetwork.dsl.environment.editor;singleton:=true\\n Bundle-Version: 2.4.0.qualifier\\n Bundle-ClassPath: .\\n Bundle-Activator: org.obeonetwork.dsl.environment.presentation.EnvironmentEditorPlugin$Implementation\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2FMETA-INF%2FMANIFEST.MF\",\n \"sha\": \"4ba287555cb7d3a0fad0fcb8b4b097a7e1727879\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 27,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fplugin.xml\",\n \"changes\": 27,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fplugin.xml?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.editor/plugin.xml\",\n \"new_code\": \" \\n \\n \\n \\n %_UI_EnvironmentModelWizard_description\\n \\n \\n \\n\\n \\n \\n \\n \\n \",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -40,4 +40,31 @@\\n contributorClass=\\\"org.obeonetwork.dsl.environment.presentation.EnvironmentActionBarContributor\\\" >\\n \\n \\n+ \\n+ \\n+ \\n+ \\n+ %_UI_EnvironmentModelWizard_description\\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fplugin.xml\",\n \"sha\": \"118aa00d067d98a3d366b70513e85176369623a4\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 43,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fpresentation%2FEnvironmentEditor.java\",\n \"changes\": 84,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fpresentation%2FEnvironmentEditor.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 41,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java\",\n \"new_code\": \"\\tprotected List propertySheetPages = new ArrayList();\\n\\t\\t\\t\\tif (propertySheetPages.contains(((PropertySheet) p)\\n\\t\\t\\t\\t\\t\\t.getCurrentPage())) {\\n\\t\\t\\tresourceToDiagnosticMap.remove(target);\\n\\t\\t\\tif (updateProblemIndication) {\\n\\t\\t\\t\\tgetSite().getShell().getDisplay().asyncExec(new Runnable() {\\n\\t\\t\\t\\t\\tpublic void run() {\\n\\t\\t\\t\\t\\t\\tupdateProblemIndication();\\n\\t\\t\\t\\t\\t}\\n\\t\\t\\t\\t});\\n\\t\\t\\t}\\n\\t\\t\\t\\t\\t\\t\\treturn false;\\n\\t\\t\\t\\t\\t\\tfor (Iterator i = propertySheetPages\\n\\t\\t\\t\\t\\t\\t\\t\\t.iterator(); i.hasNext();) {\\n\\t\\t\\t\\t\\t\\t\\tPropertySheetPage propertySheetPage = i.next();\\n\\t\\t\\t\\t\\t\\t\\tif (propertySheetPage.getControl().isDisposed()) {\\n\\t\\t\\t\\t\\t\\t\\t\\ti.remove();\\n\\t\\t\\t\\t\\t\\t\\t} else {\\n\\t\\t\\t\\t\\t\\t\\t\\tpropertySheetPage.refresh();\\n\\t\\t\\t\\t\\t\\t\\t}\\n\\t\\tPropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(\\n\\t\\t\\t\\teditingDomain) {\\n\\t\\t\\t@Override\\n\\t\\t\\tpublic void setSelectionToViewer(List selection) {\\n\\t\\t\\t\\tEnvironmentEditor.this.setSelectionToViewer(selection);\\n\\t\\t\\t\\tEnvironmentEditor.this.setFocus();\\n\\t\\t\\t}\\n\\t\\t\\t@Override\\n\\t\\t\\tpublic void setActionBars(IActionBars actionBars) {\\n\\t\\t\\t\\tsuper.setActionBars(actionBars);\\n\\t\\t\\t\\tgetActionBarContributor().shareGlobalActions(this, actionBars);\\n\\t\\t\\t}\\n\\t\\t};\\n\\t\\tpropertySheetPage\\n\\t\\t\\t\\t.setPropertySourceProvider(new AdapterFactoryContentProvider(\\n\\t\\t\\t\\t\\t\\tadapterFactory));\\n\\t\\tpropertySheetPages.add(propertySheetPage);\\n\\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\\n\\t\\tList targetObjects = markerHelper.getTargetObjects(editingDomain,\\n\\t\\t\\t\\tmarker);\\n\\t\\tif (!targetObjects.isEmpty()) {\\n\\t\\t\\tsetSelectionToViewer(targetObjects);\\n\\t\\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java\",\n \"implementation\": \"public void run() {\\n\\t\\t\\t\\t\\t\\tupdateProblemIndication();\",\n \"signature\": \"new Runnable()\"\n },\n {\n \"arguments\": [\n \"\\n\\t\\t\\t\\teditingDomain\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java\",\n \"implementation\": \"@Override\\n\\t\\t\\tpublic void setSelectionToViewer(List selection) {\\n\\t\\t\\t\\tEnvironmentEditor.this.setSelectionToViewer(selection);\\n\\t\\t\\t\\tEnvironmentEditor.this.setFocus();\",\n \"signature\": \"new ExtendedPropertySheetPage(\\n\\t\\t\\t\\teditingDomain)\"\n },\n {\n \"arguments\": [\n \"IActionBars actionBars\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java\",\n \"implementation\": \"super.setActionBars(actionBars);\\n\\t\\t\\t\\tgetActionBarContributor().shareGlobalActions(this, actionBars);\",\n \"signature\": \"void setActionBars(IActionBars actionBars)\"\n }\n ],\n \"old_code\": \"\\tprotected PropertySheetPage propertySheetPage;\\n\\t\\t\\t\\tif (((PropertySheet) p).getCurrentPage() == propertySheetPage) {\\n\\t\\t\\t\\t\\t\\tif (propertySheetPage != null\\n\\t\\t\\t\\t\\t\\t\\t\\t&& !propertySheetPage.getControl().isDisposed()) {\\n\\t\\t\\t\\t\\t\\t\\tpropertySheetPage.refresh();\\n\\t\\tif (propertySheetPage == null) {\\n\\t\\t\\tpropertySheetPage = new ExtendedPropertySheetPage(editingDomain) {\\n\\t\\t\\t\\t@Override\\n\\t\\t\\t\\tpublic void setSelectionToViewer(List selection) {\\n\\t\\t\\t\\t\\tEnvironmentEditor.this.setSelectionToViewer(selection);\\n\\t\\t\\t\\t\\tEnvironmentEditor.this.setFocus();\\n\\t\\t\\t\\t}\\n\\t\\t\\t\\t@Override\\n\\t\\t\\t\\tpublic void setActionBars(IActionBars actionBars) {\\n\\t\\t\\t\\t\\tsuper.setActionBars(actionBars);\\n\\t\\t\\t\\t\\tgetActionBarContributor().shareGlobalActions(this,\\n\\t\\t\\t\\t\\t\\t\\tactionBars);\\n\\t\\t\\t\\t}\\n\\t\\t\\t};\\n\\t\\t\\tpropertySheetPage\\n\\t\\t\\t\\t\\t.setPropertySourceProvider(new AdapterFactoryContentProvider(\\n\\t\\t\\t\\t\\t\\t\\tadapterFactory));\\n\\t\\t}\\n\\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \\n\\t\\ttry {\\n\\t\\t\\tif (marker.getType().equals(EValidator.MARKER)) {\\n\\t\\t\\t\\tString uriAttribute = marker.getAttribute(\\n\\t\\t\\t\\t\\t\\tEValidator.URI_ATTRIBUTE, null);\\n\\t\\t\\t\\tif (uriAttribute != null) {\\n\\t\\t\\t\\t\\tURI uri = URI.createURI(uriAttribute);\\n\\t\\t\\t\\t\\tEObject eObject = editingDomain.getResourceSet()\\n\\t\\t\\t\\t\\t\\t\\t.getEObject(uri, true);\\n\\t\\t\\t\\t\\tif (eObject != null) {\\n\\t\\t\\t\\t\\t\\tsetSelectionToViewer(Collections\\n\\t\\t\\t\\t\\t\\t\\t\\t.singleton(editingDomain.getWrapper(eObject)));\\n\\t\\t\\t\\t\\t}\\n\\t\\t\\t\\t}\\n\\t\\t\\t}\\n\\t\\t} catch (CoreException exception) {\\n\\t\\t\\tEnvironmentEditorPlugin.INSTANCE.log(exception);\\n\\t\\tif (propertySheetPage != null) {\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"editingDomain\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java\",\n \"implementation\": \"@Override\\n\\t\\t\\t\\tpublic void setSelectionToViewer(List selection) {\\n\\t\\t\\t\\t\\tEnvironmentEditor.this.setSelectionToViewer(selection);\\n\\t\\t\\t\\t\\tEnvironmentEditor.this.setFocus();\",\n \"signature\": \"new ExtendedPropertySheetPage(editingDomain)\"\n },\n {\n \"arguments\": [\n \"IActionBars actionBars\"\n ],\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment.editor/src/org/obeonetwork/dsl/environment/presentation/EnvironmentEditor.java\",\n \"implementation\": \"super.setActionBars(actionBars);\\n\\t\\t\\t\\t\\tgetActionBarContributor().shareGlobalActions(this,\\n\\t\\t\\t\\t\\t\\t\\tactionBars);\",\n \"signature\": \"void setActionBars(IActionBars actionBars)\"\n }\n ],\n \"patch\": \"@@ -190,7 +190,7 @@ public class EnvironmentEditor extends MultiPageEditorPart implements\\n \\t * \\n \\t * @generated\\n \\t */\\n-\\tprotected PropertySheetPage propertySheetPage;\\n+\\tprotected List propertySheetPages = new ArrayList();\\n \\n \\t/**\\n \\t * This is the viewer that shadows the selection in the content outline.\\n@@ -308,7 +308,8 @@ public void partActivated(IWorkbenchPart p) {\\n \\t\\t\\t\\t\\tsetCurrentViewer(contentOutlineViewer);\\n \\t\\t\\t\\t}\\n \\t\\t\\t} else if (p instanceof PropertySheet) {\\n-\\t\\t\\t\\tif (((PropertySheet) p).getCurrentPage() == propertySheetPage) {\\n+\\t\\t\\t\\tif (propertySheetPages.contains(((PropertySheet) p)\\n+\\t\\t\\t\\t\\t\\t.getCurrentPage())) {\\n \\t\\t\\t\\t\\tgetActionBarContributor().setActiveEditor(\\n \\t\\t\\t\\t\\t\\t\\tEnvironmentEditor.this);\\n \\t\\t\\t\\t\\thandleActivate();\\n@@ -422,6 +423,14 @@ protected void setTarget(Resource target) {\\n \\t\\t@Override\\n \\t\\tprotected void unsetTarget(Resource target) {\\n \\t\\t\\tbasicUnsetTarget(target);\\n+\\t\\t\\tresourceToDiagnosticMap.remove(target);\\n+\\t\\t\\tif (updateProblemIndication) {\\n+\\t\\t\\t\\tgetSite().getShell().getDisplay().asyncExec(new Runnable() {\\n+\\t\\t\\t\\t\\tpublic void run() {\\n+\\t\\t\\t\\t\\t\\tupdateProblemIndication();\\n+\\t\\t\\t\\t\\t}\\n+\\t\\t\\t\\t});\\n+\\t\\t\\t}\\n \\t\\t}\\n \\t};\\n \\n@@ -460,6 +469,7 @@ public boolean visit(IResourceDelta delta) {\\n \\t\\t\\t\\t\\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t\\t\\t\\t}\\n+\\t\\t\\t\\t\\t\\t\\treturn false;\\n \\t\\t\\t\\t\\t\\t}\\n \\n \\t\\t\\t\\t\\t\\treturn true;\\n@@ -696,9 +706,14 @@ public void run() {\\n \\t\\t\\t\\t\\t\\t\\tsetSelectionToViewer(mostRecentCommand\\n \\t\\t\\t\\t\\t\\t\\t\\t\\t.getAffectedObjects());\\n \\t\\t\\t\\t\\t\\t}\\n-\\t\\t\\t\\t\\t\\tif (propertySheetPage != null\\n-\\t\\t\\t\\t\\t\\t\\t\\t&& !propertySheetPage.getControl().isDisposed()) {\\n-\\t\\t\\t\\t\\t\\t\\tpropertySheetPage.refresh();\\n+\\t\\t\\t\\t\\t\\tfor (Iterator i = propertySheetPages\\n+\\t\\t\\t\\t\\t\\t\\t\\t.iterator(); i.hasNext();) {\\n+\\t\\t\\t\\t\\t\\t\\tPropertySheetPage propertySheetPage = i.next();\\n+\\t\\t\\t\\t\\t\\t\\tif (propertySheetPage.getControl().isDisposed()) {\\n+\\t\\t\\t\\t\\t\\t\\t\\ti.remove();\\n+\\t\\t\\t\\t\\t\\t\\t} else {\\n+\\t\\t\\t\\t\\t\\t\\t\\tpropertySheetPage.refresh();\\n+\\t\\t\\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t\\t}\\n \\t\\t\\t\\t});\\n@@ -1382,25 +1397,24 @@ public void selectionChanged(SelectionChangedEvent event) {\\n \\t * @generated\\n \\t */\\n \\tpublic IPropertySheetPage getPropertySheetPage() {\\n-\\t\\tif (propertySheetPage == null) {\\n-\\t\\t\\tpropertySheetPage = new ExtendedPropertySheetPage(editingDomain) {\\n-\\t\\t\\t\\t@Override\\n-\\t\\t\\t\\tpublic void setSelectionToViewer(List selection) {\\n-\\t\\t\\t\\t\\tEnvironmentEditor.this.setSelectionToViewer(selection);\\n-\\t\\t\\t\\t\\tEnvironmentEditor.this.setFocus();\\n-\\t\\t\\t\\t}\\n+\\t\\tPropertySheetPage propertySheetPage = new ExtendedPropertySheetPage(\\n+\\t\\t\\t\\teditingDomain) {\\n+\\t\\t\\t@Override\\n+\\t\\t\\tpublic void setSelectionToViewer(List selection) {\\n+\\t\\t\\t\\tEnvironmentEditor.this.setSelectionToViewer(selection);\\n+\\t\\t\\t\\tEnvironmentEditor.this.setFocus();\\n+\\t\\t\\t}\\n \\n-\\t\\t\\t\\t@Override\\n-\\t\\t\\t\\tpublic void setActionBars(IActionBars actionBars) {\\n-\\t\\t\\t\\t\\tsuper.setActionBars(actionBars);\\n-\\t\\t\\t\\t\\tgetActionBarContributor().shareGlobalActions(this,\\n-\\t\\t\\t\\t\\t\\t\\tactionBars);\\n-\\t\\t\\t\\t}\\n-\\t\\t\\t};\\n-\\t\\t\\tpropertySheetPage\\n-\\t\\t\\t\\t\\t.setPropertySourceProvider(new AdapterFactoryContentProvider(\\n-\\t\\t\\t\\t\\t\\t\\tadapterFactory));\\n-\\t\\t}\\n+\\t\\t\\t@Override\\n+\\t\\t\\tpublic void setActionBars(IActionBars actionBars) {\\n+\\t\\t\\t\\tsuper.setActionBars(actionBars);\\n+\\t\\t\\t\\tgetActionBarContributor().shareGlobalActions(this, actionBars);\\n+\\t\\t\\t}\\n+\\t\\t};\\n+\\t\\tpropertySheetPage\\n+\\t\\t\\t\\t.setPropertySourceProvider(new AdapterFactoryContentProvider(\\n+\\t\\t\\t\\t\\t\\tadapterFactory));\\n+\\t\\tpropertySheetPages.add(propertySheetPage);\\n \\n \\t\\treturn propertySheetPage;\\n \\t}\\n@@ -1526,7 +1540,7 @@ public void execute(IProgressMonitor monitor) {\\n \\n \\t/**\\n \\t * This returns whether something has been persisted to the URI of the specified resource.\\n-\\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream. \\n+\\t * The implementation uses the URI converter from the editor's resource set to try to open an input stream.\\n \\t * \\n \\t * \\n \\t * @generated\\n@@ -1599,22 +1613,10 @@ protected void doSaveAs(URI uri, IEditorInput editorInput) {\\n \\t * @generated\\n \\t */\\n \\tpublic void gotoMarker(IMarker marker) {\\n-\\t\\ttry {\\n-\\t\\t\\tif (marker.getType().equals(EValidator.MARKER)) {\\n-\\t\\t\\t\\tString uriAttribute = marker.getAttribute(\\n-\\t\\t\\t\\t\\t\\tEValidator.URI_ATTRIBUTE, null);\\n-\\t\\t\\t\\tif (uriAttribute != null) {\\n-\\t\\t\\t\\t\\tURI uri = URI.createURI(uriAttribute);\\n-\\t\\t\\t\\t\\tEObject eObject = editingDomain.getResourceSet()\\n-\\t\\t\\t\\t\\t\\t\\t.getEObject(uri, true);\\n-\\t\\t\\t\\t\\tif (eObject != null) {\\n-\\t\\t\\t\\t\\t\\tsetSelectionToViewer(Collections\\n-\\t\\t\\t\\t\\t\\t\\t\\t.singleton(editingDomain.getWrapper(eObject)));\\n-\\t\\t\\t\\t\\t}\\n-\\t\\t\\t\\t}\\n-\\t\\t\\t}\\n-\\t\\t} catch (CoreException exception) {\\n-\\t\\t\\tEnvironmentEditorPlugin.INSTANCE.log(exception);\\n+\\t\\tList targetObjects = markerHelper.getTargetObjects(editingDomain,\\n+\\t\\t\\t\\tmarker);\\n+\\t\\tif (!targetObjects.isEmpty()) {\\n+\\t\\t\\tsetSelectionToViewer(targetObjects);\\n \\t\\t}\\n \\t}\\n \\n@@ -1817,7 +1819,7 @@ public void dispose() {\\n \\t\\t\\tgetActionBarContributor().setActiveEditor(null);\\n \\t\\t}\\n \\n-\\t\\tif (propertySheetPage != null) {\\n+\\t\\tfor (PropertySheetPage propertySheetPage : propertySheetPages) {\\n \\t\\t\\tpropertySheetPage.dispose();\\n \\t\\t}\\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment.editor%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fpresentation%2FEnvironmentEditor.java\",\n \"sha\": \"7d1af48e7b8bef10e75163f30933183c5ba25098\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 11,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.ecore\",\n \"changes\": 20,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.ecore?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 9,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment/model/environment.ecore\",\n \"new_code\": \" \\n \\n \\n \\n \\n \",\n \"new_methods\": [],\n \"old_code\": \" \\n \\n \\n \\n \",\n \"old_methods\": [],\n \"patch\": \"@@ -73,18 +73,18 @@\\n \\n \\n \\n- \\n+ \\n \\n \\n \\n \\n- \\n+ \\n \\n- \\n+ \\n \\n \\n \\n \\n- \\n+ \\n \\n \\n \\n@@ -126,8 +126,10 @@\\n \\n \\n- \\n+ \\n+ \\n \\n \\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.ecore\",\n \"sha\": \"4d057bfbe3d1320d48245aa0b482b7b6183fecf2\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 17,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.genmodel\",\n \"changes\": 31,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.genmodel?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 14,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment/model/environment.genmodel\",\n \"new_code\": \" \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \",\n \"new_methods\": [],\n \"old_code\": \" \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \",\n \"old_methods\": [],\n \"patch\": \"@@ -25,6 +25,7 @@\\n \\n \\n \\n+ \\n \\n \\n \\n@@ -72,19 +73,20 @@\\n \\n \\n \\n- \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n \\n \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n- \\n \\n \\n \\n@@ -97,21 +99,22 @@\\n \\n \\n \\n- \\n+ \\n \\n \\n \\n \\n \\n- \\n- \\n+ \\n+ \\n \\n \\n \\n \\n \\n \\n \\n+ \\n \\n \\n \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fmodel%2Fenvironment.genmodel\",\n \"sha\": \"21ccc37ace974b8cc0106e761e2045f8cae15448\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 13,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FAttribute.java\",\n \"changes\": 26,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FAttribute.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 13,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Attribute.java\",\n \"new_code\": \" *
  • {@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}
    • \\n\\t * Returns the value of the 'Containing Type' container reference.\\n\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes Owned Attributes}'.\\n\\t * If the meaning of the 'Containing Type' container reference isn't clear,\\n\\t * @return the value of the 'Containing Type' container reference.\\n\\t * @see #setContainingType(StructuredType)\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getAttribute_ContainingType()\\n\\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes\\n\\tStructuredType getContainingType();\\n\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}' container reference.\\n\\t * @param value the new value of the 'Containing Type' container reference.\\n\\t * @see #getContainingType()\\n\\tvoid setContainingType(StructuredType value);\",\n \"new_methods\": [],\n \"old_code\": \" *
  • {@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}
    • \\n\\t * Returns the value of the 'Dto' container reference.\\n\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes Owned Attributes}'.\\n\\t * If the meaning of the 'Dto' container reference isn't clear,\\n\\t * @return the value of the 'Dto' container reference.\\n\\t * @see #setDto(DTO)\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getAttribute_Dto()\\n\\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedAttributes\\n\\tDTO getDto();\\n\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}' container reference.\\n\\t * @param value the new value of the 'Dto' container reference.\\n\\t * @see #getDto()\\n\\tvoid setDto(DTO value);\",\n \"old_methods\": [],\n \"patch\": \"@@ -21,7 +21,7 @@\\n * The following features are supported:\\n *
      \\n *
    • {@link org.obeonetwork.dsl.environment.Attribute#getType Type}
      • \\n- *
    • {@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}
      • \\n+ *
    • {@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}
      • \\n *
    \\n *

    \\n *\\n@@ -64,31 +64,31 @@ public interface Attribute extends Property {\\n \\tvoid setType(PrimitiveType value);\\n \\n \\t/**\\n-\\t * Returns the value of the 'Dto' container reference.\\n-\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes Owned Attributes}'.\\n+\\t * Returns the value of the 'Containing Type' container reference.\\n+\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes Owned Attributes}'.\\n \\t * \\n \\t *

    \\n-\\t * If the meaning of the 'Dto' container reference isn't clear,\\n+\\t * If the meaning of the 'Containing Type' container reference isn't clear,\\n \\t * there really should be more of a description here...\\n \\t *

    \\n \\t * \\n-\\t * @return the value of the 'Dto' container reference.\\n-\\t * @see #setDto(DTO)\\n-\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getAttribute_Dto()\\n-\\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedAttributes\\n+\\t * @return the value of the 'Containing Type' container reference.\\n+\\t * @see #setContainingType(StructuredType)\\n+\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getAttribute_ContainingType()\\n+\\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes\\n \\t * @model opposite=\\\"ownedAttributes\\\" required=\\\"true\\\" transient=\\\"false\\\"\\n \\t * @generated\\n \\t */\\n-\\tDTO getDto();\\n+\\tStructuredType getContainingType();\\n \\n \\t/**\\n-\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}' container reference.\\n+\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}' container reference.\\n \\t * \\n \\t * \\n-\\t * @param value the new value of the 'Dto' container reference.\\n-\\t * @see #getDto()\\n+\\t * @param value the new value of the 'Containing Type' container reference.\\n+\\t * @see #getContainingType()\\n \\t * @generated\\n \\t */\\n-\\tvoid setDto(DTO value);\\n+\\tvoid setContainingType(StructuredType value);\\n \\n } // Attribute\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FAttribute.java\",\n \"sha\": \"55797de58d7d8ca444325cb71f9d9b884bd62bb7\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FDTO.java\",\n \"changes\": 143,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FDTO.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 143,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/DTO.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"import org.eclipse.emf.common.util.EList;\\n\\n *
  • {@link org.obeonetwork.dsl.environment.DTO#getAssociatedTypes Associated Types}
    • \\n *
  • {@link org.obeonetwork.dsl.environment.DTO#getProperties Properties}
    • \\n *
  • {@link org.obeonetwork.dsl.environment.DTO#getReferences References}
    • \\n *
  • {@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences Owned References}
    • \\n *
  • {@link org.obeonetwork.dsl.environment.DTO#getAttributes Attributes}
    • \\n *
  • {@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes Owned Attributes}
    • \\n *
  • {@link org.obeonetwork.dsl.environment.DTO#getSupertype Supertype}
    • \\n\\t/**\\n\\t * Returns the value of the 'Associated Types' reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.StructuredType}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Associated Types' reference list isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Associated Types' reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_AssociatedTypes()\\n\\t * @model\\n\\t * @generated\\n\\t */\\n\\tEList getAssociatedTypes();\\n\\n\\t/**\\n\\t * Returns the value of the 'Properties' reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Properties' reference list isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Properties' reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Properties()\\n\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getProperties();\\n\\n\\t/**\\n\\t * Returns the value of the 'References' reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'References' reference list isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'References' reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_References()\\n\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getReferences();\\n\\n\\t/**\\n\\t * Returns the value of the 'Owned References' containment reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\\n\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Reference#getDto Dto}'.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Owned References' containment reference list isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Owned References' containment reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_OwnedReferences()\\n\\t * @see org.obeonetwork.dsl.environment.Reference#getDto\\n\\t * @model opposite=\\\"dto\\\" containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getOwnedReferences();\\n\\n\\t/**\\n\\t * Returns the value of the 'Attributes' reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Attributes' reference list isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Attributes' reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Attributes()\\n\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getAttributes();\\n\\n\\t/**\\n\\t * Returns the value of the 'Owned Attributes' containment reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\\n\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}'.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Owned Attributes' containment reference list isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Owned Attributes' containment reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_OwnedAttributes()\\n\\t * @see org.obeonetwork.dsl.environment.Attribute#getDto\\n\\t * @model opposite=\\\"dto\\\" containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getOwnedAttributes();\\n\\n\\t/**\\n\\t * Returns the value of the 'Supertype' reference.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Supertype' reference isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Supertype' reference.\\n\\t * @see #setSupertype(DTO)\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Supertype()\\n\\t * @model\\n\\t * @generated\\n\\t */\\n\\tDTO getSupertype();\\n\\n\\t/**\\n\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.DTO#getSupertype Supertype}' reference.\\n\\t * \\n\\t * \\n\\t * @param value the new value of the 'Supertype' reference.\\n\\t * @see #getSupertype()\\n\\t * @generated\\n\\t */\\n\\tvoid setSupertype(DTO value);\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @model required=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tboolean isSubtypeOf(DTO dto);\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -12,8 +12,6 @@\\n */\\n package org.obeonetwork.dsl.environment;\\n \\n-import org.eclipse.emf.common.util.EList;\\n-\\n /**\\n * \\n * A representation of the model object 'DTO'.\\n@@ -23,13 +21,6 @@\\n * The following features are supported:\\n *
      \\n *
    • {@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer Owned Container}
      • \\n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getAssociatedTypes Associated Types}
      • \\n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getProperties Properties}
      • \\n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getReferences References}
      • \\n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences Owned References}
      • \\n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getAttributes Attributes}
      • \\n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes Owned Attributes}
      • \\n- *
    • {@link org.obeonetwork.dsl.environment.DTO#getSupertype Supertype}
      • \\n *
    \\n *

    \\n *\\n@@ -71,138 +62,4 @@ public interface DTO extends StructuredType {\\n \\t */\\n \\tvoid setOwnedContainer(FilterContainer value);\\n \\n-\\t/**\\n-\\t * Returns the value of the 'Associated Types' reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.StructuredType}.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'Associated Types' reference list isn't clear,\\n-\\t * there really should be more of a description here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'Associated Types' reference list.\\n-\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_AssociatedTypes()\\n-\\t * @model\\n-\\t * @generated\\n-\\t */\\n-\\tEList getAssociatedTypes();\\n-\\n-\\t/**\\n-\\t * Returns the value of the 'Properties' reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'Properties' reference list isn't clear,\\n-\\t * there really should be more of a description here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'Properties' reference list.\\n-\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Properties()\\n-\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n-\\t * @generated\\n-\\t */\\n-\\tEList getProperties();\\n-\\n-\\t/**\\n-\\t * Returns the value of the 'References' reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'References' reference list isn't clear,\\n-\\t * there really should be more of a description here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'References' reference list.\\n-\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_References()\\n-\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n-\\t * @generated\\n-\\t */\\n-\\tEList getReferences();\\n-\\n-\\t/**\\n-\\t * Returns the value of the 'Owned References' containment reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\\n-\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Reference#getDto Dto}'.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'Owned References' containment reference list isn't clear,\\n-\\t * there really should be more of a description here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'Owned References' containment reference list.\\n-\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_OwnedReferences()\\n-\\t * @see org.obeonetwork.dsl.environment.Reference#getDto\\n-\\t * @model opposite=\\\"dto\\\" containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n-\\t * @generated\\n-\\t */\\n-\\tEList getOwnedReferences();\\n-\\n-\\t/**\\n-\\t * Returns the value of the 'Attributes' reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'Attributes' reference list isn't clear,\\n-\\t * there really should be more of a description here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'Attributes' reference list.\\n-\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Attributes()\\n-\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n-\\t * @generated\\n-\\t */\\n-\\tEList getAttributes();\\n-\\n-\\t/**\\n-\\t * Returns the value of the 'Owned Attributes' containment reference list.\\n-\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\\n-\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}'.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'Owned Attributes' containment reference list isn't clear,\\n-\\t * there really should be more of a description here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'Owned Attributes' containment reference list.\\n-\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_OwnedAttributes()\\n-\\t * @see org.obeonetwork.dsl.environment.Attribute#getDto\\n-\\t * @model opposite=\\\"dto\\\" containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n-\\t * @generated\\n-\\t */\\n-\\tEList getOwnedAttributes();\\n-\\n-\\t/**\\n-\\t * Returns the value of the 'Supertype' reference.\\n-\\t * \\n-\\t *

    \\n-\\t * If the meaning of the 'Supertype' reference isn't clear,\\n-\\t * there really should be more of a description here...\\n-\\t *

    \\n-\\t * \\n-\\t * @return the value of the 'Supertype' reference.\\n-\\t * @see #setSupertype(DTO)\\n-\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getDTO_Supertype()\\n-\\t * @model\\n-\\t * @generated\\n-\\t */\\n-\\tDTO getSupertype();\\n-\\n-\\t/**\\n-\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.DTO#getSupertype Supertype}' reference.\\n-\\t * \\n-\\t * \\n-\\t * @param value the new value of the 'Supertype' reference.\\n-\\t * @see #getSupertype()\\n-\\t * @generated\\n-\\t */\\n-\\tvoid setSupertype(DTO value);\\n-\\n-\\t/**\\n-\\t * \\n-\\t * \\n-\\t * @model required=\\\"true\\\"\\n-\\t * @generated\\n-\\t */\\n-\\tboolean isSubtypeOf(DTO dto);\\n-\\n } // DTO\\n\\\\ No newline at end of file\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FDTO.java\",\n \"sha\": \"3116b2339c707b49f0b287a50e851e129e93873c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 17,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironment.java\",\n \"changes\": 17,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironment.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Environment.java\",\n \"new_code\": \" *
  • {@link org.obeonetwork.dsl.environment.Environment#getNamespaces Namespaces}
    • \\n\\t/**\\n\\t * Returns the value of the 'Namespaces' containment reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Namespace}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Namespaces' containment reference list isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Namespaces' containment reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getEnvironment_Namespaces()\\n\\t * @model containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getNamespaces();\\n\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -27,6 +27,7 @@\\n *
  • {@link org.obeonetwork.dsl.environment.Environment#getLinks Links}
    • \\n *
  • {@link org.obeonetwork.dsl.environment.Environment#getPriorityDefinitions Priority Definitions}
    • \\n *
  • {@link org.obeonetwork.dsl.environment.Environment#getTypesDefinition Types Definition}
    • \\n+ *
  • {@link org.obeonetwork.dsl.environment.Environment#getNamespaces Namespaces}
    • \\n * \\n *

    \\n *\\n@@ -152,4 +153,20 @@ public interface Environment extends ObeoDSMObject {\\n \\t */\\n \\tvoid setTypesDefinition(TypesDefinition value);\\n \\n+\\t/**\\n+\\t * Returns the value of the 'Namespaces' containment reference list.\\n+\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Namespace}.\\n+\\t * \\n+\\t *

    \\n+\\t * If the meaning of the 'Namespaces' containment reference list isn't clear,\\n+\\t * there really should be more of a description here...\\n+\\t *

    \\n+\\t * \\n+\\t * @return the value of the 'Namespaces' containment reference list.\\n+\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getEnvironment_Namespaces()\\n+\\t * @model containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n+\\t * @generated\\n+\\t */\\n+\\tEList getNamespaces();\\n+\\n } // Environment\\n\\\\ No newline at end of file\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironment.java\",\n \"sha\": \"d12b9d6b00192c815cdaa2a7d68c3eedad619761\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentFactory.java\",\n \"changes\": 3,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentFactory.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 2,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/EnvironmentFactory.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \" *\\n * $Id$\",\n \"old_methods\": [],\n \"patch\": \"@@ -7,8 +7,6 @@\\n * \\n * Contributors:\\n * Obeo - initial API and implementation\\n- *\\n- * $Id$\\n */\\n package org.obeonetwork.dsl.environment;\\n \\n@@ -29,6 +27,7 @@ public interface EnvironmentFactory extends EFactory {\\n \\t * @generated\\n \\t */\\n \\tString copyright = \\\"Copyright (c) 2008-2009 Obeo.\\\\nAll rights reserved. This program and the accompanying materials\\\\nare made available under the terms of the Eclipse Public License v1.0\\\\nwhich accompanies this distribution, and is available at\\\\nhttp://www.eclipse.org/legal/epl-v10.html\\\\n\\\\nContributors:\\\\n Obeo - initial API and implementation\\\";\\n+\\n \\t/**\\n \\t * The singleton instance of the factory.\\n \\t * \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentFactory.java\",\n \"sha\": \"14106c175d69af813b603e9f164035dbac591a3f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 346,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentPackage.java\",\n \"changes\": 536,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentPackage.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 190,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/EnvironmentPackage.java\",\n \"new_code\": \"\\tString eNS_URI = \\\"http://www.obeonetwork.org/dsl/environment/3.0.0\\\";\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnvironmentImpl Environment}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnvironment()\\n\\t * @generated\\n\\t */\\n\\tint ENVIRONMENT = 0;\\n\\n\\t/**\\n\\t * The feature id for the 'Namespaces' containment reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint ENVIRONMENT__NAMESPACES = OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\\n\\n\\tint ENVIRONMENT_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 6;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl Type}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.TypeImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getType()\\n\\t * @generated\\n\\t */\\n\\tint TYPE = 1;\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl Primitive Type}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getPrimitiveType()\\n\\t * @generated\\n\\t */\\n\\tint PRIMITIVE_TYPE = 2;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnumerationImpl Enumeration}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.EnumerationImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnumeration()\\n\\t * @generated\\n\\t */\\n\\tint ENUMERATION = 3;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FieldImpl Field}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.FieldImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getField()\\n\\t * @generated\\n\\t */\\n\\tint FIELD = 4;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ActionImpl Action}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.ActionImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getAction()\\n\\t * @generated\\n\\t */\\n\\tint ACTION = 5;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl Inter DSM Link}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getInterDSMLink()\\n\\t * @generated\\n\\t */\\n\\tint INTER_DSM_LINK = 6;\\n\\n\\t/**\\n\\t * The feature id for the 'Supertype' reference.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint STRUCTURED_TYPE__SUPERTYPE = TYPE_FEATURE_COUNT + 0;\\n\\n\\t/**\\n\\t * The feature id for the 'Associated Types' reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint STRUCTURED_TYPE__ASSOCIATED_TYPES = TYPE_FEATURE_COUNT + 1;\\n\\n\\t/**\\n\\t * The feature id for the 'Owned Attributes' containment reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint STRUCTURED_TYPE__OWNED_ATTRIBUTES = TYPE_FEATURE_COUNT + 2;\\n\\n\\t/**\\n\\t * The feature id for the 'Attributes' reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint STRUCTURED_TYPE__ATTRIBUTES = TYPE_FEATURE_COUNT + 3;\\n\\n\\t/**\\n\\t * The feature id for the 'Owned References' containment reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint STRUCTURED_TYPE__OWNED_REFERENCES = TYPE_FEATURE_COUNT + 4;\\n\\n\\t/**\\n\\t * The feature id for the 'References' reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint STRUCTURED_TYPE__REFERENCES = TYPE_FEATURE_COUNT + 5;\\n\\n\\t/**\\n\\t * The feature id for the 'Properties' reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint STRUCTURED_TYPE__PROPERTIES = TYPE_FEATURE_COUNT + 6;\\n\\n\\tint STRUCTURED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 7;\\n\\t * The feature id for the 'Supertype' reference.\\n\\tint DTO__SUPERTYPE = STRUCTURED_TYPE__SUPERTYPE;\\n\\tint DTO__ASSOCIATED_TYPES = STRUCTURED_TYPE__ASSOCIATED_TYPES;\\n\\t * The feature id for the 'Owned Attributes' containment reference list.\\n\\tint DTO__OWNED_ATTRIBUTES = STRUCTURED_TYPE__OWNED_ATTRIBUTES;\\n\\t * The feature id for the 'Attributes' reference list.\\n\\tint DTO__ATTRIBUTES = STRUCTURED_TYPE__ATTRIBUTES;\\n\\tint DTO__OWNED_REFERENCES = STRUCTURED_TYPE__OWNED_REFERENCES;\\n\\t * The feature id for the 'References' reference list.\\n\\tint DTO__REFERENCES = STRUCTURED_TYPE__REFERENCES;\\n\\t * The feature id for the 'Properties' reference list.\\n\\tint DTO__PROPERTIES = STRUCTURED_TYPE__PROPERTIES;\\n\\t * The feature id for the 'Owned Container' containment reference.\\n\\tint DTO__OWNED_CONTAINER = STRUCTURED_TYPE_FEATURE_COUNT + 0;\\n\\tint DTO_FEATURE_COUNT = STRUCTURED_TYPE_FEATURE_COUNT + 1;\\n\\tint NAMESPACE__METADATAS = TYPES_DEFINITION__METADATAS;\\n\\tint NAMESPACE__DESCRIPTION = TYPES_DEFINITION__DESCRIPTION;\\n\\tint NAMESPACE__KEYWORDS = TYPES_DEFINITION__KEYWORDS;\\n\\tint NAMESPACE__BEHAVIOURS = TYPES_DEFINITION__BEHAVIOURS;\\n\\tint NAMESPACE__BINDING_REGISTRIES = TYPES_DEFINITION__BINDING_REGISTRIES;\\n\\tint NAMESPACE__VERSION = TYPES_DEFINITION__VERSION;\\n\\tint NAMESPACE__CREATED_ON = TYPES_DEFINITION__CREATED_ON;\\n\\tint NAMESPACE__MODIFIED_ON = TYPES_DEFINITION__MODIFIED_ON;\\n\\n\\t/**\\n\\t * The feature id for the 'Types' containment reference list.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint NAMESPACE__TYPES = TYPES_DEFINITION__TYPES;\\n\\tint NAMESPACE__OWNED_NAMESPACES = TYPES_DEFINITION_FEATURE_COUNT + 0;\\n\\tint NAMESPACE__OWNER = TYPES_DEFINITION_FEATURE_COUNT + 1;\\n\\tint NAMESPACE__NAME = TYPES_DEFINITION_FEATURE_COUNT + 2;\\n\\tint NAMESPACE_FEATURE_COUNT = TYPES_DEFINITION_FEATURE_COUNT + 3;\\n\\t/**\\n\\t * The feature id for the 'Is Identifier' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint PROPERTY__IS_IDENTIFIER = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n\\n\\tint PROPERTY_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\\n\\t/**\\n\\t * The feature id for the 'Is Identifier' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint ATTRIBUTE__IS_IDENTIFIER = PROPERTY__IS_IDENTIFIER;\\n\\n\\t * The feature id for the 'Containing Type' container reference.\\n\\tint ATTRIBUTE__CONTAINING_TYPE = PROPERTY_FEATURE_COUNT + 1;\\n\\t/**\\n\\t * The feature id for the 'Is Identifier' attribute.\\n\\t * \\n\\t * \\n\\t * @generated\\n\\t * @ordered\\n\\t */\\n\\tint REFERENCE__IS_IDENTIFIER = PROPERTY__IS_IDENTIFIER;\\n\\n\\t * The feature id for the 'Containing Type' container reference.\\n\\tint REFERENCE__CONTAINING_TYPE = PROPERTY_FEATURE_COUNT + 3;\\n\\t * The feature id for the 'Referenced Type' reference.\\n\\tint REFERENCE__REFERENCED_TYPE = PROPERTY_FEATURE_COUNT + 4;\\n\\t/**\\n\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.Environment#getNamespaces Namespaces}'.\\n\\t * \\n\\t * \\n\\t * @return the meta object for the containment reference list 'Namespaces'.\\n\\t * @see org.obeonetwork.dsl.environment.Environment#getNamespaces()\\n\\t * @see #getEnvironment()\\n\\t * @generated\\n\\t */\\n\\tEReference getEnvironment_Namespaces();\\n\\n\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype Supertype}'.\\n\\t * @return the meta object for the reference 'Supertype'.\\n\\t * @see org.obeonetwork.dsl.environment.StructuredType#getSupertype()\\n\\t * @see #getStructuredType()\\n\\tEReference getStructuredType_Supertype();\\n\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes Associated Types}'.\\n\\t * @return the meta object for the reference list 'Associated Types'.\\n\\t * @see org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes()\\n\\t * @see #getStructuredType()\\n\\tEReference getStructuredType_AssociatedTypes();\\n\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes Owned Attributes}'.\\n\\t * @return the meta object for the containment reference list 'Owned Attributes'.\\n\\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes()\\n\\t * @see #getStructuredType()\\n\\tEReference getStructuredType_OwnedAttributes();\\n\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getAttributes Attributes}'.\\n\\t * @return the meta object for the reference list 'Attributes'.\\n\\t * @see org.obeonetwork.dsl.environment.StructuredType#getAttributes()\\n\\t * @see #getStructuredType()\\n\\tEReference getStructuredType_Attributes();\\n\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences Owned References}'.\\n\\t * @return the meta object for the containment reference list 'Owned References'.\\n\\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences()\\n\\t * @see #getStructuredType()\\n\\tEReference getStructuredType_OwnedReferences();\\n\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getReferences References}'.\\n\\t * @return the meta object for the reference list 'References'.\\n\\t * @see org.obeonetwork.dsl.environment.StructuredType#getReferences()\\n\\t * @see #getStructuredType()\\n\\tEReference getStructuredType_References();\\n\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getProperties Properties}'.\\n\\t * @return the meta object for the reference list 'Properties'.\\n\\t * @see org.obeonetwork.dsl.environment.StructuredType#getProperties()\\n\\t * @see #getStructuredType()\\n\\tEReference getStructuredType_Properties();\\n\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.DTO DTO}'.\\n\\t * @return the meta object for class 'DTO'.\\n\\t * @see org.obeonetwork.dsl.environment.DTO\\n\\tEClass getDTO();\\n\\t * Returns the meta object for the containment reference '{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer Owned Container}'.\\n\\t * @return the meta object for the containment reference 'Owned Container'.\\n\\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedContainer()\\n\\tEReference getDTO_OwnedContainer();\\n\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}'.\\n\\t * @return the meta object for the container reference 'Containing Type'.\\n\\t * @see org.obeonetwork.dsl.environment.Attribute#getContainingType()\\n\\tEReference getAttribute_ContainingType();\\n\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}'.\\n\\t * @return the meta object for the container reference 'Containing Type'.\\n\\t * @see org.obeonetwork.dsl.environment.Reference#getContainingType()\\n\\tEReference getReference_ContainingType();\\n\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.Reference#getReferencedType Referenced Type}'.\\n\\t * @return the meta object for the reference 'Referenced Type'.\\n\\t * @see org.obeonetwork.dsl.environment.Reference#getReferencedType()\\n\\tEReference getReference_ReferencedType();\\n\\t/**\\n\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier Is Identifier}'.\\n\\t * \\n\\t * \\n\\t * @return the meta object for the attribute 'Is Identifier'.\\n\\t * @see org.obeonetwork.dsl.environment.Property#isIsIdentifier()\\n\\t * @see #getProperty()\\n\\t * @generated\\n\\t */\\n\\tEAttribute getProperty_IsIdentifier();\\n\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Namespaces' containment reference list feature.\\n\\t\\t * \\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEReference ENVIRONMENT__NAMESPACES = eINSTANCE\\n\\t\\t\\t\\t.getEnvironment_Namespaces();\\n\\n\\t\\t * The meta object literal for the 'Supertype' reference feature.\\n\\t\\tEReference STRUCTURED_TYPE__SUPERTYPE = eINSTANCE\\n\\t\\t\\t\\t.getStructuredType_Supertype();\\n\\t\\t * The meta object literal for the 'Associated Types' reference list feature.\\n\\t\\tEReference STRUCTURED_TYPE__ASSOCIATED_TYPES = eINSTANCE\\n\\t\\t\\t\\t.getStructuredType_AssociatedTypes();\\n\\t\\t * The meta object literal for the 'Owned Attributes' containment reference list feature.\\n\\t\\tEReference STRUCTURED_TYPE__OWNED_ATTRIBUTES = eINSTANCE\\n\\t\\t\\t\\t.getStructuredType_OwnedAttributes();\\n\\t\\t * The meta object literal for the 'Attributes' reference list feature.\\n\\t\\tEReference STRUCTURED_TYPE__ATTRIBUTES = eINSTANCE\\n\\t\\t\\t\\t.getStructuredType_Attributes();\\n\\t\\t * The meta object literal for the 'Owned References' containment reference list feature.\\n\\t\\tEReference STRUCTURED_TYPE__OWNED_REFERENCES = eINSTANCE\\n\\t\\t\\t\\t.getStructuredType_OwnedReferences();\\n\\t\\t * The meta object literal for the 'References' reference list feature.\\n\\t\\tEReference STRUCTURED_TYPE__REFERENCES = eINSTANCE\\n\\t\\t\\t\\t.getStructuredType_References();\\n\\t\\t * The meta object literal for the 'Properties' reference list feature.\\n\\t\\tEReference STRUCTURED_TYPE__PROPERTIES = eINSTANCE\\n\\t\\t\\t\\t.getStructuredType_Properties();\\n\\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl DTO}' class.\\n\\t\\t * @see org.obeonetwork.dsl.environment.impl.DTOImpl\\n\\t\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getDTO()\\n\\t\\tEClass DTO = eINSTANCE.getDTO();\\n\\t\\t * The meta object literal for the 'Owned Container' containment reference feature.\\n\\t\\tEReference DTO__OWNED_CONTAINER = eINSTANCE.getDTO_OwnedContainer();\\n\\t\\t * The meta object literal for the 'Containing Type' container reference feature.\\n\\t\\tEReference ATTRIBUTE__CONTAINING_TYPE = eINSTANCE\\n\\t\\t\\t\\t.getAttribute_ContainingType();\\n\\t\\t * The meta object literal for the 'Containing Type' container reference feature.\\n\\t\\tEReference REFERENCE__CONTAINING_TYPE = eINSTANCE\\n\\t\\t\\t\\t.getReference_ContainingType();\\n\\t\\t * The meta object literal for the 'Referenced Type' reference feature.\\n\\t\\tEReference REFERENCE__REFERENCED_TYPE = eINSTANCE\\n\\t\\t\\t\\t.getReference_ReferencedType();\\n\\t\\t/**\\n\\t\\t * The meta object literal for the 'Is Identifier' attribute feature.\\n\\t\\t * \\n\\t\\t * \\n\\t\\t * @generated\\n\\t\\t */\\n\\t\\tEAttribute PROPERTY__IS_IDENTIFIER = eINSTANCE\\n\\t\\t\\t\\t.getProperty_IsIdentifier();\\n\",\n \"new_methods\": [],\n \"old_code\": \" *\\n * $Id$\\n\\tString eNS_URI = \\\"http://www.obeonetwork.org/dsl/environment/2.0.0\\\";\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnvironmentImpl Environment}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnvironment()\\n\\t * @generated\\n\\t */\\n\\tint ENVIRONMENT = 0;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl Type}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.TypeImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getType()\\n\\t * @generated\\n\\t */\\n\\tint TYPE = 1;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl Primitive Type}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getPrimitiveType()\\n\\t * @generated\\n\\t */\\n\\tint PRIMITIVE_TYPE = 2;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnumerationImpl Enumeration}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.EnumerationImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnumeration()\\n\\t * @generated\\n\\t */\\n\\tint ENUMERATION = 3;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FieldImpl Field}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.FieldImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getField()\\n\\t * @generated\\n\\t */\\n\\tint FIELD = 4;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ActionImpl Action}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.ActionImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getAction()\\n\\t * @generated\\n\\t */\\n\\tint ACTION = 5;\\n\\n\\t/**\\n\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl Inter DSM Link}' class.\\n\\t * \\n\\t * \\n\\t * @see org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl\\n\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getInterDSMLink()\\n\\t * @generated\\n\\t */\\n\\tint INTER_DSM_LINK = 6;\\n\\n\\tint ENVIRONMENT_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\\n\\tint STRUCTURED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 0;\\n\\t * The feature id for the 'Owned Container' containment reference.\\n\\tint DTO__OWNED_CONTAINER = STRUCTURED_TYPE_FEATURE_COUNT + 0;\\n\\tint DTO__ASSOCIATED_TYPES = STRUCTURED_TYPE_FEATURE_COUNT + 1;\\n\\t * The feature id for the 'Properties' reference list.\\n\\tint DTO__PROPERTIES = STRUCTURED_TYPE_FEATURE_COUNT + 2;\\n\\t * The feature id for the 'References' reference list.\\n\\tint DTO__REFERENCES = STRUCTURED_TYPE_FEATURE_COUNT + 3;\\n\\tint DTO__OWNED_REFERENCES = STRUCTURED_TYPE_FEATURE_COUNT + 4;\\n\\t * The feature id for the 'Attributes' reference list.\\n\\tint DTO__ATTRIBUTES = STRUCTURED_TYPE_FEATURE_COUNT + 5;\\n\\t * The feature id for the 'Owned Attributes' containment reference list.\\n\\tint DTO__OWNED_ATTRIBUTES = STRUCTURED_TYPE_FEATURE_COUNT + 6;\\n\\t * The feature id for the 'Supertype' reference.\\n\\tint DTO__SUPERTYPE = STRUCTURED_TYPE_FEATURE_COUNT + 7;\\n\\tint DTO_FEATURE_COUNT = STRUCTURED_TYPE_FEATURE_COUNT + 8;\\n\\tint NAMESPACE__METADATAS = OBEO_DSM_OBJECT__METADATAS;\\n\\tint NAMESPACE__DESCRIPTION = OBEO_DSM_OBJECT__DESCRIPTION;\\n\\tint NAMESPACE__KEYWORDS = OBEO_DSM_OBJECT__KEYWORDS;\\n\\tint NAMESPACE__BEHAVIOURS = OBEO_DSM_OBJECT__BEHAVIOURS;\\n\\tint NAMESPACE__BINDING_REGISTRIES = OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n\\tint NAMESPACE__VERSION = OBEO_DSM_OBJECT__VERSION;\\n\\tint NAMESPACE__CREATED_ON = OBEO_DSM_OBJECT__CREATED_ON;\\n\\tint NAMESPACE__MODIFIED_ON = OBEO_DSM_OBJECT__MODIFIED_ON;\\n\\tint NAMESPACE__OWNED_NAMESPACES = OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\\n\\tint NAMESPACE__OWNER = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\\n\\tint NAMESPACE__NAME = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n\\tint NAMESPACE_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\\n\\tint PROPERTY_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n\\t * The feature id for the 'Dto' container reference.\\n\\tint ATTRIBUTE__DTO = PROPERTY_FEATURE_COUNT + 1;\\n\\t * The feature id for the 'Type' reference.\\n\\tint REFERENCE__TYPE = PROPERTY_FEATURE_COUNT + 3;\\n\\t * The feature id for the 'Dto' container reference.\\n\\tint REFERENCE__DTO = PROPERTY_FEATURE_COUNT + 4;\\n\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.DTO DTO}'.\\n\\t * @return the meta object for class 'DTO'.\\n\\t * @see org.obeonetwork.dsl.environment.DTO\\n\\tEClass getDTO();\\n\\t * Returns the meta object for the containment reference '{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer Owned Container}'.\\n\\t * @return the meta object for the containment reference 'Owned Container'.\\n\\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedContainer()\\n\\t * @see #getDTO()\\n\\tEReference getDTO_OwnedContainer();\\n\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getAssociatedTypes Associated Types}'.\\n\\t * @return the meta object for the reference list 'Associated Types'.\\n\\t * @see org.obeonetwork.dsl.environment.DTO#getAssociatedTypes()\\n\\t * @see #getDTO()\\n\\tEReference getDTO_AssociatedTypes();\\n\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getProperties Properties}'.\\n\\t * @return the meta object for the reference list 'Properties'.\\n\\t * @see org.obeonetwork.dsl.environment.DTO#getProperties()\\n\\t * @see #getDTO()\\n\\tEReference getDTO_Properties();\\n\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getReferences References}'.\\n\\t * @return the meta object for the reference list 'References'.\\n\\t * @see org.obeonetwork.dsl.environment.DTO#getReferences()\\n\\t * @see #getDTO()\\n\\tEReference getDTO_References();\\n\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences Owned References}'.\\n\\t * @return the meta object for the containment reference list 'Owned References'.\\n\\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedReferences()\\n\\t * @see #getDTO()\\n\\tEReference getDTO_OwnedReferences();\\n\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getAttributes Attributes}'.\\n\\t * @return the meta object for the reference list 'Attributes'.\\n\\t * @see org.obeonetwork.dsl.environment.DTO#getAttributes()\\n\\t * @see #getDTO()\\n\\tEReference getDTO_Attributes();\\n\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes Owned Attributes}'.\\n\\t * @return the meta object for the containment reference list 'Owned Attributes'.\\n\\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedAttributes()\\n\\t * @see #getDTO()\\n\\tEReference getDTO_OwnedAttributes();\\n\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.DTO#getSupertype Supertype}'.\\n\\t * @return the meta object for the reference 'Supertype'.\\n\\t * @see org.obeonetwork.dsl.environment.DTO#getSupertype()\\n\\tEReference getDTO_Supertype();\\n\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}'.\\n\\t * @return the meta object for the container reference 'Dto'.\\n\\t * @see org.obeonetwork.dsl.environment.Attribute#getDto()\\n\\tEReference getAttribute_Dto();\\n\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.Reference#getType Type}'.\\n\\t * @return the meta object for the reference 'Type'.\\n\\t * @see org.obeonetwork.dsl.environment.Reference#getType()\\n\\tEReference getReference_Type();\\n\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Reference#getDto Dto}'.\\n\\t * @return the meta object for the container reference 'Dto'.\\n\\t * @see org.obeonetwork.dsl.environment.Reference#getDto()\\n\\tEReference getReference_Dto();\\n\\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl DTO}' class.\\n\\t\\t * @see org.obeonetwork.dsl.environment.impl.DTOImpl\\n\\t\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getDTO()\\n\\t\\tEClass DTO = eINSTANCE.getDTO();\\n\\t\\t * The meta object literal for the 'Owned Container' containment reference feature.\\n\\t\\tEReference DTO__OWNED_CONTAINER = eINSTANCE.getDTO_OwnedContainer();\\n\\t\\t * The meta object literal for the 'Associated Types' reference list feature.\\n\\t\\tEReference DTO__ASSOCIATED_TYPES = eINSTANCE.getDTO_AssociatedTypes();\\n\\t\\t * The meta object literal for the 'Properties' reference list feature.\\n\\t\\tEReference DTO__PROPERTIES = eINSTANCE.getDTO_Properties();\\n\\t\\t * The meta object literal for the 'References' reference list feature.\\n\\t\\tEReference DTO__REFERENCES = eINSTANCE.getDTO_References();\\n\\t\\t * The meta object literal for the 'Owned References' containment reference list feature.\\n\\t\\tEReference DTO__OWNED_REFERENCES = eINSTANCE.getDTO_OwnedReferences();\\n\\t\\t * The meta object literal for the 'Attributes' reference list feature.\\n\\t\\tEReference DTO__ATTRIBUTES = eINSTANCE.getDTO_Attributes();\\n\\t\\t * The meta object literal for the 'Owned Attributes' containment reference list feature.\\n\\t\\tEReference DTO__OWNED_ATTRIBUTES = eINSTANCE.getDTO_OwnedAttributes();\\n\\t\\t * The meta object literal for the 'Supertype' reference feature.\\n\\t\\tEReference DTO__SUPERTYPE = eINSTANCE.getDTO_Supertype();\\n\\t\\t * The meta object literal for the 'Dto' container reference feature.\\n\\t\\tEReference ATTRIBUTE__DTO = eINSTANCE.getAttribute_Dto();\\n\\t\\t * The meta object literal for the 'Type' reference feature.\\n\\t\\tEReference REFERENCE__TYPE = eINSTANCE.getReference_Type();\\n\\t\\t * The meta object literal for the 'Dto' container reference feature.\\n\\t\\tEReference REFERENCE__DTO = eINSTANCE.getReference_Dto();\",\n \"old_methods\": [],\n \"patch\": \"@@ -7,8 +7,6 @@\\n * \\n * Contributors:\\n * Obeo - initial API and implementation\\n- *\\n- * $Id$\\n */\\n package org.obeonetwork.dsl.environment;\\n \\n@@ -55,7 +53,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * \\n \\t * @generated\\n \\t */\\n-\\tString eNS_URI = \\\"http://www.obeonetwork.org/dsl/environment/2.0.0\\\";\\n+\\tString eNS_URI = \\\"http://www.obeonetwork.org/dsl/environment/3.0.0\\\";\\n \\n \\t/**\\n \\t * The package namespace name.\\n@@ -74,76 +72,6 @@ public interface EnvironmentPackage extends EPackage {\\n \\tEnvironmentPackage eINSTANCE = org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl\\n \\t\\t\\t.init();\\n \\n-\\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnvironmentImpl Environment}' class.\\n-\\t * \\n-\\t * \\n-\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentImpl\\n-\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnvironment()\\n-\\t * @generated\\n-\\t */\\n-\\tint ENVIRONMENT = 0;\\n-\\n-\\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl Type}' class.\\n-\\t * \\n-\\t * \\n-\\t * @see org.obeonetwork.dsl.environment.impl.TypeImpl\\n-\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getType()\\n-\\t * @generated\\n-\\t */\\n-\\tint TYPE = 1;\\n-\\n-\\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl Primitive Type}' class.\\n-\\t * \\n-\\t * \\n-\\t * @see org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl\\n-\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getPrimitiveType()\\n-\\t * @generated\\n-\\t */\\n-\\tint PRIMITIVE_TYPE = 2;\\n-\\n-\\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnumerationImpl Enumeration}' class.\\n-\\t * \\n-\\t * \\n-\\t * @see org.obeonetwork.dsl.environment.impl.EnumerationImpl\\n-\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnumeration()\\n-\\t * @generated\\n-\\t */\\n-\\tint ENUMERATION = 3;\\n-\\n-\\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FieldImpl Field}' class.\\n-\\t * \\n-\\t * \\n-\\t * @see org.obeonetwork.dsl.environment.impl.FieldImpl\\n-\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getField()\\n-\\t * @generated\\n-\\t */\\n-\\tint FIELD = 4;\\n-\\n-\\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ActionImpl Action}' class.\\n-\\t * \\n-\\t * \\n-\\t * @see org.obeonetwork.dsl.environment.impl.ActionImpl\\n-\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getAction()\\n-\\t * @generated\\n-\\t */\\n-\\tint ACTION = 5;\\n-\\n-\\t/**\\n-\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl Inter DSM Link}' class.\\n-\\t * \\n-\\t * \\n-\\t * @see org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl\\n-\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getInterDSMLink()\\n-\\t * @generated\\n-\\t */\\n-\\tint INTER_DSM_LINK = 6;\\n-\\n \\t/**\\n \\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ObeoDSMObjectImpl Obeo DSM Object}' class.\\n \\t * \\n@@ -235,6 +163,16 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tint OBEO_DSM_OBJECT_FEATURE_COUNT = 8;\\n \\n+\\t/**\\n+\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnvironmentImpl Environment}' class.\\n+\\t * \\n+\\t * \\n+\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentImpl\\n+\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnvironment()\\n+\\t * @generated\\n+\\t */\\n+\\tint ENVIRONMENT = 0;\\n+\\n \\t/**\\n \\t * The feature id for the 'Metadatas' containment reference.\\n \\t * \\n@@ -352,14 +290,33 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tint ENVIRONMENT__TYPES_DEFINITION = OBEO_DSM_OBJECT_FEATURE_COUNT + 4;\\n \\n+\\t/**\\n+\\t * The feature id for the 'Namespaces' containment reference list.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint ENVIRONMENT__NAMESPACES = OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\\n+\\n \\t/**\\n \\t * The number of structural features of the 'Environment' class.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ENVIRONMENT_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 5;\\n+\\tint ENVIRONMENT_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 6;\\n+\\n+\\t/**\\n+\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl Type}' class.\\n+\\t * \\n+\\t * \\n+\\t * @see org.obeonetwork.dsl.environment.impl.TypeImpl\\n+\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getType()\\n+\\t * @generated\\n+\\t */\\n+\\tint TYPE = 1;\\n \\n \\t/**\\n \\t * The feature id for the 'Metadatas' containment reference.\\n@@ -460,6 +417,16 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tint TYPE_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n \\n+\\t/**\\n+\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl Primitive Type}' class.\\n+\\t * \\n+\\t * \\n+\\t * @see org.obeonetwork.dsl.environment.impl.PrimitiveTypeImpl\\n+\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getPrimitiveType()\\n+\\t * @generated\\n+\\t */\\n+\\tint PRIMITIVE_TYPE = 2;\\n+\\n \\t/**\\n \\t * The feature id for the 'Metadatas' containment reference.\\n \\t * \\n@@ -559,6 +526,16 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tint PRIMITIVE_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 0;\\n \\n+\\t/**\\n+\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.EnumerationImpl Enumeration}' class.\\n+\\t * \\n+\\t * \\n+\\t * @see org.obeonetwork.dsl.environment.impl.EnumerationImpl\\n+\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getEnumeration()\\n+\\t * @generated\\n+\\t */\\n+\\tint ENUMERATION = 3;\\n+\\n \\t/**\\n \\t * The feature id for the 'Metadatas' containment reference.\\n \\t * \\n@@ -667,6 +644,16 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tint ENUMERATION_FEATURE_COUNT = TYPE_FEATURE_COUNT + 1;\\n \\n+\\t/**\\n+\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FieldImpl Field}' class.\\n+\\t * \\n+\\t * \\n+\\t * @see org.obeonetwork.dsl.environment.impl.FieldImpl\\n+\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getField()\\n+\\t * @generated\\n+\\t */\\n+\\tint FIELD = 4;\\n+\\n \\t/**\\n \\t * The feature id for the 'Metadatas' containment reference.\\n \\t * \\n@@ -757,6 +744,16 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tint FIELD_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\\n \\n+\\t/**\\n+\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.ActionImpl Action}' class.\\n+\\t * \\n+\\t * \\n+\\t * @see org.obeonetwork.dsl.environment.impl.ActionImpl\\n+\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getAction()\\n+\\t * @generated\\n+\\t */\\n+\\tint ACTION = 5;\\n+\\n \\t/**\\n \\t * The feature id for the 'Metadatas' containment reference.\\n \\t * \\n@@ -847,6 +844,16 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tint ACTION_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\\n \\n+\\t/**\\n+\\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl Inter DSM Link}' class.\\n+\\t * \\n+\\t * \\n+\\t * @see org.obeonetwork.dsl.environment.impl.InterDSMLinkImpl\\n+\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getInterDSMLink()\\n+\\t * @generated\\n+\\t */\\n+\\tint INTER_DSM_LINK = 6;\\n+\\n \\t/**\\n \\t * The feature id for the 'Metadatas' containment reference.\\n \\t * \\n@@ -1521,14 +1528,77 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tint STRUCTURED_TYPE__TYPE_DEFINITION = TYPE__TYPE_DEFINITION;\\n \\n+\\t/**\\n+\\t * The feature id for the 'Supertype' reference.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint STRUCTURED_TYPE__SUPERTYPE = TYPE_FEATURE_COUNT + 0;\\n+\\n+\\t/**\\n+\\t * The feature id for the 'Associated Types' reference list.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint STRUCTURED_TYPE__ASSOCIATED_TYPES = TYPE_FEATURE_COUNT + 1;\\n+\\n+\\t/**\\n+\\t * The feature id for the 'Owned Attributes' containment reference list.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint STRUCTURED_TYPE__OWNED_ATTRIBUTES = TYPE_FEATURE_COUNT + 2;\\n+\\n+\\t/**\\n+\\t * The feature id for the 'Attributes' reference list.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint STRUCTURED_TYPE__ATTRIBUTES = TYPE_FEATURE_COUNT + 3;\\n+\\n+\\t/**\\n+\\t * The feature id for the 'Owned References' containment reference list.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint STRUCTURED_TYPE__OWNED_REFERENCES = TYPE_FEATURE_COUNT + 4;\\n+\\n+\\t/**\\n+\\t * The feature id for the 'References' reference list.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint STRUCTURED_TYPE__REFERENCES = TYPE_FEATURE_COUNT + 5;\\n+\\n+\\t/**\\n+\\t * The feature id for the 'Properties' reference list.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint STRUCTURED_TYPE__PROPERTIES = TYPE_FEATURE_COUNT + 6;\\n+\\n \\t/**\\n \\t * The number of structural features of the 'Structured Type' class.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint STRUCTURED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 0;\\n+\\tint STRUCTURED_TYPE_FEATURE_COUNT = TYPE_FEATURE_COUNT + 7;\\n \\n \\t/**\\n \\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl DTO}' class.\\n@@ -1631,13 +1701,13 @@ public interface EnvironmentPackage extends EPackage {\\n \\tint DTO__TYPE_DEFINITION = STRUCTURED_TYPE__TYPE_DEFINITION;\\n \\n \\t/**\\n-\\t * The feature id for the 'Owned Container' containment reference.\\n+\\t * The feature id for the 'Supertype' reference.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint DTO__OWNED_CONTAINER = STRUCTURED_TYPE_FEATURE_COUNT + 0;\\n+\\tint DTO__SUPERTYPE = STRUCTURED_TYPE__SUPERTYPE;\\n \\n \\t/**\\n \\t * The feature id for the 'Associated Types' reference list.\\n@@ -1646,25 +1716,25 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint DTO__ASSOCIATED_TYPES = STRUCTURED_TYPE_FEATURE_COUNT + 1;\\n+\\tint DTO__ASSOCIATED_TYPES = STRUCTURED_TYPE__ASSOCIATED_TYPES;\\n \\n \\t/**\\n-\\t * The feature id for the 'Properties' reference list.\\n+\\t * The feature id for the 'Owned Attributes' containment reference list.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint DTO__PROPERTIES = STRUCTURED_TYPE_FEATURE_COUNT + 2;\\n+\\tint DTO__OWNED_ATTRIBUTES = STRUCTURED_TYPE__OWNED_ATTRIBUTES;\\n \\n \\t/**\\n-\\t * The feature id for the 'References' reference list.\\n+\\t * The feature id for the 'Attributes' reference list.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint DTO__REFERENCES = STRUCTURED_TYPE_FEATURE_COUNT + 3;\\n+\\tint DTO__ATTRIBUTES = STRUCTURED_TYPE__ATTRIBUTES;\\n \\n \\t/**\\n \\t * The feature id for the 'Owned References' containment reference list.\\n@@ -1673,34 +1743,34 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint DTO__OWNED_REFERENCES = STRUCTURED_TYPE_FEATURE_COUNT + 4;\\n+\\tint DTO__OWNED_REFERENCES = STRUCTURED_TYPE__OWNED_REFERENCES;\\n \\n \\t/**\\n-\\t * The feature id for the 'Attributes' reference list.\\n+\\t * The feature id for the 'References' reference list.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint DTO__ATTRIBUTES = STRUCTURED_TYPE_FEATURE_COUNT + 5;\\n+\\tint DTO__REFERENCES = STRUCTURED_TYPE__REFERENCES;\\n \\n \\t/**\\n-\\t * The feature id for the 'Owned Attributes' containment reference list.\\n+\\t * The feature id for the 'Properties' reference list.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint DTO__OWNED_ATTRIBUTES = STRUCTURED_TYPE_FEATURE_COUNT + 6;\\n+\\tint DTO__PROPERTIES = STRUCTURED_TYPE__PROPERTIES;\\n \\n \\t/**\\n-\\t * The feature id for the 'Supertype' reference.\\n+\\t * The feature id for the 'Owned Container' containment reference.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint DTO__SUPERTYPE = STRUCTURED_TYPE_FEATURE_COUNT + 7;\\n+\\tint DTO__OWNED_CONTAINER = STRUCTURED_TYPE_FEATURE_COUNT + 0;\\n \\n \\t/**\\n \\t * The number of structural features of the 'DTO' class.\\n@@ -1709,7 +1779,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint DTO_FEATURE_COUNT = STRUCTURED_TYPE_FEATURE_COUNT + 8;\\n+\\tint DTO_FEATURE_COUNT = STRUCTURED_TYPE_FEATURE_COUNT + 1;\\n \\n \\t/**\\n \\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.FilterContainerImpl Filter Container}' class.\\n@@ -1919,7 +1989,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint NAMESPACE__METADATAS = OBEO_DSM_OBJECT__METADATAS;\\n+\\tint NAMESPACE__METADATAS = TYPES_DEFINITION__METADATAS;\\n \\n \\t/**\\n \\t * The feature id for the 'Description' attribute.\\n@@ -1928,7 +1998,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint NAMESPACE__DESCRIPTION = OBEO_DSM_OBJECT__DESCRIPTION;\\n+\\tint NAMESPACE__DESCRIPTION = TYPES_DEFINITION__DESCRIPTION;\\n \\n \\t/**\\n \\t * The feature id for the 'Keywords' attribute list.\\n@@ -1937,7 +2007,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint NAMESPACE__KEYWORDS = OBEO_DSM_OBJECT__KEYWORDS;\\n+\\tint NAMESPACE__KEYWORDS = TYPES_DEFINITION__KEYWORDS;\\n \\n \\t/**\\n \\t * The feature id for the 'Behaviours' containment reference list.\\n@@ -1946,7 +2016,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint NAMESPACE__BEHAVIOURS = OBEO_DSM_OBJECT__BEHAVIOURS;\\n+\\tint NAMESPACE__BEHAVIOURS = TYPES_DEFINITION__BEHAVIOURS;\\n \\n \\t/**\\n \\t * The feature id for the 'Binding Registries' reference list.\\n@@ -1955,7 +2025,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint NAMESPACE__BINDING_REGISTRIES = OBEO_DSM_OBJECT__BINDING_REGISTRIES;\\n+\\tint NAMESPACE__BINDING_REGISTRIES = TYPES_DEFINITION__BINDING_REGISTRIES;\\n \\n \\t/**\\n \\t * The feature id for the 'Version' attribute.\\n@@ -1964,7 +2034,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint NAMESPACE__VERSION = OBEO_DSM_OBJECT__VERSION;\\n+\\tint NAMESPACE__VERSION = TYPES_DEFINITION__VERSION;\\n \\n \\t/**\\n \\t * The feature id for the 'Created On' attribute.\\n@@ -1973,7 +2043,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint NAMESPACE__CREATED_ON = OBEO_DSM_OBJECT__CREATED_ON;\\n+\\tint NAMESPACE__CREATED_ON = TYPES_DEFINITION__CREATED_ON;\\n \\n \\t/**\\n \\t * The feature id for the 'Modified On' attribute.\\n@@ -1982,7 +2052,16 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint NAMESPACE__MODIFIED_ON = OBEO_DSM_OBJECT__MODIFIED_ON;\\n+\\tint NAMESPACE__MODIFIED_ON = TYPES_DEFINITION__MODIFIED_ON;\\n+\\n+\\t/**\\n+\\t * The feature id for the 'Types' containment reference list.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint NAMESPACE__TYPES = TYPES_DEFINITION__TYPES;\\n \\n \\t/**\\n \\t * The feature id for the 'Owned Namespaces' containment reference list.\\n@@ -1991,7 +2070,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint NAMESPACE__OWNED_NAMESPACES = OBEO_DSM_OBJECT_FEATURE_COUNT + 0;\\n+\\tint NAMESPACE__OWNED_NAMESPACES = TYPES_DEFINITION_FEATURE_COUNT + 0;\\n \\n \\t/**\\n \\t * The feature id for the 'Owner' container reference.\\n@@ -2000,7 +2079,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint NAMESPACE__OWNER = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\\n+\\tint NAMESPACE__OWNER = TYPES_DEFINITION_FEATURE_COUNT + 1;\\n \\n \\t/**\\n \\t * The feature id for the 'Name' attribute.\\n@@ -2009,7 +2088,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint NAMESPACE__NAME = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n+\\tint NAMESPACE__NAME = TYPES_DEFINITION_FEATURE_COUNT + 2;\\n \\n \\t/**\\n \\t * The number of structural features of the 'Namespace' class.\\n@@ -2018,7 +2097,7 @@ public interface EnvironmentPackage extends EPackage {\\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint NAMESPACE_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\\n+\\tint NAMESPACE_FEATURE_COUNT = TYPES_DEFINITION_FEATURE_COUNT + 3;\\n \\n \\t/**\\n \\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.PropertyImpl Property}' class.\\n@@ -2120,14 +2199,23 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tint PROPERTY__MULTIPLICITY = OBEO_DSM_OBJECT_FEATURE_COUNT + 1;\\n \\n+\\t/**\\n+\\t * The feature id for the 'Is Identifier' attribute.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint PROPERTY__IS_IDENTIFIER = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n+\\n \\t/**\\n \\t * The number of structural features of the 'Property' class.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint PROPERTY_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 2;\\n+\\tint PROPERTY_FEATURE_COUNT = OBEO_DSM_OBJECT_FEATURE_COUNT + 3;\\n \\n \\t/**\\n \\t * The meta object id for the '{@link org.obeonetwork.dsl.environment.impl.AttributeImpl Attribute}' class.\\n@@ -2229,6 +2317,15 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tint ATTRIBUTE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\\n \\n+\\t/**\\n+\\t * The feature id for the 'Is Identifier' attribute.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint ATTRIBUTE__IS_IDENTIFIER = PROPERTY__IS_IDENTIFIER;\\n+\\n \\t/**\\n \\t * The feature id for the 'Type' reference.\\n \\t * \\n@@ -2239,13 +2336,13 @@ public interface EnvironmentPackage extends EPackage {\\n \\tint ATTRIBUTE__TYPE = PROPERTY_FEATURE_COUNT + 0;\\n \\n \\t/**\\n-\\t * The feature id for the 'Dto' container reference.\\n+\\t * The feature id for the 'Containing Type' container reference.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint ATTRIBUTE__DTO = PROPERTY_FEATURE_COUNT + 1;\\n+\\tint ATTRIBUTE__CONTAINING_TYPE = PROPERTY_FEATURE_COUNT + 1;\\n \\n \\t/**\\n \\t * The number of structural features of the 'Attribute' class.\\n@@ -2356,6 +2453,15 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tint REFERENCE__MULTIPLICITY = PROPERTY__MULTIPLICITY;\\n \\n+\\t/**\\n+\\t * The feature id for the 'Is Identifier' attribute.\\n+\\t * \\n+\\t * \\n+\\t * @generated\\n+\\t * @ordered\\n+\\t */\\n+\\tint REFERENCE__IS_IDENTIFIER = PROPERTY__IS_IDENTIFIER;\\n+\\n \\t/**\\n \\t * The feature id for the 'Is Composite' attribute.\\n \\t * \\n@@ -2384,22 +2490,22 @@ public interface EnvironmentPackage extends EPackage {\\n \\tint REFERENCE__OPPOSITE_OF = PROPERTY_FEATURE_COUNT + 2;\\n \\n \\t/**\\n-\\t * The feature id for the 'Type' reference.\\n+\\t * The feature id for the 'Containing Type' container reference.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint REFERENCE__TYPE = PROPERTY_FEATURE_COUNT + 3;\\n+\\tint REFERENCE__CONTAINING_TYPE = PROPERTY_FEATURE_COUNT + 3;\\n \\n \\t/**\\n-\\t * The feature id for the 'Dto' container reference.\\n+\\t * The feature id for the 'Referenced Type' reference.\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t * @ordered\\n \\t */\\n-\\tint REFERENCE__DTO = PROPERTY_FEATURE_COUNT + 4;\\n+\\tint REFERENCE__REFERENCED_TYPE = PROPERTY_FEATURE_COUNT + 4;\\n \\n \\t/**\\n \\t * The number of structural features of the 'Reference' class.\\n@@ -3003,6 +3109,17 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tEReference getEnvironment_TypesDefinition();\\n \\n+\\t/**\\n+\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.Environment#getNamespaces Namespaces}'.\\n+\\t * \\n+\\t * \\n+\\t * @return the meta object for the containment reference list 'Namespaces'.\\n+\\t * @see org.obeonetwork.dsl.environment.Environment#getNamespaces()\\n+\\t * @see #getEnvironment()\\n+\\t * @generated\\n+\\t */\\n+\\tEReference getEnvironment_Namespaces();\\n+\\n \\t/**\\n \\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.Type Type}'.\\n \\t * \\n@@ -3385,102 +3502,102 @@ public interface EnvironmentPackage extends EPackage {\\n \\tEClass getStructuredType();\\n \\n \\t/**\\n-\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.DTO DTO}'.\\n+\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype Supertype}'.\\n \\t * \\n \\t * \\n-\\t * @return the meta object for class 'DTO'.\\n-\\t * @see org.obeonetwork.dsl.environment.DTO\\n+\\t * @return the meta object for the reference 'Supertype'.\\n+\\t * @see org.obeonetwork.dsl.environment.StructuredType#getSupertype()\\n+\\t * @see #getStructuredType()\\n \\t * @generated\\n \\t */\\n-\\tEClass getDTO();\\n+\\tEReference getStructuredType_Supertype();\\n \\n \\t/**\\n-\\t * Returns the meta object for the containment reference '{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer Owned Container}'.\\n+\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes Associated Types}'.\\n \\t * \\n \\t * \\n-\\t * @return the meta object for the containment reference 'Owned Container'.\\n-\\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedContainer()\\n-\\t * @see #getDTO()\\n+\\t * @return the meta object for the reference list 'Associated Types'.\\n+\\t * @see org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes()\\n+\\t * @see #getStructuredType()\\n \\t * @generated\\n \\t */\\n-\\tEReference getDTO_OwnedContainer();\\n+\\tEReference getStructuredType_AssociatedTypes();\\n \\n \\t/**\\n-\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getAssociatedTypes Associated Types}'.\\n+\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes Owned Attributes}'.\\n \\t * \\n \\t * \\n-\\t * @return the meta object for the reference list 'Associated Types'.\\n-\\t * @see org.obeonetwork.dsl.environment.DTO#getAssociatedTypes()\\n-\\t * @see #getDTO()\\n+\\t * @return the meta object for the containment reference list 'Owned Attributes'.\\n+\\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes()\\n+\\t * @see #getStructuredType()\\n \\t * @generated\\n \\t */\\n-\\tEReference getDTO_AssociatedTypes();\\n+\\tEReference getStructuredType_OwnedAttributes();\\n \\n \\t/**\\n-\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getProperties Properties}'.\\n+\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getAttributes Attributes}'.\\n \\t * \\n \\t * \\n-\\t * @return the meta object for the reference list 'Properties'.\\n-\\t * @see org.obeonetwork.dsl.environment.DTO#getProperties()\\n-\\t * @see #getDTO()\\n+\\t * @return the meta object for the reference list 'Attributes'.\\n+\\t * @see org.obeonetwork.dsl.environment.StructuredType#getAttributes()\\n+\\t * @see #getStructuredType()\\n \\t * @generated\\n \\t */\\n-\\tEReference getDTO_Properties();\\n+\\tEReference getStructuredType_Attributes();\\n \\n \\t/**\\n-\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getReferences References}'.\\n+\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences Owned References}'.\\n \\t * \\n \\t * \\n-\\t * @return the meta object for the reference list 'References'.\\n-\\t * @see org.obeonetwork.dsl.environment.DTO#getReferences()\\n-\\t * @see #getDTO()\\n+\\t * @return the meta object for the containment reference list 'Owned References'.\\n+\\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences()\\n+\\t * @see #getStructuredType()\\n \\t * @generated\\n \\t */\\n-\\tEReference getDTO_References();\\n+\\tEReference getStructuredType_OwnedReferences();\\n \\n \\t/**\\n-\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences Owned References}'.\\n+\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getReferences References}'.\\n \\t * \\n \\t * \\n-\\t * @return the meta object for the containment reference list 'Owned References'.\\n-\\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedReferences()\\n-\\t * @see #getDTO()\\n+\\t * @return the meta object for the reference list 'References'.\\n+\\t * @see org.obeonetwork.dsl.environment.StructuredType#getReferences()\\n+\\t * @see #getStructuredType()\\n \\t * @generated\\n \\t */\\n-\\tEReference getDTO_OwnedReferences();\\n+\\tEReference getStructuredType_References();\\n \\n \\t/**\\n-\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.DTO#getAttributes Attributes}'.\\n+\\t * Returns the meta object for the reference list '{@link org.obeonetwork.dsl.environment.StructuredType#getProperties Properties}'.\\n \\t * \\n \\t * \\n-\\t * @return the meta object for the reference list 'Attributes'.\\n-\\t * @see org.obeonetwork.dsl.environment.DTO#getAttributes()\\n-\\t * @see #getDTO()\\n+\\t * @return the meta object for the reference list 'Properties'.\\n+\\t * @see org.obeonetwork.dsl.environment.StructuredType#getProperties()\\n+\\t * @see #getStructuredType()\\n \\t * @generated\\n \\t */\\n-\\tEReference getDTO_Attributes();\\n+\\tEReference getStructuredType_Properties();\\n \\n \\t/**\\n-\\t * Returns the meta object for the containment reference list '{@link org.obeonetwork.dsl.environment.DTO#getOwnedAttributes Owned Attributes}'.\\n+\\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.DTO DTO}'.\\n \\t * \\n \\t * \\n-\\t * @return the meta object for the containment reference list 'Owned Attributes'.\\n-\\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedAttributes()\\n-\\t * @see #getDTO()\\n+\\t * @return the meta object for class 'DTO'.\\n+\\t * @see org.obeonetwork.dsl.environment.DTO\\n \\t * @generated\\n \\t */\\n-\\tEReference getDTO_OwnedAttributes();\\n+\\tEClass getDTO();\\n \\n \\t/**\\n-\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.DTO#getSupertype Supertype}'.\\n+\\t * Returns the meta object for the containment reference '{@link org.obeonetwork.dsl.environment.DTO#getOwnedContainer Owned Container}'.\\n \\t * \\n \\t * \\n-\\t * @return the meta object for the reference 'Supertype'.\\n-\\t * @see org.obeonetwork.dsl.environment.DTO#getSupertype()\\n+\\t * @return the meta object for the containment reference 'Owned Container'.\\n+\\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedContainer()\\n \\t * @see #getDTO()\\n \\t * @generated\\n \\t */\\n-\\tEReference getDTO_Supertype();\\n+\\tEReference getDTO_OwnedContainer();\\n \\n \\t/**\\n \\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.FilterContainer Filter Container}'.\\n@@ -3578,15 +3695,15 @@ public interface EnvironmentPackage extends EPackage {\\n \\tEReference getAttribute_Type();\\n \\n \\t/**\\n-\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Attribute#getDto Dto}'.\\n+\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}'.\\n \\t * \\n \\t * \\n-\\t * @return the meta object for the container reference 'Dto'.\\n-\\t * @see org.obeonetwork.dsl.environment.Attribute#getDto()\\n+\\t * @return the meta object for the container reference 'Containing Type'.\\n+\\t * @see org.obeonetwork.dsl.environment.Attribute#getContainingType()\\n \\t * @see #getAttribute()\\n \\t * @generated\\n \\t */\\n-\\tEReference getAttribute_Dto();\\n+\\tEReference getAttribute_ContainingType();\\n \\n \\t/**\\n \\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.Reference Reference}'.\\n@@ -3632,26 +3749,26 @@ public interface EnvironmentPackage extends EPackage {\\n \\tEReference getReference_OppositeOf();\\n \\n \\t/**\\n-\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.Reference#getType Type}'.\\n+\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}'.\\n \\t * \\n \\t * \\n-\\t * @return the meta object for the reference 'Type'.\\n-\\t * @see org.obeonetwork.dsl.environment.Reference#getType()\\n+\\t * @return the meta object for the container reference 'Containing Type'.\\n+\\t * @see org.obeonetwork.dsl.environment.Reference#getContainingType()\\n \\t * @see #getReference()\\n \\t * @generated\\n \\t */\\n-\\tEReference getReference_Type();\\n+\\tEReference getReference_ContainingType();\\n \\n \\t/**\\n-\\t * Returns the meta object for the container reference '{@link org.obeonetwork.dsl.environment.Reference#getDto Dto}'.\\n+\\t * Returns the meta object for the reference '{@link org.obeonetwork.dsl.environment.Reference#getReferencedType Referenced Type}'.\\n \\t * \\n \\t * \\n-\\t * @return the meta object for the container reference 'Dto'.\\n-\\t * @see org.obeonetwork.dsl.environment.Reference#getDto()\\n+\\t * @return the meta object for the reference 'Referenced Type'.\\n+\\t * @see org.obeonetwork.dsl.environment.Reference#getReferencedType()\\n \\t * @see #getReference()\\n \\t * @generated\\n \\t */\\n-\\tEReference getReference_Dto();\\n+\\tEReference getReference_ReferencedType();\\n \\n \\t/**\\n \\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.Property Property}'.\\n@@ -3685,6 +3802,17 @@ public interface EnvironmentPackage extends EPackage {\\n \\t */\\n \\tEAttribute getProperty_Multiplicity();\\n \\n+\\t/**\\n+\\t * Returns the meta object for the attribute '{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier Is Identifier}'.\\n+\\t * \\n+\\t * \\n+\\t * @return the meta object for the attribute 'Is Identifier'.\\n+\\t * @see org.obeonetwork.dsl.environment.Property#isIsIdentifier()\\n+\\t * @see #getProperty()\\n+\\t * @generated\\n+\\t */\\n+\\tEAttribute getProperty_IsIdentifier();\\n+\\n \\t/**\\n \\t * Returns the meta object for class '{@link org.obeonetwork.dsl.environment.BindingInfo Binding Info}'.\\n \\t * \\n@@ -3984,6 +4112,15 @@ interface Literals {\\n \\t\\tEReference ENVIRONMENT__TYPES_DEFINITION = eINSTANCE\\n \\t\\t\\t\\t.getEnvironment_TypesDefinition();\\n \\n+\\t\\t/**\\n+\\t\\t * The meta object literal for the 'Namespaces' containment reference list feature.\\n+\\t\\t * \\n+\\t\\t * \\n+\\t\\t * @generated\\n+\\t\\t */\\n+\\t\\tEReference ENVIRONMENT__NAMESPACES = eINSTANCE\\n+\\t\\t\\t\\t.getEnvironment_Namespaces();\\n+\\n \\t\\t/**\\n \\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.TypeImpl Type}' class.\\n \\t\\t * \\n@@ -4314,78 +4451,85 @@ interface Literals {\\n \\t\\tEClass STRUCTURED_TYPE = eINSTANCE.getStructuredType();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl DTO}' class.\\n+\\t\\t * The meta object literal for the 'Supertype' reference feature.\\n \\t\\t * \\n \\t\\t * \\n-\\t\\t * @see org.obeonetwork.dsl.environment.impl.DTOImpl\\n-\\t\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getDTO()\\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEClass DTO = eINSTANCE.getDTO();\\n+\\t\\tEReference STRUCTURED_TYPE__SUPERTYPE = eINSTANCE\\n+\\t\\t\\t\\t.getStructuredType_Supertype();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the 'Owned Container' containment reference feature.\\n+\\t\\t * The meta object literal for the 'Associated Types' reference list feature.\\n \\t\\t * \\n \\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference DTO__OWNED_CONTAINER = eINSTANCE.getDTO_OwnedContainer();\\n+\\t\\tEReference STRUCTURED_TYPE__ASSOCIATED_TYPES = eINSTANCE\\n+\\t\\t\\t\\t.getStructuredType_AssociatedTypes();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the 'Associated Types' reference list feature.\\n+\\t\\t * The meta object literal for the 'Owned Attributes' containment reference list feature.\\n \\t\\t * \\n \\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference DTO__ASSOCIATED_TYPES = eINSTANCE.getDTO_AssociatedTypes();\\n+\\t\\tEReference STRUCTURED_TYPE__OWNED_ATTRIBUTES = eINSTANCE\\n+\\t\\t\\t\\t.getStructuredType_OwnedAttributes();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the 'Properties' reference list feature.\\n+\\t\\t * The meta object literal for the 'Attributes' reference list feature.\\n \\t\\t * \\n \\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference DTO__PROPERTIES = eINSTANCE.getDTO_Properties();\\n+\\t\\tEReference STRUCTURED_TYPE__ATTRIBUTES = eINSTANCE\\n+\\t\\t\\t\\t.getStructuredType_Attributes();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the 'References' reference list feature.\\n+\\t\\t * The meta object literal for the 'Owned References' containment reference list feature.\\n \\t\\t * \\n \\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference DTO__REFERENCES = eINSTANCE.getDTO_References();\\n+\\t\\tEReference STRUCTURED_TYPE__OWNED_REFERENCES = eINSTANCE\\n+\\t\\t\\t\\t.getStructuredType_OwnedReferences();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the 'Owned References' containment reference list feature.\\n+\\t\\t * The meta object literal for the 'References' reference list feature.\\n \\t\\t * \\n \\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference DTO__OWNED_REFERENCES = eINSTANCE.getDTO_OwnedReferences();\\n+\\t\\tEReference STRUCTURED_TYPE__REFERENCES = eINSTANCE\\n+\\t\\t\\t\\t.getStructuredType_References();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the 'Attributes' reference list feature.\\n+\\t\\t * The meta object literal for the 'Properties' reference list feature.\\n \\t\\t * \\n \\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference DTO__ATTRIBUTES = eINSTANCE.getDTO_Attributes();\\n+\\t\\tEReference STRUCTURED_TYPE__PROPERTIES = eINSTANCE\\n+\\t\\t\\t\\t.getStructuredType_Properties();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the 'Owned Attributes' containment reference list feature.\\n+\\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.DTOImpl DTO}' class.\\n \\t\\t * \\n \\t\\t * \\n+\\t\\t * @see org.obeonetwork.dsl.environment.impl.DTOImpl\\n+\\t\\t * @see org.obeonetwork.dsl.environment.impl.EnvironmentPackageImpl#getDTO()\\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference DTO__OWNED_ATTRIBUTES = eINSTANCE.getDTO_OwnedAttributes();\\n+\\t\\tEClass DTO = eINSTANCE.getDTO();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the 'Supertype' reference feature.\\n+\\t\\t * The meta object literal for the 'Owned Container' containment reference feature.\\n \\t\\t * \\n \\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference DTO__SUPERTYPE = eINSTANCE.getDTO_Supertype();\\n+\\t\\tEReference DTO__OWNED_CONTAINER = eINSTANCE.getDTO_OwnedContainer();\\n \\n \\t\\t/**\\n \\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.FilterContainerImpl Filter Container}' class.\\n@@ -4470,12 +4614,13 @@ interface Literals {\\n \\t\\tEReference ATTRIBUTE__TYPE = eINSTANCE.getAttribute_Type();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the 'Dto' container reference feature.\\n+\\t\\t * The meta object literal for the 'Containing Type' container reference feature.\\n \\t\\t * \\n \\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference ATTRIBUTE__DTO = eINSTANCE.getAttribute_Dto();\\n+\\t\\tEReference ATTRIBUTE__CONTAINING_TYPE = eINSTANCE\\n+\\t\\t\\t\\t.getAttribute_ContainingType();\\n \\n \\t\\t/**\\n \\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.ReferenceImpl Reference}' class.\\n@@ -4513,20 +4658,22 @@ interface Literals {\\n \\t\\tEReference REFERENCE__OPPOSITE_OF = eINSTANCE.getReference_OppositeOf();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the 'Type' reference feature.\\n+\\t\\t * The meta object literal for the 'Containing Type' container reference feature.\\n \\t\\t * \\n \\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference REFERENCE__TYPE = eINSTANCE.getReference_Type();\\n+\\t\\tEReference REFERENCE__CONTAINING_TYPE = eINSTANCE\\n+\\t\\t\\t\\t.getReference_ContainingType();\\n \\n \\t\\t/**\\n-\\t\\t * The meta object literal for the 'Dto' container reference feature.\\n+\\t\\t * The meta object literal for the 'Referenced Type' reference feature.\\n \\t\\t * \\n \\t\\t * \\n \\t\\t * @generated\\n \\t\\t */\\n-\\t\\tEReference REFERENCE__DTO = eINSTANCE.getReference_Dto();\\n+\\t\\tEReference REFERENCE__REFERENCED_TYPE = eINSTANCE\\n+\\t\\t\\t\\t.getReference_ReferencedType();\\n \\n \\t\\t/**\\n \\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.PropertyImpl Property}' class.\\n@@ -4555,6 +4702,15 @@ interface Literals {\\n \\t\\tEAttribute PROPERTY__MULTIPLICITY = eINSTANCE\\n \\t\\t\\t\\t.getProperty_Multiplicity();\\n \\n+\\t\\t/**\\n+\\t\\t * The meta object literal for the 'Is Identifier' attribute feature.\\n+\\t\\t * \\n+\\t\\t * \\n+\\t\\t * @generated\\n+\\t\\t */\\n+\\t\\tEAttribute PROPERTY__IS_IDENTIFIER = eINSTANCE\\n+\\t\\t\\t\\t.getProperty_IsIdentifier();\\n+\\n \\t\\t/**\\n \\t\\t * The meta object literal for the '{@link org.obeonetwork.dsl.environment.impl.BindingInfoImpl Binding Info}' class.\\n \\t\\t * \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FEnvironmentPackage.java\",\n \"sha\": \"0ad0495209f0622687e7f0ccf75ce699a21a2c88\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FNamespace.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FNamespace.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 1,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Namespace.java\",\n \"new_code\": \"public interface Namespace extends TypesDefinition {\",\n \"new_methods\": [],\n \"old_code\": \"public interface Namespace extends ObeoDSMObject {\",\n \"old_methods\": [],\n \"patch\": \"@@ -32,7 +32,7 @@\\n * @model\\n * @generated\\n */\\n-public interface Namespace extends ObeoDSMObject {\\n+public interface Namespace extends TypesDefinition {\\n \\t/**\\n \\t * \\n \\t * \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FNamespace.java\",\n \"sha\": \"ed1b5d40d21b98228772c5487820ead8c60e6cc1\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 27,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FProperty.java\",\n \"changes\": 27,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FProperty.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Property.java\",\n \"new_code\": \" *
  • {@link org.obeonetwork.dsl.environment.Property#isIsIdentifier Is Identifier}
    • \\n\\t/**\\n\\t * Returns the value of the 'Is Identifier' attribute.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Is Identifier' attribute isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Is Identifier' attribute.\\n\\t * @see #setIsIdentifier(boolean)\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getProperty_IsIdentifier()\\n\\t * @model\\n\\t * @generated\\n\\t */\\n\\tboolean isIsIdentifier();\\n\\n\\t/**\\n\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier Is Identifier}' attribute.\\n\\t * \\n\\t * \\n\\t * @param value the new value of the 'Is Identifier' attribute.\\n\\t * @see #isIsIdentifier()\\n\\t * @generated\\n\\t */\\n\\tvoid setIsIdentifier(boolean value);\\n\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -22,6 +22,7 @@\\n *
      \\n *
    • {@link org.obeonetwork.dsl.environment.Property#getName Name}
      • \\n *
    • {@link org.obeonetwork.dsl.environment.Property#getMultiplicity Multiplicity}
      • \\n+ *
    • {@link org.obeonetwork.dsl.environment.Property#isIsIdentifier Is Identifier}
      • \\n *
    \\n *

    \\n *\\n@@ -92,4 +93,30 @@ public interface Property extends ObeoDSMObject, BoundableElement {\\n \\t */\\n \\tvoid setMultiplicity(MultiplicityKind value);\\n \\n+\\t/**\\n+\\t * Returns the value of the 'Is Identifier' attribute.\\n+\\t * \\n+\\t *

    \\n+\\t * If the meaning of the 'Is Identifier' attribute isn't clear,\\n+\\t * there really should be more of a description here...\\n+\\t *

    \\n+\\t * \\n+\\t * @return the value of the 'Is Identifier' attribute.\\n+\\t * @see #setIsIdentifier(boolean)\\n+\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getProperty_IsIdentifier()\\n+\\t * @model\\n+\\t * @generated\\n+\\t */\\n+\\tboolean isIsIdentifier();\\n+\\n+\\t/**\\n+\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Property#isIsIdentifier Is Identifier}' attribute.\\n+\\t * \\n+\\t * \\n+\\t * @param value the new value of the 'Is Identifier' attribute.\\n+\\t * @see #isIsIdentifier()\\n+\\t * @generated\\n+\\t */\\n+\\tvoid setIsIdentifier(boolean value);\\n+\\n } // Property\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FProperty.java\",\n \"sha\": \"f0699efb354f2ec72eb48548dd5134eb2498687d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 28,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FReference.java\",\n \"changes\": 55,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FReference.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 27,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/Reference.java\",\n \"new_code\": \" *
  • {@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}
    • \\n *
  • {@link org.obeonetwork.dsl.environment.Reference#getReferencedType Referenced Type}
    • \\n\\t * The default value is \\\"true\\\".\\n\\t * @model default=\\\"true\\\" required=\\\"true\\\"\\n\\t * Returns the value of the 'Containing Type' container reference.\\n\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences Owned References}'.\\n\\t * If the meaning of the 'Containing Type' container reference isn't clear,\\n\\t * @return the value of the 'Containing Type' container reference.\\n\\t * @see #setContainingType(StructuredType)\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_ContainingType()\\n\\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences\\n\\t * @model opposite=\\\"ownedReferences\\\" required=\\\"true\\\" transient=\\\"false\\\"\\n\\tStructuredType getContainingType();\\n\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}' container reference.\\n\\t * @param value the new value of the 'Containing Type' container reference.\\n\\t * @see #getContainingType()\\n\\tvoid setContainingType(StructuredType value);\\n\\t * Returns the value of the 'Referenced Type' reference.\\n\\t * If the meaning of the 'Referenced Type' reference list isn't clear,\\n\\t * @return the value of the 'Referenced Type' reference.\\n\\t * @see #setReferencedType(StructuredType)\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_ReferencedType()\\n\\t * @model required=\\\"true\\\"\\n\\tStructuredType getReferencedType();\\n\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getReferencedType Referenced Type}' reference.\\n\\t * @param value the new value of the 'Referenced Type' reference.\\n\\t * @see #getReferencedType()\\n\\tvoid setReferencedType(StructuredType value);\",\n \"new_methods\": [],\n \"old_code\": \" *
  • {@link org.obeonetwork.dsl.environment.Reference#getType Type}
    • \\n *
  • {@link org.obeonetwork.dsl.environment.Reference#getDto Dto}
    • \\n\\t * @model required=\\\"true\\\"\\n\\t * Returns the value of the 'Type' reference.\\n\\t * If the meaning of the 'Type' reference isn't clear,\\n\\t * @return the value of the 'Type' reference.\\n\\t * @see #setType(DTO)\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Type()\\n\\t * @model required=\\\"true\\\"\\n\\tDTO getType();\\n\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getType Type}' reference.\\n\\t * @param value the new value of the 'Type' reference.\\n\\t * @see #getType()\\n\\tvoid setType(DTO value);\\n\\t * Returns the value of the 'Dto' container reference.\\n\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences Owned References}'.\\n\\t * If the meaning of the 'Dto' container reference isn't clear,\\n\\t * @return the value of the 'Dto' container reference.\\n\\t * @see #setDto(DTO)\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Dto()\\n\\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedReferences\\n\\t * @model opposite=\\\"ownedReferences\\\" required=\\\"true\\\" transient=\\\"false\\\"\\n\\tDTO getDto();\\n\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getDto Dto}' container reference.\\n\\t * @param value the new value of the 'Dto' container reference.\\n\\t * @see #getDto()\\n\\tvoid setDto(DTO value);\",\n \"old_methods\": [],\n \"patch\": \"@@ -23,8 +23,8 @@\\n *
  • {@link org.obeonetwork.dsl.environment.Reference#isIsComposite Is Composite}
    • \\n *
  • {@link org.obeonetwork.dsl.environment.Reference#isNavigable Navigable}
    • \\n *
  • {@link org.obeonetwork.dsl.environment.Reference#getOppositeOf Opposite Of}
    • \\n- *
  • {@link org.obeonetwork.dsl.environment.Reference#getType Type}
    • \\n- *
  • {@link org.obeonetwork.dsl.environment.Reference#getDto Dto}
    • \\n+ *
  • {@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}
    • \\n+ *
  • {@link org.obeonetwork.dsl.environment.Reference#getReferencedType Referenced Type}
    • \\n * \\n *

    \\n *\\n@@ -68,6 +68,7 @@ public interface Reference extends Property {\\n \\n \\t/**\\n \\t * Returns the value of the 'Navigable' attribute.\\n+\\t * The default value is \\\"true\\\".\\n \\t * \\n \\t *

    \\n \\t * If the meaning of the 'Navigable' attribute isn't clear,\\n@@ -77,7 +78,7 @@ public interface Reference extends Property {\\n \\t * @return the value of the 'Navigable' attribute.\\n \\t * @see #setNavigable(boolean)\\n \\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Navigable()\\n-\\t * @model required=\\\"true\\\"\\n+\\t * @model default=\\\"true\\\" required=\\\"true\\\"\\n \\t * @generated\\n \\t */\\n \\tboolean isNavigable();\\n@@ -119,58 +120,58 @@ public interface Reference extends Property {\\n \\tvoid setOppositeOf(Reference value);\\n \\n \\t/**\\n-\\t * Returns the value of the 'Type' reference.\\n+\\t * Returns the value of the 'Containing Type' container reference.\\n+\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences Owned References}'.\\n \\t * \\n \\t *

    \\n-\\t * If the meaning of the 'Type' reference isn't clear,\\n+\\t * If the meaning of the 'Containing Type' container reference isn't clear,\\n \\t * there really should be more of a description here...\\n \\t *

    \\n \\t * \\n-\\t * @return the value of the 'Type' reference.\\n-\\t * @see #setType(DTO)\\n-\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Type()\\n-\\t * @model required=\\\"true\\\"\\n+\\t * @return the value of the 'Containing Type' container reference.\\n+\\t * @see #setContainingType(StructuredType)\\n+\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_ContainingType()\\n+\\t * @see org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences\\n+\\t * @model opposite=\\\"ownedReferences\\\" required=\\\"true\\\" transient=\\\"false\\\"\\n \\t * @generated\\n \\t */\\n-\\tDTO getType();\\n+\\tStructuredType getContainingType();\\n \\n \\t/**\\n-\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getType Type}' reference.\\n+\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}' container reference.\\n \\t * \\n \\t * \\n-\\t * @param value the new value of the 'Type' reference.\\n-\\t * @see #getType()\\n+\\t * @param value the new value of the 'Containing Type' container reference.\\n+\\t * @see #getContainingType()\\n \\t * @generated\\n \\t */\\n-\\tvoid setType(DTO value);\\n+\\tvoid setContainingType(StructuredType value);\\n \\n \\t/**\\n-\\t * Returns the value of the 'Dto' container reference.\\n-\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.DTO#getOwnedReferences Owned References}'.\\n+\\t * Returns the value of the 'Referenced Type' reference.\\n \\t * \\n \\t *

    \\n-\\t * If the meaning of the 'Dto' container reference isn't clear,\\n+\\t * If the meaning of the 'Referenced Type' reference list isn't clear,\\n \\t * there really should be more of a description here...\\n \\t *

    \\n \\t * \\n-\\t * @return the value of the 'Dto' container reference.\\n-\\t * @see #setDto(DTO)\\n-\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_Dto()\\n-\\t * @see org.obeonetwork.dsl.environment.DTO#getOwnedReferences\\n-\\t * @model opposite=\\\"ownedReferences\\\" required=\\\"true\\\" transient=\\\"false\\\"\\n+\\t * @return the value of the 'Referenced Type' reference.\\n+\\t * @see #setReferencedType(StructuredType)\\n+\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getReference_ReferencedType()\\n+\\t * @model required=\\\"true\\\"\\n \\t * @generated\\n \\t */\\n-\\tDTO getDto();\\n+\\tStructuredType getReferencedType();\\n \\n \\t/**\\n-\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getDto Dto}' container reference.\\n+\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.Reference#getReferencedType Referenced Type}' reference.\\n \\t * \\n \\t * \\n-\\t * @param value the new value of the 'Dto' container reference.\\n-\\t * @see #getDto()\\n+\\t * @param value the new value of the 'Referenced Type' reference.\\n+\\t * @see #getReferencedType()\\n \\t * @generated\\n \\t */\\n-\\tvoid setDto(DTO value);\\n+\\tvoid setReferencedType(StructuredType value);\\n \\n \\t/**\\n \\t * \",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FReference.java\",\n \"sha\": \"c8513179df2266c1d74faf28c38c8766f8dc7ce8\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 148,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FStructuredType.java\",\n \"changes\": 148,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FStructuredType.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 0,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/StructuredType.java\",\n \"new_code\": \"import org.eclipse.emf.common.util.EList;\\n\\n *

    \\n * The following features are supported:\\n *

      \\n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getSupertype Supertype}
      • \\n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes Associated Types}
      • \\n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes Owned Attributes}
      • \\n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getAttributes Attributes}
      • \\n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences Owned References}
      • \\n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getReferences References}
      • \\n *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getProperties Properties}
      • \\n *
    \\n *

    \\n\\n\\t/**\\n\\t * Returns the value of the 'Supertype' reference.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Supertype' reference isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Supertype' reference.\\n\\t * @see #setSupertype(StructuredType)\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Supertype()\\n\\t * @model\\n\\t * @generated\\n\\t */\\n\\tStructuredType getSupertype();\\n\\n\\t/**\\n\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype Supertype}' reference.\\n\\t * \\n\\t * \\n\\t * @param value the new value of the 'Supertype' reference.\\n\\t * @see #getSupertype()\\n\\t * @generated\\n\\t */\\n\\tvoid setSupertype(StructuredType value);\\n\\n\\t/**\\n\\t * Returns the value of the 'Associated Types' reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.StructuredType}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Associated Types' reference list isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Associated Types' reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_AssociatedTypes()\\n\\t * @model\\n\\t * @generated\\n\\t */\\n\\tEList getAssociatedTypes();\\n\\n\\t/**\\n\\t * Returns the value of the 'Owned Attributes' containment reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\\n\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}'.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Owned Attributes' reference isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Owned Attributes' containment reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_OwnedAttributes()\\n\\t * @see org.obeonetwork.dsl.environment.Attribute#getContainingType\\n\\t * @model opposite=\\\"containingType\\\" containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getOwnedAttributes();\\n\\n\\t/**\\n\\t * Returns the value of the 'Attributes' reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Attributes' reference list isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Attributes' reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Attributes()\\n\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getAttributes();\\n\\n\\t/**\\n\\t * Returns the value of the 'Owned References' containment reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\\n\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}'.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Owned References' reference isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Owned References' containment reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_OwnedReferences()\\n\\t * @see org.obeonetwork.dsl.environment.Reference#getContainingType\\n\\t * @model opposite=\\\"containingType\\\" containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getOwnedReferences();\\n\\n\\t/**\\n\\t * Returns the value of the 'References' reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'References' reference list isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'References' reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_References()\\n\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getReferences();\\n\\n\\t/**\\n\\t * Returns the value of the 'Properties' reference list.\\n\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\\n\\t * \\n\\t *

    \\n\\t * If the meaning of the 'Properties' reference list isn't clear,\\n\\t * there really should be more of a description here...\\n\\t *

    \\n\\t * \\n\\t * @return the value of the 'Properties' reference list.\\n\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Properties()\\n\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tEList getProperties();\\n\\n\\t/**\\n\\t * \\n\\t * \\n\\t * @model required=\\\"true\\\"\\n\\t * @generated\\n\\t */\\n\\tboolean isSubtypeOf(StructuredType type);\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -12,11 +12,25 @@\\n */\\n package org.obeonetwork.dsl.environment;\\n \\n+import org.eclipse.emf.common.util.EList;\\n+\\n /**\\n * \\n * A representation of the model object 'Structured Type'.\\n * \\n *\\n+ *

    \\n+ * The following features are supported:\\n+ *

      \\n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getSupertype Supertype}
      • \\n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getAssociatedTypes Associated Types}
      • \\n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getOwnedAttributes Owned Attributes}
      • \\n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getAttributes Attributes}
      • \\n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getOwnedReferences Owned References}
      • \\n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getReferences References}
      • \\n+ *
    • {@link org.obeonetwork.dsl.environment.StructuredType#getProperties Properties}
      • \\n+ *
    \\n+ *

    \\n *\\n * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType()\\n * @model abstract=\\\"true\\\"\\n@@ -30,4 +44,138 @@ public interface StructuredType extends Type {\\n \\t * @generated\\n \\t */\\n \\tString copyright = \\\"Copyright (c) 2008-2009 Obeo.\\\\nAll rights reserved. This program and the accompanying materials\\\\nare made available under the terms of the Eclipse Public License v1.0\\\\nwhich accompanies this distribution, and is available at\\\\nhttp://www.eclipse.org/legal/epl-v10.html\\\\n\\\\nContributors:\\\\n Obeo - initial API and implementation\\\";\\n+\\n+\\t/**\\n+\\t * Returns the value of the 'Supertype' reference.\\n+\\t * \\n+\\t *

    \\n+\\t * If the meaning of the 'Supertype' reference isn't clear,\\n+\\t * there really should be more of a description here...\\n+\\t *

    \\n+\\t * \\n+\\t * @return the value of the 'Supertype' reference.\\n+\\t * @see #setSupertype(StructuredType)\\n+\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Supertype()\\n+\\t * @model\\n+\\t * @generated\\n+\\t */\\n+\\tStructuredType getSupertype();\\n+\\n+\\t/**\\n+\\t * Sets the value of the '{@link org.obeonetwork.dsl.environment.StructuredType#getSupertype Supertype}' reference.\\n+\\t * \\n+\\t * \\n+\\t * @param value the new value of the 'Supertype' reference.\\n+\\t * @see #getSupertype()\\n+\\t * @generated\\n+\\t */\\n+\\tvoid setSupertype(StructuredType value);\\n+\\n+\\t/**\\n+\\t * Returns the value of the 'Associated Types' reference list.\\n+\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.StructuredType}.\\n+\\t * \\n+\\t *

    \\n+\\t * If the meaning of the 'Associated Types' reference list isn't clear,\\n+\\t * there really should be more of a description here...\\n+\\t *

    \\n+\\t * \\n+\\t * @return the value of the 'Associated Types' reference list.\\n+\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_AssociatedTypes()\\n+\\t * @model\\n+\\t * @generated\\n+\\t */\\n+\\tEList getAssociatedTypes();\\n+\\n+\\t/**\\n+\\t * Returns the value of the 'Owned Attributes' containment reference list.\\n+\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\\n+\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Attribute#getContainingType Containing Type}'.\\n+\\t * \\n+\\t *

    \\n+\\t * If the meaning of the 'Owned Attributes' reference isn't clear,\\n+\\t * there really should be more of a description here...\\n+\\t *

    \\n+\\t * \\n+\\t * @return the value of the 'Owned Attributes' containment reference list.\\n+\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_OwnedAttributes()\\n+\\t * @see org.obeonetwork.dsl.environment.Attribute#getContainingType\\n+\\t * @model opposite=\\\"containingType\\\" containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n+\\t * @generated\\n+\\t */\\n+\\tEList getOwnedAttributes();\\n+\\n+\\t/**\\n+\\t * Returns the value of the 'Attributes' reference list.\\n+\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Attribute}.\\n+\\t * \\n+\\t *

    \\n+\\t * If the meaning of the 'Attributes' reference list isn't clear,\\n+\\t * there really should be more of a description here...\\n+\\t *

    \\n+\\t * \\n+\\t * @return the value of the 'Attributes' reference list.\\n+\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Attributes()\\n+\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n+\\t * @generated\\n+\\t */\\n+\\tEList getAttributes();\\n+\\n+\\t/**\\n+\\t * Returns the value of the 'Owned References' containment reference list.\\n+\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\\n+\\t * It is bidirectional and its opposite is '{@link org.obeonetwork.dsl.environment.Reference#getContainingType Containing Type}'.\\n+\\t * \\n+\\t *

    \\n+\\t * If the meaning of the 'Owned References' reference isn't clear,\\n+\\t * there really should be more of a description here...\\n+\\t *

    \\n+\\t * \\n+\\t * @return the value of the 'Owned References' containment reference list.\\n+\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_OwnedReferences()\\n+\\t * @see org.obeonetwork.dsl.environment.Reference#getContainingType\\n+\\t * @model opposite=\\\"containingType\\\" containment=\\\"true\\\" resolveProxies=\\\"true\\\"\\n+\\t * @generated\\n+\\t */\\n+\\tEList getOwnedReferences();\\n+\\n+\\t/**\\n+\\t * Returns the value of the 'References' reference list.\\n+\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Reference}.\\n+\\t * \\n+\\t *

    \\n+\\t * If the meaning of the 'References' reference list isn't clear,\\n+\\t * there really should be more of a description here...\\n+\\t *

    \\n+\\t * \\n+\\t * @return the value of the 'References' reference list.\\n+\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_References()\\n+\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n+\\t * @generated\\n+\\t */\\n+\\tEList getReferences();\\n+\\n+\\t/**\\n+\\t * Returns the value of the 'Properties' reference list.\\n+\\t * The list contents are of type {@link org.obeonetwork.dsl.environment.Property}.\\n+\\t * \\n+\\t *

    \\n+\\t * If the meaning of the 'Properties' reference list isn't clear,\\n+\\t * there really should be more of a description here...\\n+\\t *

    \\n+\\t * \\n+\\t * @return the value of the 'Properties' reference list.\\n+\\t * @see org.obeonetwork.dsl.environment.EnvironmentPackage#getStructuredType_Properties()\\n+\\t * @model transient=\\\"true\\\" changeable=\\\"false\\\" volatile=\\\"true\\\" derived=\\\"true\\\"\\n+\\t * @generated\\n+\\t */\\n+\\tEList getProperties();\\n+\\n+\\t/**\\n+\\t * \\n+\\t * \\n+\\t * @model required=\\\"true\\\"\\n+\\t * @generated\\n+\\t */\\n+\\tboolean isSubtypeOf(StructuredType type);\\n } // StructuredType\\n\\\\ No newline at end of file\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2FStructuredType.java\",\n \"sha\": \"8d0cfe4477a8d131b8cb5b8e972021088fa106d0\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 36,\n \"blob_url\": \"https://github.com/ObeoNetwork/InformationSystem/blob/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fimpl%2FAttributeImpl.java\",\n \"changes\": 64,\n \"contents_url\": \"https://api.github.com/repos/ObeoNetwork/InformationSystem/contents/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fimpl%2FAttributeImpl.java?ref=27802cfab9eabed1efb72ac10206fa1cc8dfd3e6\",\n \"deletions\": 28,\n \"filename\": \"models/environment/plugins/org.obeonetwork.dsl.environment/src/org/obeonetwork/dsl/environment/impl/AttributeImpl.java\",\n \"new_code\": \"import org.obeonetwork.dsl.environment.StructuredType;\\n *
  • {@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getContainingType Containing Type}
    • \\n\\tpublic StructuredType getContainingType() {\\n\\t\\treturn (StructuredType) eDynamicGet(\\n\\t\\t\\t\\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\\n\\t\\t\\t\\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE, true,\\n\\t\\t\\t\\ttrue);\\n\\tpublic StructuredType basicGetContainingType() {\\n\\t\\treturn (StructuredType) eDynamicGet(\\n\\t\\t\\t\\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\\n\\t\\t\\t\\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE, false,\\n\\t\\t\\t\\ttrue);\\n\\tpublic NotificationChain basicSetContainingType(\\n\\t\\t\\tStructuredType newContainingType, NotificationChain msgs) {\\n\\t\\tmsgs = eBasicSetContainer((InternalEObject) newContainingType,\\n\\t\\t\\t\\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE, msgs);\\n\\tpublic void setContainingType(StructuredType newContainingType) {\\n\\t\\teDynamicSet(EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\\n\\t\\t\\t\\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE,\\n\\t\\t\\t\\tnewContainingType);\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n\\t\\t\\treturn basicSetContainingType((StructuredType) otherEnd, msgs);\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n\\t\\t\\treturn basicSetContainingType(null, msgs);\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n\\t\\t\\t\\t\\tEnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES,\\n\\t\\t\\t\\t\\tStructuredType.class, msgs);\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n\\t\\t\\t\\treturn getContainingType();\\n\\t\\t\\treturn basicGetContainingType();\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n\\t\\t\\tsetContainingType((StructuredType) newValue);\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n\\t\\t\\tsetContainingType((StructuredType) null);\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n\\t\\t\\treturn basicGetContainingType() != null;\",\n \"new_methods\": [],\n \"old_code\": \" *
  • {@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getDto Dto}
    • \\n\\tpublic DTO getDto() {\\n\\t\\treturn (DTO) eDynamicGet(EnvironmentPackage.ATTRIBUTE__DTO,\\n\\t\\t\\t\\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, true, true);\\n\\tpublic DTO basicGetDto() {\\n\\t\\treturn (DTO) eDynamicGet(EnvironmentPackage.ATTRIBUTE__DTO,\\n\\t\\t\\t\\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, false, true);\\n\\tpublic NotificationChain basicSetDto(DTO newDto, NotificationChain msgs) {\\n\\t\\tmsgs = eBasicSetContainer((InternalEObject) newDto,\\n\\t\\t\\t\\tEnvironmentPackage.ATTRIBUTE__DTO, msgs);\\n\\tpublic void setDto(DTO newDto) {\\n\\t\\teDynamicSet(EnvironmentPackage.ATTRIBUTE__DTO,\\n\\t\\t\\t\\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, newDto);\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n\\t\\t\\treturn basicSetDto((DTO) otherEnd, msgs);\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n\\t\\t\\treturn basicSetDto(null, msgs);\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n\\t\\t\\t\\t\\tEnvironmentPackage.DTO__OWNED_ATTRIBUTES, DTO.class, msgs);\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n\\t\\t\\t\\treturn getDto();\\n\\t\\t\\treturn basicGetDto();\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n\\t\\t\\tsetDto((DTO) newValue);\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n\\t\\t\\tsetDto((DTO) null);\\n\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n\\t\\t\\treturn basicGetDto() != null;\",\n \"old_methods\": [],\n \"patch\": \"@@ -19,6 +19,7 @@\\n import org.obeonetwork.dsl.environment.DTO;\\n import org.obeonetwork.dsl.environment.EnvironmentPackage;\\n import org.obeonetwork.dsl.environment.PrimitiveType;\\n+import org.obeonetwork.dsl.environment.StructuredType;\\n \\n /**\\n * \\n@@ -28,7 +29,7 @@\\n * The following features are implemented:\\n *
      \\n *
    • {@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getType Type}
      • \\n- *
    • {@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getDto Dto}
      • \\n+ *
    • {@link org.obeonetwork.dsl.environment.impl.AttributeImpl#getContainingType Containing Type}
      • \\n *
    \\n *

    \\n *\\n@@ -96,29 +97,34 @@ public void setType(PrimitiveType newType) {\\n \\t * \\n \\t * @generated\\n \\t */\\n-\\tpublic DTO getDto() {\\n-\\t\\treturn (DTO) eDynamicGet(EnvironmentPackage.ATTRIBUTE__DTO,\\n-\\t\\t\\t\\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, true, true);\\n+\\tpublic StructuredType getContainingType() {\\n+\\t\\treturn (StructuredType) eDynamicGet(\\n+\\t\\t\\t\\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE, true,\\n+\\t\\t\\t\\ttrue);\\n \\t}\\n \\n \\t/**\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t */\\n-\\tpublic DTO basicGetDto() {\\n-\\t\\treturn (DTO) eDynamicGet(EnvironmentPackage.ATTRIBUTE__DTO,\\n-\\t\\t\\t\\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, false, true);\\n+\\tpublic StructuredType basicGetContainingType() {\\n+\\t\\treturn (StructuredType) eDynamicGet(\\n+\\t\\t\\t\\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE, false,\\n+\\t\\t\\t\\ttrue);\\n \\t}\\n \\n \\t/**\\n \\t * \\n \\t * \\n \\t * @generated\\n \\t */\\n-\\tpublic NotificationChain basicSetDto(DTO newDto, NotificationChain msgs) {\\n-\\t\\tmsgs = eBasicSetContainer((InternalEObject) newDto,\\n-\\t\\t\\t\\tEnvironmentPackage.ATTRIBUTE__DTO, msgs);\\n+\\tpublic NotificationChain basicSetContainingType(\\n+\\t\\t\\tStructuredType newContainingType, NotificationChain msgs) {\\n+\\t\\tmsgs = eBasicSetContainer((InternalEObject) newContainingType,\\n+\\t\\t\\t\\tEnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE, msgs);\\n \\t\\treturn msgs;\\n \\t}\\n \\n@@ -127,9 +133,10 @@ public NotificationChain basicSetDto(DTO newDto, NotificationChain msgs) {\\n \\t * \\n \\t * @generated\\n \\t */\\n-\\tpublic void setDto(DTO newDto) {\\n-\\t\\teDynamicSet(EnvironmentPackage.ATTRIBUTE__DTO,\\n-\\t\\t\\t\\tEnvironmentPackage.Literals.ATTRIBUTE__DTO, newDto);\\n+\\tpublic void setContainingType(StructuredType newContainingType) {\\n+\\t\\teDynamicSet(EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE,\\n+\\t\\t\\t\\tEnvironmentPackage.Literals.ATTRIBUTE__CONTAINING_TYPE,\\n+\\t\\t\\t\\tnewContainingType);\\n \\t}\\n \\n \\t/**\\n@@ -141,10 +148,10 @@ public void setDto(DTO newDto) {\\n \\tpublic NotificationChain eInverseAdd(InternalEObject otherEnd,\\n \\t\\t\\tint featureID, NotificationChain msgs) {\\n \\t\\tswitch (featureID) {\\n-\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n+\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n \\t\\t\\tif (eInternalContainer() != null)\\n \\t\\t\\t\\tmsgs = eBasicRemoveFromContainer(msgs);\\n-\\t\\t\\treturn basicSetDto((DTO) otherEnd, msgs);\\n+\\t\\t\\treturn basicSetContainingType((StructuredType) otherEnd, msgs);\\n \\t\\t}\\n \\t\\treturn super.eInverseAdd(otherEnd, featureID, msgs);\\n \\t}\\n@@ -158,8 +165,8 @@ public NotificationChain eInverseAdd(InternalEObject otherEnd,\\n \\tpublic NotificationChain eInverseRemove(InternalEObject otherEnd,\\n \\t\\t\\tint featureID, NotificationChain msgs) {\\n \\t\\tswitch (featureID) {\\n-\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n-\\t\\t\\treturn basicSetDto(null, msgs);\\n+\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n+\\t\\t\\treturn basicSetContainingType(null, msgs);\\n \\t\\t}\\n \\t\\treturn super.eInverseRemove(otherEnd, featureID, msgs);\\n \\t}\\n@@ -173,9 +180,10 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd,\\n \\tpublic NotificationChain eBasicRemoveFromContainerFeature(\\n \\t\\t\\tNotificationChain msgs) {\\n \\t\\tswitch (eContainerFeatureID()) {\\n-\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n+\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n \\t\\t\\treturn eInternalContainer().eInverseRemove(this,\\n-\\t\\t\\t\\t\\tEnvironmentPackage.DTO__OWNED_ATTRIBUTES, DTO.class, msgs);\\n+\\t\\t\\t\\t\\tEnvironmentPackage.STRUCTURED_TYPE__OWNED_ATTRIBUTES,\\n+\\t\\t\\t\\t\\tStructuredType.class, msgs);\\n \\t\\t}\\n \\t\\treturn super.eBasicRemoveFromContainerFeature(msgs);\\n \\t}\\n@@ -192,10 +200,10 @@ public Object eGet(int featureID, boolean resolve, boolean coreType) {\\n \\t\\t\\tif (resolve)\\n \\t\\t\\t\\treturn getType();\\n \\t\\t\\treturn basicGetType();\\n-\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n+\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n \\t\\t\\tif (resolve)\\n-\\t\\t\\t\\treturn getDto();\\n-\\t\\t\\treturn basicGetDto();\\n+\\t\\t\\t\\treturn getContainingType();\\n+\\t\\t\\treturn basicGetContainingType();\\n \\t\\t}\\n \\t\\treturn super.eGet(featureID, resolve, coreType);\\n \\t}\\n@@ -211,8 +219,8 @@ public void eSet(int featureID, Object newValue) {\\n \\t\\tcase EnvironmentPackage.ATTRIBUTE__TYPE:\\n \\t\\t\\tsetType((PrimitiveType) newValue);\\n \\t\\t\\treturn;\\n-\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n-\\t\\t\\tsetDto((DTO) newValue);\\n+\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n+\\t\\t\\tsetContainingType((StructuredType) newValue);\\n \\t\\t\\treturn;\\n \\t\\t}\\n \\t\\tsuper.eSet(featureID, newValue);\\n@@ -229,8 +237,8 @@ public void eUnset(int featureID) {\\n \\t\\tcase EnvironmentPackage.ATTRIBUTE__TYPE:\\n \\t\\t\\tsetType((PrimitiveType) null);\\n \\t\\t\\treturn;\\n-\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n-\\t\\t\\tsetDto((DTO) null);\\n+\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n+\\t\\t\\tsetContainingType((StructuredType) null);\\n \\t\\t\\treturn;\\n \\t\\t}\\n \\t\\tsuper.eUnset(featureID);\\n@@ -246,8 +254,8 @@ public boolean eIsSet(int featureID) {\\n \\t\\tswitch (featureID) {\\n \\t\\tcase EnvironmentPackage.ATTRIBUTE__TYPE:\\n \\t\\t\\treturn basicGetType() != null;\\n-\\t\\tcase EnvironmentPackage.ATTRIBUTE__DTO:\\n-\\t\\t\\treturn basicGetDto() != null;\\n+\\t\\tcase EnvironmentPackage.ATTRIBUTE__CONTAINING_TYPE:\\n+\\t\\t\\treturn basicGetContainingType() != null;\\n \\t\\t}\\n \\t\\treturn super.eIsSet(featureID);\\n \\t}\",\n \"raw_url\": \"https://github.com/ObeoNetwork/InformationSystem/raw/27802cfab9eabed1efb72ac10206fa1cc8dfd3e6/models%2Fenvironment%2Fplugins%2Forg.obeonetwork.dsl.environment%2Fsrc%2Forg%2Fobeonetwork%2Fdsl%2Fenvironment%2Fimpl%2FAttributeImpl.java\",\n \"sha\": \"48804ec0c80437ac9c0169be060d86062c8820c6\",\n \"status\": \"modified\"\n }\n]"},"file_patch_count":{"kind":"number","value":85,"string":"85"},"enhanced_diffs":{"kind":"list like","value":[{"name":"obeonetwork$informationsystem","new_args":"EObject newValue","new_implementation":"referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","new_return_type":"void","new_signature":"void setReferencedType(EObject newValue)","old_args":"EObject newValue","old_implementation":"type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","old_return_type":"void","old_signature":"void setType(EObject newValue)"},{"name":"obeonetwork$informationsystem","new_args":"EObject newValue","new_implementation":"referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","new_return_type":"void","new_signature":"void setReferencedType(EObject newValue)","old_args":"EObject newValue","old_implementation":"type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","old_return_type":"void","old_signature":"void setType(EObject newValue)"},{"name":"obeonetwork$informationsystem","new_args":"Composite parent","new_implementation":"createDescription(parent, EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentMessages.ReferencePropertiesEditionPart_ReferencedTypeLabel);\n\t\treferencedType = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND));\n\t\treferencedType.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\treferencedType.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.referencedType, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getReferencedType()));\n\t\tGridData referencedTypeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\treferencedType.setLayoutData(referencedTypeData);\n\t\treferencedType.setID(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createReferencedTypeFlatComboViewer\n\tprotected Composite createIdentifierCheckbox(Composite parent) {\n\t\tidentifier = new Button(parent, SWT.CHECK);\n\t\tidentifier.setText(getDescription(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentMessages.ReferencePropertiesEditionPart_IdentifierLabel));\n\t\tidentifier.addSelectionListener(new SelectionAdapter() {\n\n\t\t\t/**\n\t\t\t * {@inheritDoc","new_return_type":"Composite","new_signature":"Composite createReferencedTypeFlatComboViewer(Composite parent)","old_args":"Composite parent","old_implementation":"createDescription(parent, EnvironmentViewsRepository.Reference.Properties.type, EnvironmentMessages.ReferencePropertiesEditionPart_TypeLabel);\n\t\ttype = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND));\n\t\ttype.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\n\t\ttype.addSelectionChangedListener(new ISelectionChangedListener() {\n\t\t\t\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.type, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getType()));\n\t\tGridData typeData = new GridData(GridData.FILL_HORIZONTAL);\n\t\ttype.setLayoutData(typeData);\n\t\ttype.setID(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\n\t\t// Start of user code for createTypeFlatComboViewer\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getType()\n\tpublic EObject getType() {\n\t\tif (type.getSelection() instanceof StructuredSelection) {\n\t\t\tObject firstElement = ((StructuredSelection) type.getSelection()).getFirstElement();\n\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initType(EObjectFlatComboSettings)\n\tpublic void initType(EObjectFlatComboSettings settings) {\n\t\ttype.setInput(settings);\n\t\t\ttype.setSelection(new StructuredSelection(settings.getValue()));\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","old_return_type":"Composite","old_signature":"Composite createTypeFlatComboViewer(Composite parent)"},{"name":"obeonetwork$informationsystem","new_args":"EObject newValue","new_implementation":"referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","new_return_type":"void","new_signature":"void setReferencedType(EObject newValue)","old_args":"EObject newValue","old_implementation":"type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","old_return_type":"void","old_signature":"void setType(EObject newValue)"},{"name":"obeonetwork$informationsystem","new_args":"EObject newValue","new_implementation":"referencedType.setSelection(new StructuredSelection(newValue));\n\t\t\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\n\t\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\n\t\t\treferencedType.setEnabled(false);\n\t\t\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","new_return_type":"void","new_signature":"void setReferencedType(EObject newValue)","old_args":"EObject newValue","old_implementation":"type.setSelection(new StructuredSelection(newValue));\n\t\t\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\n\t\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\n\t\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\n\t\t\ttype.setEnabled(false);\n\t\t\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);","old_return_type":"void","old_signature":"void setType(EObject newValue)"}],"string":"[\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"EObject newValue\",\n \"new_implementation\": \"referencedType.setSelection(new StructuredSelection(newValue));\\n\\t\\t\\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\\n\\t\\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\\n\\t\\t\\treferencedType.setEnabled(false);\\n\\t\\t\\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setReferencedType(EObject newValue)\",\n \"old_args\": \"EObject newValue\",\n \"old_implementation\": \"type.setSelection(new StructuredSelection(newValue));\\n\\t\\t\\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\\n\\t\\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\\n\\t\\t\\ttype.setEnabled(false);\\n\\t\\t\\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setType(EObject newValue)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"EObject newValue\",\n \"new_implementation\": \"referencedType.setSelection(new StructuredSelection(newValue));\\n\\t\\t\\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\\n\\t\\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\\n\\t\\t\\treferencedType.setEnabled(false);\\n\\t\\t\\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setReferencedType(EObject newValue)\",\n \"old_args\": \"EObject newValue\",\n \"old_implementation\": \"type.setSelection(new StructuredSelection(newValue));\\n\\t\\t\\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\\n\\t\\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\\n\\t\\t\\ttype.setEnabled(false);\\n\\t\\t\\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setType(EObject newValue)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"Composite parent\",\n \"new_implementation\": \"createDescription(parent, EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentMessages.ReferencePropertiesEditionPart_ReferencedTypeLabel);\\n\\t\\treferencedType = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND));\\n\\t\\treferencedType.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\\n\\t\\treferencedType.addSelectionChangedListener(new ISelectionChangedListener() {\\n\\t\\t\\t\\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.referencedType, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getReferencedType()));\\n\\t\\tGridData referencedTypeData = new GridData(GridData.FILL_HORIZONTAL);\\n\\t\\treferencedType.setLayoutData(referencedTypeData);\\n\\t\\treferencedType.setID(EnvironmentViewsRepository.Reference.Properties.referencedType);\\n\\t\\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.referencedType, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\\n\\t\\t// Start of user code for createReferencedTypeFlatComboViewer\\n\\tprotected Composite createIdentifierCheckbox(Composite parent) {\\n\\t\\tidentifier = new Button(parent, SWT.CHECK);\\n\\t\\tidentifier.setText(getDescription(EnvironmentViewsRepository.Reference.Properties.identifier, EnvironmentMessages.ReferencePropertiesEditionPart_IdentifierLabel));\\n\\t\\tidentifier.addSelectionListener(new SelectionAdapter() {\\n\\n\\t\\t\\t/**\\n\\t\\t\\t * {@inheritDoc\",\n \"new_return_type\": \"Composite\",\n \"new_signature\": \"Composite createReferencedTypeFlatComboViewer(Composite parent)\",\n \"old_args\": \"Composite parent\",\n \"old_implementation\": \"createDescription(parent, EnvironmentViewsRepository.Reference.Properties.type, EnvironmentMessages.ReferencePropertiesEditionPart_TypeLabel);\\n\\t\\ttype = new EObjectFlatComboViewer(parent, !propertiesEditionComponent.isRequired(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND));\\n\\t\\ttype.setLabelProvider(new AdapterFactoryLabelProvider(adapterFactory));\\n\\t\\ttype.addSelectionChangedListener(new ISelectionChangedListener() {\\n\\t\\t\\t\\tpropertiesEditionComponent.firePropertiesChanged(new PropertiesEditionEvent(ReferencePropertiesEditionPartImpl.this, EnvironmentViewsRepository.Reference.Properties.type, PropertiesEditionEvent.CHANGE, PropertiesEditionEvent.SET, null, getType()));\\n\\t\\tGridData typeData = new GridData(GridData.FILL_HORIZONTAL);\\n\\t\\ttype.setLayoutData(typeData);\\n\\t\\ttype.setID(EnvironmentViewsRepository.Reference.Properties.type);\\n\\t\\tSWTUtils.createHelpButton(parent, propertiesEditionComponent.getHelpContent(EnvironmentViewsRepository.Reference.Properties.type, EnvironmentViewsRepository.SWT_KIND), null); //$NON-NLS-1$\\n\\t\\t// Start of user code for createTypeFlatComboViewer\\n\\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#getType()\\n\\tpublic EObject getType() {\\n\\t\\tif (type.getSelection() instanceof StructuredSelection) {\\n\\t\\t\\tObject firstElement = ((StructuredSelection) type.getSelection()).getFirstElement();\\n\\t * @see org.obeonetwork.dsl.environment.parts.ReferencePropertiesEditionPart#initType(EObjectFlatComboSettings)\\n\\tpublic void initType(EObjectFlatComboSettings settings) {\\n\\t\\ttype.setInput(settings);\\n\\t\\t\\ttype.setSelection(new StructuredSelection(settings.getValue()));\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\\n\\t\\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\\n\\t\\t\\ttype.setEnabled(false);\\n\\t\\t\\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"old_return_type\": \"Composite\",\n \"old_signature\": \"Composite createTypeFlatComboViewer(Composite parent)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"EObject newValue\",\n \"new_implementation\": \"referencedType.setSelection(new StructuredSelection(newValue));\\n\\t\\t\\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\\n\\t\\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\\n\\t\\t\\treferencedType.setEnabled(false);\\n\\t\\t\\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setReferencedType(EObject newValue)\",\n \"old_args\": \"EObject newValue\",\n \"old_implementation\": \"type.setSelection(new StructuredSelection(newValue));\\n\\t\\t\\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\\n\\t\\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\\n\\t\\t\\ttype.setEnabled(false);\\n\\t\\t\\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setType(EObject newValue)\"\n },\n {\n \"name\": \"obeonetwork$informationsystem\",\n \"new_args\": \"EObject newValue\",\n \"new_implementation\": \"referencedType.setSelection(new StructuredSelection(newValue));\\n\\t\\t\\treferencedType.setSelection(new StructuredSelection()); //$NON-NLS-1$\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.referencedType);\\n\\t\\tif (eefElementEditorReadOnlyState && referencedType.isEnabled()) {\\n\\t\\t\\treferencedType.setEnabled(false);\\n\\t\\t\\treferencedType.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setReferencedType(EObject newValue)\",\n \"old_args\": \"EObject newValue\",\n \"old_implementation\": \"type.setSelection(new StructuredSelection(newValue));\\n\\t\\t\\ttype.setSelection(new StructuredSelection()); //$NON-NLS-1$\\n\\t\\tboolean eefElementEditorReadOnlyState = isReadOnly(EnvironmentViewsRepository.Reference.Properties.type);\\n\\t\\tif (eefElementEditorReadOnlyState && type.isEnabled()) {\\n\\t\\t\\ttype.setEnabled(false);\\n\\t\\t\\ttype.setToolTipText(EnvironmentMessages.Reference_ReadOnly);\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setType(EObject newValue)\"\n }\n]"},"enhanced_diffs_count":{"kind":"number","value":5,"string":"5"},"diff_count":{"kind":"number","value":42,"string":"42"}}},{"rowIdx":15,"cells":{"commit_sha":{"kind":"string","value":"27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9"},"modifications":{"kind":"list like","value":[{"name":"nasa$certware","new_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","new_implementation":null,"new_return_type":"void","new_signature":"void completeDecomposition_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)","old_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","old_implementation":null,"old_return_type":"void","old_signature":"void completeDecomposition_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)"},{"name":"nasa$certware","new_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","new_implementation":null,"new_return_type":"void","new_signature":"void completeDocItem_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)","old_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","old_implementation":null,"old_return_type":"void","old_signature":"void completeDocItem_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)"},{"name":"nasa$certware","new_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","new_implementation":null,"new_return_type":"void","new_signature":"void completeIntent_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)","old_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","old_implementation":null,"old_return_type":"void","old_signature":"void completeIntent_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)"},{"name":"nasa$certware","new_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","new_implementation":null,"new_return_type":"void","new_signature":"void completeListItem_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)","old_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","old_implementation":null,"old_return_type":"void","old_signature":"void completeListItem_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)"},{"name":"nasa$certware","new_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","new_implementation":null,"new_return_type":"void","new_signature":"void completeModelItem_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)","old_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","old_implementation":null,"old_return_type":"void","old_signature":"void completeModelItem_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)"},{"name":"nasa$certware","new_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","new_implementation":null,"new_return_type":"void","new_signature":"void completeRefinement_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)","old_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","old_implementation":null,"old_return_type":"void","old_signature":"void completeRefinement_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)"},{"name":"nasa$certware","new_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","new_implementation":null,"new_return_type":"void","new_signature":"void completeSpecification_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)","old_args":"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor","old_implementation":null,"old_return_type":"void","old_signature":"void completeSpecification_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameAlternatives_0;","new_return_type":"Alternatives","new_signature":"Alternatives getTypeNameAlternatives_0()","old_args":"","old_implementation":"return cAlternatives;","old_return_type":"Alternatives","old_signature":"Alternatives getAlternatives()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameAlternatives_0;","new_return_type":"Alternatives","new_signature":"Alternatives getTypeNameAlternatives_0()","old_args":"","old_implementation":"return cAlternatives;","old_return_type":"Alternatives","old_signature":"Alternatives getAlternatives()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameAlternatives_0;","new_return_type":"Alternatives","new_signature":"Alternatives getTypeNameAlternatives_0()","old_args":"","old_implementation":"return cAlternatives;","old_return_type":"Alternatives","old_signature":"Alternatives getAlternatives()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameAlternatives_0;","new_return_type":"Alternatives","new_signature":"Alternatives getTypeNameAlternatives_0()","old_args":"","old_implementation":"return cAlternatives;","old_return_type":"Alternatives","old_signature":"Alternatives getAlternatives()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameAlternatives_0;","new_return_type":"Alternatives","new_signature":"Alternatives getTypeNameAlternatives_0()","old_args":"","old_implementation":"return cAlternatives;","old_return_type":"Alternatives","old_signature":"Alternatives getAlternatives()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameBasicKeyword_0_0;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameBasicKeyword_0_0()","old_args":"","old_implementation":"return cBasicKeyword_0;","old_return_type":"Keyword","old_signature":"Keyword getBasicKeyword_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameBreakKeyword_0_2;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameBreakKeyword_0_2()","old_args":"","old_implementation":"return cBreakKeyword_2;","old_return_type":"Keyword","old_signature":"Keyword getBreakKeyword_2()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameConditionKeyword_0_0;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameConditionKeyword_0_0()","old_args":"","old_implementation":"return cConditionKeyword_0;","old_return_type":"Keyword","old_signature":"Keyword getConditionKeyword_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameConstraintKeyword_0_3;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameConstraintKeyword_0_3()","old_args":"","old_implementation":"return cConstraintKeyword_3;","old_return_type":"Keyword","old_signature":"Keyword getConstraintKeyword_3()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"EAttribute","new_signature":"EAttribute getDecomposition_Name()","old_args":"","old_implementation":null,"old_return_type":"EAttribute","old_signature":"EAttribute getDecomposition_Id()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameDesignKeyword_0_4;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameDesignKeyword_0_4()","old_args":"","old_implementation":"return cDesignKeyword_4;","old_return_type":"Keyword","old_signature":"Keyword getDesignKeyword_4()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"EAttribute","new_signature":"EAttribute getDocItem_Name()","old_args":"","old_implementation":null,"old_return_type":"EAttribute","old_signature":"EAttribute getDocItem_Id()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameEnvironmentKeyword_0_0;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameEnvironmentKeyword_0_0()","old_args":"","old_implementation":"return cEnvironmentKeyword_0;","old_return_type":"Keyword","old_signature":"Keyword getEnvironmentKeyword_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameFigureKeyword_0_1;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameFigureKeyword_0_1()","old_args":"","old_implementation":"return cFigureKeyword_1;","old_return_type":"Keyword","old_signature":"Keyword getFigureKeyword_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameFunctionKeyword_0_4;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameFunctionKeyword_0_4()","old_args":"","old_implementation":"return cFunctionKeyword_4;","old_return_type":"Keyword","old_signature":"Keyword getFunctionKeyword_4()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameGoalKeyword_0_1;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameGoalKeyword_0_1()","old_args":"","old_implementation":"return cGoalKeyword_1;","old_return_type":"Keyword","old_signature":"Keyword getGoalKeyword_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameHazardKeyword_0_2;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameHazardKeyword_0_2()","old_args":"","old_implementation":"return cHazardKeyword_2;","old_return_type":"Keyword","old_signature":"Keyword getHazardKeyword_2()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String getName()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String getId()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String getName()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String getId()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String getName()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String getId()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String getName()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String getId()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String getName()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String getId()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String getName()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String getId()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String getName()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String getId()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameImplementationKeyword_0_5;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameImplementationKeyword_0_5()","old_args":"","old_implementation":"return cImplementationKeyword_5;","old_return_type":"Keyword","old_signature":"Keyword getImplementationKeyword_5()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameInputKeyword_0_5;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameInputKeyword_0_5()","old_args":"","old_implementation":"return cInputKeyword_5;","old_return_type":"Keyword","old_signature":"Keyword getInputKeyword_5()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"EAttribute","new_signature":"EAttribute getIntent_Name()","old_args":"","old_implementation":null,"old_return_type":"EAttribute","old_signature":"EAttribute getIntent_Id()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"EAttribute","new_signature":"EAttribute getListItem_Name()","old_args":"","old_implementation":null,"old_return_type":"EAttribute","old_signature":"EAttribute getListItem_Id()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameMacroKeyword_0_3;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameMacroKeyword_0_3()","old_args":"","old_implementation":"return cMacroKeyword_3;","old_return_type":"Keyword","old_signature":"Keyword getMacroKeyword_3()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameModeKeyword_0_1;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameModeKeyword_0_1()","old_args":"","old_implementation":"return cModeKeyword_1;","old_return_type":"Keyword","old_signature":"Keyword getModeKeyword_1()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"EAttribute","new_signature":"EAttribute getModelItem_Name()","old_args":"","old_implementation":null,"old_return_type":"EAttribute","old_signature":"EAttribute getModelItem_Id()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameModelKeyword_0_3;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameModelKeyword_0_3()","old_args":"","old_implementation":"return cModelKeyword_3;","old_return_type":"Keyword","old_signature":"Keyword getModelKeyword_3()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameModelsKeyword_0_3;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameModelsKeyword_0_3()","old_args":"","old_implementation":"return cModelsKeyword_3;","old_return_type":"Keyword","old_signature":"Keyword getModelsKeyword_3()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameOperationKeyword_0_6;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameOperationKeyword_0_6()","old_args":"","old_implementation":"return cOperationKeyword_6;","old_return_type":"Keyword","old_signature":"Keyword getOperationKeyword_6()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameOperatorKeyword_0_1;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameOperatorKeyword_0_1()","old_args":"","old_implementation":"return cOperatorKeyword_1;","old_return_type":"Keyword","old_signature":"Keyword getOperatorKeyword_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameOutputKeyword_0_0;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameOutputKeyword_0_0()","old_args":"","old_implementation":"return cOutputKeyword_0;","old_return_type":"Keyword","old_signature":"Keyword getOutputKeyword_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameParagraphKeyword_0_4;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameParagraphKeyword_0_4()","old_args":"","old_implementation":"return cParagraphKeyword_4;","old_return_type":"Keyword","old_signature":"Keyword getParagraphKeyword_4()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNamePrinciplesKeyword_0_2;","new_return_type":"Keyword","new_signature":"Keyword getTypeNamePrinciplesKeyword_0_2()","old_args":"","old_implementation":"return cPrinciplesKeyword_2;","old_return_type":"Keyword","old_signature":"Keyword getPrinciplesKeyword_2()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNamePurposeKeyword_0_1;","new_return_type":"Keyword","new_signature":"Keyword getTypeNamePurposeKeyword_0_1()","old_args":"","old_implementation":"return cPurposeKeyword_1;","old_return_type":"Keyword","old_signature":"Keyword getPurposeKeyword_1()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"EAttribute","new_signature":"EAttribute getRefinement_Name()","old_args":"","old_implementation":null,"old_return_type":"EAttribute","old_signature":"EAttribute getRefinement_Id()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameRequirementKeyword_0_0;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameRequirementKeyword_0_0()","old_args":"","old_implementation":"return cRequirementKeyword_0;","old_return_type":"Keyword","old_signature":"Keyword getRequirementKeyword_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameSectionKeyword_0_5;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameSectionKeyword_0_5()","old_args":"","old_implementation":"return cSectionKeyword_5;","old_return_type":"Keyword","old_signature":"Keyword getSectionKeyword_5()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"EAttribute","new_signature":"EAttribute getSpecification_Name()","old_args":"","old_implementation":null,"old_return_type":"EAttribute","old_signature":"EAttribute getSpecification_Id()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameStateKeyword_0_2;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameStateKeyword_0_2()","old_args":"","old_implementation":"return cStateKeyword_2;","old_return_type":"Keyword","old_signature":"Keyword getStateKeyword_2()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameSystemKeyword_0_2;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameSystemKeyword_0_2()","old_args":"","old_implementation":"return cSystemKeyword_2;","old_return_type":"Keyword","old_signature":"Keyword getSystemKeyword_2()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameTableKeyword_0_6;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameTableKeyword_0_6()","old_args":"","old_implementation":"return cTableKeyword_6;","old_return_type":"Keyword","old_signature":"Keyword getTableKeyword_6()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameVerificationKeyword_0_3;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameVerificationKeyword_0_3()","old_args":"","old_implementation":"return cVerificationKeyword_3;","old_return_type":"Keyword","old_signature":"Keyword getVerificationKeyword_3()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void rule__Decomposition__NameAssignment_1()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void rule__Decomposition__IdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void rule__DocItem__NameAssignment_1()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void rule__DocItem__IdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void rule__Intent__NameAssignment_1()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void rule__Intent__IdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void rule__ListItem__NameAssignment_1()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void rule__ListItem__IdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void rule__ModelItem__NameAssignment_1()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void rule__ModelItem__IdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void rule__Refinement__NameAssignment_1()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void rule__Refinement__IdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void rule__Specification__NameAssignment_1()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void rule__Specification__IdAssignment_1()"},{"name":"nasa$certware","new_args":"String newName","new_implementation":null,"new_return_type":"void","new_signature":"void setName(String newName)","old_args":"String newId","old_implementation":null,"old_return_type":"void","old_signature":"void setId(String newId)"},{"name":"nasa$certware","new_args":"String newName","new_implementation":null,"new_return_type":"void","new_signature":"void setName(String newName)","old_args":"String newId","old_implementation":null,"old_return_type":"void","old_signature":"void setId(String newId)"},{"name":"nasa$certware","new_args":"String newName","new_implementation":null,"new_return_type":"void","new_signature":"void setName(String newName)","old_args":"String newType","old_implementation":null,"old_return_type":"void","old_signature":"void setType(String newType)"},{"name":"nasa$certware","new_args":"String newName","new_implementation":null,"new_return_type":"void","new_signature":"void setName(String newName)","old_args":"String newType","old_implementation":null,"old_return_type":"void","old_signature":"void setType(String newType)"},{"name":"nasa$certware","new_args":"String newName","new_implementation":null,"new_return_type":"void","new_signature":"void setName(String newName)","old_args":"String newType","old_implementation":null,"old_return_type":"void","old_signature":"void setType(String newType)"},{"name":"nasa$certware","new_args":"String newName","new_implementation":null,"new_return_type":"void","new_signature":"void setName(String newName)","old_args":"String newType","old_implementation":null,"old_return_type":"void","old_signature":"void setType(String newType)"},{"name":"nasa$certware","new_args":"String newName","new_implementation":null,"new_return_type":"void","new_signature":"void setName(String newName)","old_args":"String newType","old_implementation":null,"old_return_type":"void","old_signature":"void setType(String newType)"}],"string":"[\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void completeDecomposition_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\",\n \"old_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void completeDecomposition_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void completeDocItem_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\",\n \"old_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void completeDocItem_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void completeIntent_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\",\n \"old_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void completeIntent_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void completeListItem_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\",\n \"old_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void completeListItem_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void completeModelItem_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\",\n \"old_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void completeModelItem_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void completeRefinement_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\",\n \"old_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void completeRefinement_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void completeSpecification_Name(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\",\n \"old_args\": \"EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void completeSpecification_Id(EObject model,Assignment assignment,ContentAssistContext context,ICompletionProposalAcceptor acceptor)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameAlternatives_0;\",\n \"new_return_type\": \"Alternatives\",\n \"new_signature\": \"Alternatives getTypeNameAlternatives_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cAlternatives;\",\n \"old_return_type\": \"Alternatives\",\n \"old_signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameAlternatives_0;\",\n \"new_return_type\": \"Alternatives\",\n \"new_signature\": \"Alternatives getTypeNameAlternatives_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cAlternatives;\",\n \"old_return_type\": \"Alternatives\",\n \"old_signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameAlternatives_0;\",\n \"new_return_type\": \"Alternatives\",\n \"new_signature\": \"Alternatives getTypeNameAlternatives_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cAlternatives;\",\n \"old_return_type\": \"Alternatives\",\n \"old_signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameAlternatives_0;\",\n \"new_return_type\": \"Alternatives\",\n \"new_signature\": \"Alternatives getTypeNameAlternatives_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cAlternatives;\",\n \"old_return_type\": \"Alternatives\",\n \"old_signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameAlternatives_0;\",\n \"new_return_type\": \"Alternatives\",\n \"new_signature\": \"Alternatives getTypeNameAlternatives_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cAlternatives;\",\n \"old_return_type\": \"Alternatives\",\n \"old_signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameBasicKeyword_0_0;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameBasicKeyword_0_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cBasicKeyword_0;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getBasicKeyword_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameBreakKeyword_0_2;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameBreakKeyword_0_2()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cBreakKeyword_2;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getBreakKeyword_2()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameConditionKeyword_0_0;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameConditionKeyword_0_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cConditionKeyword_0;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getConditionKeyword_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameConstraintKeyword_0_3;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameConstraintKeyword_0_3()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cConstraintKeyword_3;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getConstraintKeyword_3()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EAttribute\",\n \"new_signature\": \"EAttribute getDecomposition_Name()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EAttribute\",\n \"old_signature\": \"EAttribute getDecomposition_Id()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameDesignKeyword_0_4;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameDesignKeyword_0_4()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cDesignKeyword_4;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getDesignKeyword_4()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EAttribute\",\n \"new_signature\": \"EAttribute getDocItem_Name()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EAttribute\",\n \"old_signature\": \"EAttribute getDocItem_Id()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameEnvironmentKeyword_0_0;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameEnvironmentKeyword_0_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cEnvironmentKeyword_0;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getEnvironmentKeyword_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameFigureKeyword_0_1;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameFigureKeyword_0_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cFigureKeyword_1;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getFigureKeyword_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameFunctionKeyword_0_4;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameFunctionKeyword_0_4()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cFunctionKeyword_4;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getFunctionKeyword_4()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameGoalKeyword_0_1;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameGoalKeyword_0_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cGoalKeyword_1;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getGoalKeyword_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameHazardKeyword_0_2;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameHazardKeyword_0_2()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cHazardKeyword_2;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getHazardKeyword_2()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String getName()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String getId()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String getName()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String getId()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String getName()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String getId()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String getName()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String getId()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String getName()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String getId()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String getName()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String getId()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String getName()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String getId()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameImplementationKeyword_0_5;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameImplementationKeyword_0_5()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cImplementationKeyword_5;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getImplementationKeyword_5()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameInputKeyword_0_5;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameInputKeyword_0_5()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cInputKeyword_5;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getInputKeyword_5()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EAttribute\",\n \"new_signature\": \"EAttribute getIntent_Name()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EAttribute\",\n \"old_signature\": \"EAttribute getIntent_Id()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EAttribute\",\n \"new_signature\": \"EAttribute getListItem_Name()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EAttribute\",\n \"old_signature\": \"EAttribute getListItem_Id()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameMacroKeyword_0_3;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameMacroKeyword_0_3()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cMacroKeyword_3;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getMacroKeyword_3()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameModeKeyword_0_1;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameModeKeyword_0_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cModeKeyword_1;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getModeKeyword_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EAttribute\",\n \"new_signature\": \"EAttribute getModelItem_Name()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EAttribute\",\n \"old_signature\": \"EAttribute getModelItem_Id()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameModelKeyword_0_3;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameModelKeyword_0_3()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cModelKeyword_3;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getModelKeyword_3()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameModelsKeyword_0_3;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameModelsKeyword_0_3()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cModelsKeyword_3;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getModelsKeyword_3()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameOperationKeyword_0_6;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameOperationKeyword_0_6()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cOperationKeyword_6;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getOperationKeyword_6()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameOperatorKeyword_0_1;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameOperatorKeyword_0_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cOperatorKeyword_1;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getOperatorKeyword_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameOutputKeyword_0_0;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameOutputKeyword_0_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cOutputKeyword_0;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getOutputKeyword_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameParagraphKeyword_0_4;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameParagraphKeyword_0_4()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cParagraphKeyword_4;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getParagraphKeyword_4()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNamePrinciplesKeyword_0_2;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNamePrinciplesKeyword_0_2()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cPrinciplesKeyword_2;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getPrinciplesKeyword_2()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNamePurposeKeyword_0_1;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNamePurposeKeyword_0_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cPurposeKeyword_1;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getPurposeKeyword_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EAttribute\",\n \"new_signature\": \"EAttribute getRefinement_Name()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EAttribute\",\n \"old_signature\": \"EAttribute getRefinement_Id()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameRequirementKeyword_0_0;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameRequirementKeyword_0_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cRequirementKeyword_0;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getRequirementKeyword_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameSectionKeyword_0_5;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameSectionKeyword_0_5()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cSectionKeyword_5;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getSectionKeyword_5()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EAttribute\",\n \"new_signature\": \"EAttribute getSpecification_Name()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EAttribute\",\n \"old_signature\": \"EAttribute getSpecification_Id()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameStateKeyword_0_2;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameStateKeyword_0_2()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cStateKeyword_2;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getStateKeyword_2()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameSystemKeyword_0_2;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameSystemKeyword_0_2()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cSystemKeyword_2;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getSystemKeyword_2()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameTableKeyword_0_6;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameTableKeyword_0_6()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cTableKeyword_6;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getTableKeyword_6()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameVerificationKeyword_0_3;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameVerificationKeyword_0_3()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cVerificationKeyword_3;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getVerificationKeyword_3()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void rule__Decomposition__NameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void rule__Decomposition__IdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void rule__DocItem__NameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void rule__DocItem__IdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void rule__Intent__NameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void rule__Intent__IdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void rule__ListItem__NameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void rule__ListItem__IdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void rule__ModelItem__NameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void rule__ModelItem__IdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void rule__Refinement__NameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void rule__Refinement__IdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void rule__Specification__NameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void rule__Specification__IdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"String newName\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setName(String newName)\",\n \"old_args\": \"String newId\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setId(String newId)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"String newName\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setName(String newName)\",\n \"old_args\": \"String newId\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setId(String newId)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"String newName\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setName(String newName)\",\n \"old_args\": \"String newType\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setType(String newType)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"String newName\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setName(String newName)\",\n \"old_args\": \"String newType\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setType(String newType)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"String newName\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setName(String newName)\",\n \"old_args\": \"String newType\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setType(String newType)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"String newName\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setName(String newName)\",\n \"old_args\": \"String newType\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setType(String newType)\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"String newName\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setName(String newName)\",\n \"old_args\": \"String newType\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void setType(String newType)\"\n }\n]"},"files":{"kind":"list like","value":[{"additions":8,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fplugin.xml","changes":16,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fplugin.xml?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":8,"filename":"net.certware.intent.ui/plugin.xml","new_code":" name=\"Intent Specification Editor\">\n name=\"Intent Specification\">\n name=\"Intent Specification\">\n label=\"Intent Specification\"/>\n\t name=\"Intent Specification Problem\"\n\t name=\"Intent Specification Problem\"\n\t name=\"Intent Specification Problem\"\n extensions=\"intent\" label=\"Intent Specification Compare\">","new_methods":[],"old_code":" name=\"IntentSpecification Editor\">\n name=\"IntentSpecification\">\n name=\"IntentSpecification\">\n label=\"IntentSpecification\"/>\n\t name=\"IntentSpecification Problem\"\n\t name=\"IntentSpecification Problem\"\n\t name=\"IntentSpecification Problem\"\n extensions=\"intent\" label=\"IntentSpecification Compare\">","old_methods":[],"patch":"@@ -12,7 +12,7 @@\n extensions=\"intent\"\n icon=\"icons/obj16/intent.gif\"\n id=\"net.certware.intent.IntentSpecification\"\n- name=\"IntentSpecification Editor\">\n+ name=\"Intent Specification Editor\">\n \n \n \n+ name=\"Intent Specification\">\n \n \n \n+ name=\"Intent Specification\">\n \n \n \t \n@@ -120,7 +120,7 @@\n point=\"org.eclipse.ui.keywords\">\n \n+ label=\"Intent Specification\"/>\n \n \n@@ -235,21 +235,21 @@\n \t\n \t\n \t \n \t \n \t\n \t\n \t \n \t \n \t\n \t\n \t \n \t \n@@ -406,7 +406,7 @@\n \n \n+ extensions=\"intent\" label=\"Intent Specification Compare\">\n \n \n ","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fplugin.xml","sha":"52d4008c146ac7ae28f9ac61d210b6334ac321db","status":"modified"},{"additions":45,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2FAbstractIntentSpecificationProposalProvider.java","changes":52,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2FAbstractIntentSpecificationProposalProvider.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":7,"filename":"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java","new_code":"\tpublic void completeSpecification_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeRefinement_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeIntent_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeIntentType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t}\n\tpublic void completeDecomposition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeDecompositionType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t}\n\tpublic void completeDocItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t}\n\tpublic void completeDocItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeModelType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t}\n\tpublic void completeModelItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeListItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t}\n\tpublic void completeListItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {","new_methods":[{"arguments":["EObject model"," Assignment assignment"," ContentAssistContext context"," ICompletionProposalAcceptor acceptor"],"filename":"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java","implementation":"public void completeRefinement_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeIntent_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeIntentType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override","signature":"void completeSpecification_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)"},{"arguments":["EObject model"," Assignment assignment"," ContentAssistContext context"," ICompletionProposalAcceptor acceptor"],"filename":"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java","implementation":"public void completeDecompositionType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override","signature":"void completeDecomposition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)"},{"arguments":["EObject model"," Assignment assignment"," ContentAssistContext context"," ICompletionProposalAcceptor acceptor"],"filename":"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java","implementation":"// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override","signature":"void completeDocItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)"},{"arguments":["EObject model"," Assignment assignment"," ContentAssistContext context"," ICompletionProposalAcceptor acceptor"],"filename":"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java","implementation":"public void completeModelType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override","signature":"void completeDocItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)"},{"arguments":["EObject model"," Assignment assignment"," ContentAssistContext context"," ICompletionProposalAcceptor acceptor"],"filename":"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java","implementation":"public void completeListItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override\n\t\t// subclasses may override","signature":"void completeModelItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)"}],"old_code":"\tpublic void completeSpecification_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeRefinement_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeIntent_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeDecomposition_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeDocItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeModelItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n\tpublic void completeListItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {","old_methods":[],"patch":"@@ -16,13 +16,13 @@\n @SuppressWarnings(\"all\")\n public class AbstractIntentSpecificationProposalProvider extends org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider {\n \t\t\n-\tpublic void completeSpecification_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeSpecification_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeSpecification_Refinements(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeRefinement_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeRefinement_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeRefinement_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n@@ -34,7 +34,7 @@ public void completeRefinement_Intents(EObject model, Assignment assignment, Con\n \tpublic void completeIntent_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeIntent_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeIntent_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeIntent_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n@@ -43,10 +43,19 @@ public void completeIntent_Desc(EObject model, Assignment assignment, ContentAss\n \tpublic void completeIntent_Decompositions(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n+\tpublic void completeIntentType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t}\n \tpublic void completeDecomposition_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeDecomposition_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeDecomposition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeDecomposition_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n@@ -61,31 +70,60 @@ public void completeDecomposition_Models(EObject model, Assignment assignment, C\n \tpublic void completeDecomposition_Items(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n+\tpublic void completeDecompositionType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t}\n \tpublic void completeDocument_Entries(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n+\tpublic void completeDocItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t}\n \tpublic void completeDocItem_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeDocItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeDocItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeDocItem_Ref(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n+\tpublic void completeModelType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t}\n \tpublic void completeModelItem_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeModelItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeModelItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeModelItem_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n+\tpublic void completeListItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t\t// subclasses may override\n+\t}\n \tpublic void completeListItem_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n-\tpublic void completeListItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n+\tpublic void completeListItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\n \t\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\n \t}\n \tpublic void completeListItem_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2FAbstractIntentSpecificationProposalProvider.java","sha":"945949ad08b9388eee93eff0ed125c80b438cf72","status":"modified"},{"additions":17,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2FIntentSpecificationParser.java","changes":29,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2FIntentSpecificationParser.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":12,"filename":"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/IntentSpecificationParser.java","new_code":"\t\t\t\t\tput(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0(), \"rule__IntentType__TypeNameAlternatives_0\");\n\t\t\t\t\tput(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0(), \"rule__DecompositionType__TypeNameAlternatives_0\");\n\t\t\t\t\tput(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0(), \"rule__DocItemType__TypeNameAlternatives_0\");\n\t\t\t\t\tput(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0(), \"rule__ModelType__TypeNameAlternatives_0\");\n\t\t\t\t\tput(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0(), \"rule__ListItemType__TypeNameAlternatives_0\");\n\t\t\t\t\tput(grammarAccess.getSpecificationAccess().getNameAssignment_1(), \"rule__Specification__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getRefinementAccess().getNameAssignment_1(), \"rule__Refinement__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getIntentAccess().getNameAssignment_1(), \"rule__Intent__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getIntentTypeAccess().getTypeNameAssignment(), \"rule__IntentType__TypeNameAssignment\");\n\t\t\t\t\tput(grammarAccess.getDecompositionAccess().getNameAssignment_1(), \"rule__Decomposition__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment(), \"rule__DecompositionType__TypeNameAssignment\");\n\t\t\t\t\tput(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment(), \"rule__DocItemType__TypeNameAssignment\");\n\t\t\t\t\tput(grammarAccess.getDocItemAccess().getNameAssignment_1(), \"rule__DocItem__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getModelTypeAccess().getTypeNameAssignment(), \"rule__ModelType__TypeNameAssignment\");\n\t\t\t\t\tput(grammarAccess.getModelItemAccess().getNameAssignment_1(), \"rule__ModelItem__NameAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getListItemTypeAccess().getTypeNameAssignment(), \"rule__ListItemType__TypeNameAssignment\");\n\t\t\t\t\tput(grammarAccess.getListItemAccess().getNameAssignment_1(), \"rule__ListItem__NameAssignment_1\");","new_methods":[],"old_code":"\t\t\t\t\tput(grammarAccess.getIntentTypeAccess().getAlternatives(), \"rule__IntentType__Alternatives\");\n\t\t\t\t\tput(grammarAccess.getDecompositionTypeAccess().getAlternatives(), \"rule__DecompositionType__Alternatives\");\n\t\t\t\t\tput(grammarAccess.getDocItemTypeAccess().getAlternatives(), \"rule__DocItemType__Alternatives\");\n\t\t\t\t\tput(grammarAccess.getModelTypeAccess().getAlternatives(), \"rule__ModelType__Alternatives\");\n\t\t\t\t\tput(grammarAccess.getListItemTypeAccess().getAlternatives(), \"rule__ListItemType__Alternatives\");\n\t\t\t\t\tput(grammarAccess.getSpecificationAccess().getIdAssignment_1(), \"rule__Specification__IdAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getRefinementAccess().getIdAssignment_1(), \"rule__Refinement__IdAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getIntentAccess().getIdAssignment_1(), \"rule__Intent__IdAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getDecompositionAccess().getIdAssignment_1(), \"rule__Decomposition__IdAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getDocItemAccess().getIdAssignment_1(), \"rule__DocItem__IdAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getModelItemAccess().getIdAssignment_1(), \"rule__ModelItem__IdAssignment_1\");\n\t\t\t\t\tput(grammarAccess.getListItemAccess().getIdAssignment_1(), \"rule__ListItem__IdAssignment_1\");","old_methods":[],"patch":"@@ -37,11 +37,11 @@ protected String getRuleName(AbstractElement element) {\n \t\t\tnameMappings = new HashMap() {\n \t\t\t\tprivate static final long serialVersionUID = 1L;\n \t\t\t\t{\n-\t\t\t\t\tput(grammarAccess.getIntentTypeAccess().getAlternatives(), \"rule__IntentType__Alternatives\");\n-\t\t\t\t\tput(grammarAccess.getDecompositionTypeAccess().getAlternatives(), \"rule__DecompositionType__Alternatives\");\n-\t\t\t\t\tput(grammarAccess.getDocItemTypeAccess().getAlternatives(), \"rule__DocItemType__Alternatives\");\n-\t\t\t\t\tput(grammarAccess.getModelTypeAccess().getAlternatives(), \"rule__ModelType__Alternatives\");\n-\t\t\t\t\tput(grammarAccess.getListItemTypeAccess().getAlternatives(), \"rule__ListItemType__Alternatives\");\n+\t\t\t\t\tput(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0(), \"rule__IntentType__TypeNameAlternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0(), \"rule__DecompositionType__TypeNameAlternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0(), \"rule__DocItemType__TypeNameAlternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0(), \"rule__ModelType__TypeNameAlternatives_0\");\n+\t\t\t\t\tput(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0(), \"rule__ListItemType__TypeNameAlternatives_0\");\n \t\t\t\t\tput(grammarAccess.getSpecificationAccess().getGroup(), \"rule__Specification__Group__0\");\n \t\t\t\t\tput(grammarAccess.getRefinementAccess().getGroup(), \"rule__Refinement__Group__0\");\n \t\t\t\t\tput(grammarAccess.getIntentAccess().getGroup(), \"rule__Intent__Group__0\");\n@@ -56,30 +56,35 @@ protected String getRuleName(AbstractElement element) {\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getGroup_3(), \"rule__ListItem__Group_3__0\");\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getGroup_4(), \"rule__ListItem__Group_4__0\");\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getGroup_5(), \"rule__ListItem__Group_5__0\");\n-\t\t\t\t\tput(grammarAccess.getSpecificationAccess().getIdAssignment_1(), \"rule__Specification__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getSpecificationAccess().getNameAssignment_1(), \"rule__Specification__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getSpecificationAccess().getRefinementsAssignment_2(), \"rule__Specification__RefinementsAssignment_2\");\n-\t\t\t\t\tput(grammarAccess.getRefinementAccess().getIdAssignment_1(), \"rule__Refinement__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getRefinementAccess().getNameAssignment_1(), \"rule__Refinement__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getRefinementAccess().getDescAssignment_2(), \"rule__Refinement__DescAssignment_2\");\n \t\t\t\t\tput(grammarAccess.getRefinementAccess().getIntentsAssignment_3(), \"rule__Refinement__IntentsAssignment_3\");\n \t\t\t\t\tput(grammarAccess.getIntentAccess().getTypeAssignment_0(), \"rule__Intent__TypeAssignment_0\");\n-\t\t\t\t\tput(grammarAccess.getIntentAccess().getIdAssignment_1(), \"rule__Intent__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getIntentAccess().getNameAssignment_1(), \"rule__Intent__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getIntentAccess().getDescAssignment_2(), \"rule__Intent__DescAssignment_2\");\n \t\t\t\t\tput(grammarAccess.getIntentAccess().getDecompositionsAssignment_3(), \"rule__Intent__DecompositionsAssignment_3\");\n+\t\t\t\t\tput(grammarAccess.getIntentTypeAccess().getTypeNameAssignment(), \"rule__IntentType__TypeNameAssignment\");\n \t\t\t\t\tput(grammarAccess.getDecompositionAccess().getTypeAssignment_0(), \"rule__Decomposition__TypeAssignment_0\");\n-\t\t\t\t\tput(grammarAccess.getDecompositionAccess().getIdAssignment_1(), \"rule__Decomposition__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getDecompositionAccess().getNameAssignment_1(), \"rule__Decomposition__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getDecompositionAccess().getDescAssignment_2(), \"rule__Decomposition__DescAssignment_2\");\n \t\t\t\t\tput(grammarAccess.getDecompositionAccess().getDocumentsAssignment_3_1(), \"rule__Decomposition__DocumentsAssignment_3_1\");\n \t\t\t\t\tput(grammarAccess.getDecompositionAccess().getModelsAssignment_4_1(), \"rule__Decomposition__ModelsAssignment_4_1\");\n \t\t\t\t\tput(grammarAccess.getDecompositionAccess().getItemsAssignment_5_1(), \"rule__Decomposition__ItemsAssignment_5_1\");\n+\t\t\t\t\tput(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment(), \"rule__DecompositionType__TypeNameAssignment\");\n \t\t\t\t\tput(grammarAccess.getDocumentAccess().getEntriesAssignment_1(), \"rule__Document__EntriesAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment(), \"rule__DocItemType__TypeNameAssignment\");\n \t\t\t\t\tput(grammarAccess.getDocItemAccess().getTypeAssignment_0(), \"rule__DocItem__TypeAssignment_0\");\n-\t\t\t\t\tput(grammarAccess.getDocItemAccess().getIdAssignment_1(), \"rule__DocItem__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getDocItemAccess().getNameAssignment_1(), \"rule__DocItem__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getDocItemAccess().getRefAssignment_2(), \"rule__DocItem__RefAssignment_2\");\n+\t\t\t\t\tput(grammarAccess.getModelTypeAccess().getTypeNameAssignment(), \"rule__ModelType__TypeNameAssignment\");\n \t\t\t\t\tput(grammarAccess.getModelItemAccess().getTypeAssignment_0(), \"rule__ModelItem__TypeAssignment_0\");\n-\t\t\t\t\tput(grammarAccess.getModelItemAccess().getIdAssignment_1(), \"rule__ModelItem__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getModelItemAccess().getNameAssignment_1(), \"rule__ModelItem__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getModelItemAccess().getDescAssignment_2(), \"rule__ModelItem__DescAssignment_2\");\n+\t\t\t\t\tput(grammarAccess.getListItemTypeAccess().getTypeNameAssignment(), \"rule__ListItemType__TypeNameAssignment\");\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getTypeAssignment_0(), \"rule__ListItem__TypeAssignment_0\");\n-\t\t\t\t\tput(grammarAccess.getListItemAccess().getIdAssignment_1(), \"rule__ListItem__IdAssignment_1\");\n+\t\t\t\t\tput(grammarAccess.getListItemAccess().getNameAssignment_1(), \"rule__ListItem__NameAssignment_1\");\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getDescAssignment_2(), \"rule__ListItem__DescAssignment_2\");\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1(), \"rule__ListItem__DocReferencesAssignment_3_1\");\n \t\t\t\t\tput(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1(), \"rule__ListItem__ItemReferencesAssignment_4_1\");","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2FIntentSpecificationParser.java","sha":"5c5686f85064519494d96b38b242142fa1059954","status":"modified"},{"additions":219,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecification.g","changes":337,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecification.g?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":118,"filename":"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g","new_code":"{ before(grammarAccess.getIntentTypeAccess().getTypeNameAssignment()); }\n(rule__IntentType__TypeNameAssignment)\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameAssignment()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment()); }\n(rule__DecompositionType__TypeNameAssignment)\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment()); }\n(rule__DocItemType__TypeNameAssignment)\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment()); }\n{ before(grammarAccess.getModelTypeAccess().getTypeNameAssignment()); }\n(rule__ModelType__TypeNameAssignment)\n{ after(grammarAccess.getModelTypeAccess().getTypeNameAssignment()); }\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameAssignment()); }\n(rule__ListItemType__TypeNameAssignment)\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameAssignment()); }\nrule__IntentType__TypeNameAlternatives_0\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0()); }\n{ before(grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1()); }\n{ before(grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2()); }\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3()); }\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4()); }\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5()); }\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6()); }\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6()); }\nrule__DecompositionType__TypeNameAlternatives_0\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3()); }\nrule__DocItemType__TypeNameAlternatives_0\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6()); }\nrule__ModelType__TypeNameAlternatives_0\n{ before(grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0()); }\n{ after(grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0()); }\n{ before(grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1()); }\n{ after(grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1()); }\n{ before(grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2()); }\n{ after(grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2()); }\n{ before(grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3()); }\n{ after(grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3()); }\n{ before(grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4()); }\n{ after(grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4()); }\n{ before(grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5()); }\n{ after(grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5()); }\nrule__ListItemType__TypeNameAlternatives_0\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0()); }\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0()); }\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1()); }\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1()); }\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2()); }\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2()); }\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3()); }\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3()); }\n{ before(grammarAccess.getSpecificationAccess().getNameAssignment_1()); }\n(rule__Specification__NameAssignment_1)\n{ after(grammarAccess.getSpecificationAccess().getNameAssignment_1()); }\n{ before(grammarAccess.getRefinementAccess().getNameAssignment_1()); }\n(rule__Refinement__NameAssignment_1)\n{ after(grammarAccess.getRefinementAccess().getNameAssignment_1()); }\n{ before(grammarAccess.getIntentAccess().getNameAssignment_1()); }\n(rule__Intent__NameAssignment_1)\n{ after(grammarAccess.getIntentAccess().getNameAssignment_1()); }\n{ before(grammarAccess.getDecompositionAccess().getNameAssignment_1()); }\n(rule__Decomposition__NameAssignment_1)\n{ after(grammarAccess.getDecompositionAccess().getNameAssignment_1()); }\n{ before(grammarAccess.getDocItemAccess().getNameAssignment_1()); }\n(rule__DocItem__NameAssignment_1)\n{ after(grammarAccess.getDocItemAccess().getNameAssignment_1()); }\n{ before(grammarAccess.getModelItemAccess().getNameAssignment_1()); }\n(rule__ModelItem__NameAssignment_1)\n{ after(grammarAccess.getModelItemAccess().getNameAssignment_1()); }\n{ before(grammarAccess.getListItemAccess().getNameAssignment_1()); }\n(rule__ListItem__NameAssignment_1)\n{ after(grammarAccess.getListItemAccess().getNameAssignment_1()); }\n(\n{ before(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\n(rule__ListItem__DocReferencesAssignment_3_1)\n{ after(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\n)\n(\n)\n(\n{ before(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\n(rule__ListItem__ItemReferencesAssignment_4_1)\n{ after(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\n)\n(\n)\n(\n{ before(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\n(rule__ListItem__ModelReferencesAssignment_5_1)\n{ after(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\n)\n(\n)\nrule__Specification__NameAssignment_1\n{ before(grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); }\nrule__Refinement__NameAssignment_1\n{ before(grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); }\nrule__Intent__NameAssignment_1\n{ before(grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); }\nrule__IntentType__TypeNameAssignment\n @init {\n\t\tint stackSize = keepStackSize();\n }\n:\n(\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0()); }\n(rule__IntentType__TypeNameAlternatives_0)\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0()); }\n)\n\n;\nfinally {\n\trestoreStackSize(stackSize);\n}\n\nrule__Decomposition__NameAssignment_1\n{ before(grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); }\nrule__DecompositionType__TypeNameAssignment\n @init {\n\t\tint stackSize = keepStackSize();\n }\n:\n(\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0()); }\n(rule__DecompositionType__TypeNameAlternatives_0)\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0()); }\n)\n\n;\nfinally {\n\trestoreStackSize(stackSize);\n}\n\nrule__DocItemType__TypeNameAssignment\n @init {\n\t\tint stackSize = keepStackSize();\n }\n:\n(\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0()); }\n(rule__DocItemType__TypeNameAlternatives_0)\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0()); }\n)\n\n;\nfinally {\n\trestoreStackSize(stackSize);\n}\n\nrule__DocItem__NameAssignment_1\n{ before(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); }\nrule__ModelType__TypeNameAssignment\n @init {\n\t\tint stackSize = keepStackSize();\n }\n:\n(\n{ before(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0()); }\n(rule__ModelType__TypeNameAlternatives_0)\n{ after(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0()); }\n)\n\n;\nfinally {\n\trestoreStackSize(stackSize);\n}\n\nrule__ModelItem__NameAssignment_1\n{ before(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); }\nrule__ListItemType__TypeNameAssignment\n @init {\n\t\tint stackSize = keepStackSize();\n }\n:\n(\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0()); }\n(rule__ListItemType__TypeNameAlternatives_0)\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0()); }\n)\n\n;\nfinally {\n\trestoreStackSize(stackSize);\n}\n\nrule__ListItem__NameAssignment_1\n{ before(grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); }","new_methods":[],"old_code":"{ before(grammarAccess.getIntentTypeAccess().getAlternatives()); }\n(rule__IntentType__Alternatives)\n{ after(grammarAccess.getIntentTypeAccess().getAlternatives()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getAlternatives()); }\n(rule__DecompositionType__Alternatives)\n{ after(grammarAccess.getDecompositionTypeAccess().getAlternatives()); }\n{ before(grammarAccess.getDocItemTypeAccess().getAlternatives()); }\n(rule__DocItemType__Alternatives)\n{ after(grammarAccess.getDocItemTypeAccess().getAlternatives()); }\n{ before(grammarAccess.getModelTypeAccess().getAlternatives()); }\n(rule__ModelType__Alternatives)\n{ after(grammarAccess.getModelTypeAccess().getAlternatives()); }\n{ before(grammarAccess.getListItemTypeAccess().getAlternatives()); }\n(rule__ListItemType__Alternatives)\n{ after(grammarAccess.getListItemTypeAccess().getAlternatives()); }\nrule__IntentType__Alternatives\n{ before(grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); }\n{ after(grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); }\n{ before(grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); }\n{ after(grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); }\n{ before(grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); }\n{ after(grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); }\n{ before(grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); }\n{ after(grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); }\n{ before(grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); }\n{ after(grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); }\n{ before(grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); }\n{ after(grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); }\n{ before(grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); }\n{ after(grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); }\nrule__DecompositionType__Alternatives\n{ before(grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); }\n{ before(grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); }\n{ after(grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); }\nrule__DocItemType__Alternatives\n{ before(grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); }\n{ after(grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); }\n{ before(grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); }\n{ after(grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); }\n{ before(grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); }\n{ after(grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); }\n{ before(grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); }\n{ after(grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); }\n{ before(grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); }\n{ after(grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); }\n{ before(grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); }\n{ after(grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); }\n{ before(grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); }\n{ after(grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); }\nrule__ModelType__Alternatives\n{ before(grammarAccess.getModelTypeAccess().getOutputKeyword_0()); }\n{ after(grammarAccess.getModelTypeAccess().getOutputKeyword_0()); }\n{ before(grammarAccess.getModelTypeAccess().getModeKeyword_1()); }\n{ after(grammarAccess.getModelTypeAccess().getModeKeyword_1()); }\n{ before(grammarAccess.getModelTypeAccess().getStateKeyword_2()); }\n{ after(grammarAccess.getModelTypeAccess().getStateKeyword_2()); }\n{ before(grammarAccess.getModelTypeAccess().getMacroKeyword_3()); }\n{ after(grammarAccess.getModelTypeAccess().getMacroKeyword_3()); }\n{ before(grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); }\n{ after(grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); }\n{ before(grammarAccess.getModelTypeAccess().getInputKeyword_5()); }\n{ after(grammarAccess.getModelTypeAccess().getInputKeyword_5()); }\nrule__ListItemType__Alternatives\n{ before(grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); }\n{ after(grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); }\n{ before(grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); }\n{ after(grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); }\n{ before(grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); }\n{ after(grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); }\n{ before(grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); }\n{ after(grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); }\n{ before(grammarAccess.getSpecificationAccess().getIdAssignment_1()); }\n(rule__Specification__IdAssignment_1)\n{ after(grammarAccess.getSpecificationAccess().getIdAssignment_1()); }\n{ before(grammarAccess.getRefinementAccess().getIdAssignment_1()); }\n(rule__Refinement__IdAssignment_1)\n{ after(grammarAccess.getRefinementAccess().getIdAssignment_1()); }\n{ before(grammarAccess.getIntentAccess().getIdAssignment_1()); }\n(rule__Intent__IdAssignment_1)\n{ after(grammarAccess.getIntentAccess().getIdAssignment_1()); }\n{ before(grammarAccess.getDecompositionAccess().getIdAssignment_1()); }\n(rule__Decomposition__IdAssignment_1)\n{ after(grammarAccess.getDecompositionAccess().getIdAssignment_1()); }\n{ before(grammarAccess.getDocItemAccess().getIdAssignment_1()); }\n(rule__DocItem__IdAssignment_1)\n{ after(grammarAccess.getDocItemAccess().getIdAssignment_1()); }\n{ before(grammarAccess.getModelItemAccess().getIdAssignment_1()); }\n(rule__ModelItem__IdAssignment_1)\n{ after(grammarAccess.getModelItemAccess().getIdAssignment_1()); }\n{ before(grammarAccess.getListItemAccess().getIdAssignment_1()); }\n(rule__ListItem__IdAssignment_1)\n{ after(grammarAccess.getListItemAccess().getIdAssignment_1()); }\nrule__Specification__IdAssignment_1\n{ before(grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); }\nrule__Refinement__IdAssignment_1\n{ before(grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); }\nrule__Intent__IdAssignment_1\n{ before(grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); }\nrule__Decomposition__IdAssignment_1\n{ before(grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); }\nrule__DocItem__IdAssignment_1\n{ before(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); }\nrule__ModelItem__IdAssignment_1\n{ before(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); }\nrule__ListItem__IdAssignment_1\n{ before(grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); }\n\tRULE_ID{ after(grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); }","old_methods":[],"patch":"@@ -156,9 +156,9 @@ ruleIntentType\n }\n \t:\n (\n-{ before(grammarAccess.getIntentTypeAccess().getAlternatives()); }\n-(rule__IntentType__Alternatives)\n-{ after(grammarAccess.getIntentTypeAccess().getAlternatives()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameAssignment()); }\n+(rule__IntentType__TypeNameAssignment)\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameAssignment()); }\n )\n \n ;\n@@ -212,9 +212,9 @@ ruleDecompositionType\n }\n \t:\n (\n-{ before(grammarAccess.getDecompositionTypeAccess().getAlternatives()); }\n-(rule__DecompositionType__Alternatives)\n-{ after(grammarAccess.getDecompositionTypeAccess().getAlternatives()); }\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment()); }\n+(rule__DecompositionType__TypeNameAssignment)\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment()); }\n )\n \n ;\n@@ -268,9 +268,9 @@ ruleDocItemType\n }\n \t:\n (\n-{ before(grammarAccess.getDocItemTypeAccess().getAlternatives()); }\n-(rule__DocItemType__Alternatives)\n-{ after(grammarAccess.getDocItemTypeAccess().getAlternatives()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment()); }\n+(rule__DocItemType__TypeNameAssignment)\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment()); }\n )\n \n ;\n@@ -324,9 +324,9 @@ ruleModelType\n }\n \t:\n (\n-{ before(grammarAccess.getModelTypeAccess().getAlternatives()); }\n-(rule__ModelType__Alternatives)\n-{ after(grammarAccess.getModelTypeAccess().getAlternatives()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameAssignment()); }\n+(rule__ModelType__TypeNameAssignment)\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameAssignment()); }\n )\n \n ;\n@@ -380,9 +380,9 @@ ruleListItemType\n }\n \t:\n (\n-{ before(grammarAccess.getListItemTypeAccess().getAlternatives()); }\n-(rule__ListItemType__Alternatives)\n-{ after(grammarAccess.getListItemTypeAccess().getAlternatives()); }\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameAssignment()); }\n+(rule__ListItemType__TypeNameAssignment)\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameAssignment()); }\n )\n \n ;\n@@ -421,273 +421,273 @@ finally {\n \n \n \n-rule__IntentType__Alternatives\n+rule__IntentType__TypeNameAlternatives_0\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0()); }\n \n \t'basic' \n \n-{ after(grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0()); }\n )\n \n |(\n-{ before(grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1()); }\n \n \t'purpose' \n \n-{ after(grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1()); }\n )\n \n |(\n-{ before(grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2()); }\n \n \t'principles' \n \n-{ after(grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2()); }\n )\n \n |(\n-{ before(grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3()); }\n \n \t'models' \n \n-{ after(grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3()); }\n )\n \n |(\n-{ before(grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4()); }\n \n \t'design' \n \n-{ after(grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4()); }\n )\n \n |(\n-{ before(grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5()); }\n \n \t'implementation' \n \n-{ after(grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5()); }\n )\n \n |(\n-{ before(grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); }\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6()); }\n \n \t'operation' \n \n-{ after(grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); }\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6()); }\n )\n \n ;\n finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__DecompositionType__Alternatives\n+rule__DecompositionType__TypeNameAlternatives_0\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); }\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0()); }\n \n \t'environment' \n \n-{ after(grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); }\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0()); }\n )\n \n |(\n-{ before(grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); }\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1()); }\n \n \t'operator' \n \n-{ after(grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); }\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1()); }\n )\n \n |(\n-{ before(grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); }\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2()); }\n \n \t'system' \n \n-{ after(grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); }\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2()); }\n )\n \n |(\n-{ before(grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); }\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3()); }\n \n \t'verification' \n \n-{ after(grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); }\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3()); }\n )\n \n ;\n finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__DocItemType__Alternatives\n+rule__DocItemType__TypeNameAlternatives_0\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0()); }\n \n \t'condition' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0()); }\n )\n \n |(\n-{ before(grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1()); }\n \n \t'figure' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1()); }\n )\n \n |(\n-{ before(grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2()); }\n \n \t'break' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2()); }\n )\n \n |(\n-{ before(grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3()); }\n \n \t'model' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3()); }\n )\n \n |(\n-{ before(grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4()); }\n \n \t'paragraph' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4()); }\n )\n \n |(\n-{ before(grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5()); }\n \n \t'section' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5()); }\n )\n \n |(\n-{ before(grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); }\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6()); }\n \n \t'table' \n \n-{ after(grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); }\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6()); }\n )\n \n ;\n finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__ModelType__Alternatives\n+rule__ModelType__TypeNameAlternatives_0\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getModelTypeAccess().getOutputKeyword_0()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0()); }\n \n \t'output' \n \n-{ after(grammarAccess.getModelTypeAccess().getOutputKeyword_0()); }\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0()); }\n )\n \n |(\n-{ before(grammarAccess.getModelTypeAccess().getModeKeyword_1()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1()); }\n \n \t'mode' \n \n-{ after(grammarAccess.getModelTypeAccess().getModeKeyword_1()); }\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1()); }\n )\n \n |(\n-{ before(grammarAccess.getModelTypeAccess().getStateKeyword_2()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2()); }\n \n \t'state' \n \n-{ after(grammarAccess.getModelTypeAccess().getStateKeyword_2()); }\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2()); }\n )\n \n |(\n-{ before(grammarAccess.getModelTypeAccess().getMacroKeyword_3()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3()); }\n \n \t'macro' \n \n-{ after(grammarAccess.getModelTypeAccess().getMacroKeyword_3()); }\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3()); }\n )\n \n |(\n-{ before(grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4()); }\n \n \t'function' \n \n-{ after(grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); }\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4()); }\n )\n \n |(\n-{ before(grammarAccess.getModelTypeAccess().getInputKeyword_5()); }\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5()); }\n \n \t'input' \n \n-{ after(grammarAccess.getModelTypeAccess().getInputKeyword_5()); }\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5()); }\n )\n \n ;\n finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__ListItemType__Alternatives\n+rule__ListItemType__TypeNameAlternatives_0\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); }\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0()); }\n \n \t'requirement' \n \n-{ after(grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); }\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0()); }\n )\n \n |(\n-{ before(grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); }\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1()); }\n \n \t'goal' \n \n-{ after(grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); }\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1()); }\n )\n \n |(\n-{ before(grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); }\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2()); }\n \n \t'hazard' \n \n-{ after(grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); }\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2()); }\n )\n \n |(\n-{ before(grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); }\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3()); }\n \n \t'constraint' \n \n-{ after(grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); }\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3()); }\n )\n \n ;\n@@ -746,9 +746,9 @@ rule__Specification__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getSpecificationAccess().getIdAssignment_1()); }\n-(rule__Specification__IdAssignment_1)\n-{ after(grammarAccess.getSpecificationAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getSpecificationAccess().getNameAssignment_1()); }\n+(rule__Specification__NameAssignment_1)\n+{ after(grammarAccess.getSpecificationAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -847,9 +847,9 @@ rule__Refinement__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getRefinementAccess().getIdAssignment_1()); }\n-(rule__Refinement__IdAssignment_1)\n-{ after(grammarAccess.getRefinementAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getRefinementAccess().getNameAssignment_1()); }\n+(rule__Refinement__NameAssignment_1)\n+{ after(grammarAccess.getRefinementAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -977,9 +977,9 @@ rule__Intent__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getIntentAccess().getIdAssignment_1()); }\n-(rule__Intent__IdAssignment_1)\n-{ after(grammarAccess.getIntentAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getIntentAccess().getNameAssignment_1()); }\n+(rule__Intent__NameAssignment_1)\n+{ after(grammarAccess.getIntentAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -1107,9 +1107,9 @@ rule__Decomposition__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getDecompositionAccess().getIdAssignment_1()); }\n-(rule__Decomposition__IdAssignment_1)\n-{ after(grammarAccess.getDecompositionAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getDecompositionAccess().getNameAssignment_1()); }\n+(rule__Decomposition__NameAssignment_1)\n+{ after(grammarAccess.getDecompositionAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -1683,9 +1683,9 @@ rule__DocItem__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getDocItemAccess().getIdAssignment_1()); }\n-(rule__DocItem__IdAssignment_1)\n-{ after(grammarAccess.getDocItemAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getDocItemAccess().getNameAssignment_1()); }\n+(rule__DocItem__NameAssignment_1)\n+{ after(grammarAccess.getDocItemAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -1808,9 +1808,9 @@ rule__ModelItem__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getModelItemAccess().getIdAssignment_1()); }\n-(rule__ModelItem__IdAssignment_1)\n-{ after(grammarAccess.getModelItemAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getModelItemAccess().getNameAssignment_1()); }\n+(rule__ModelItem__NameAssignment_1)\n+{ after(grammarAccess.getModelItemAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -1933,9 +1933,9 @@ rule__ListItem__Group__1__Impl\n }\n :\n (\n-{ before(grammarAccess.getListItemAccess().getIdAssignment_1()); }\n-(rule__ListItem__IdAssignment_1)\n-{ after(grammarAccess.getListItemAccess().getIdAssignment_1()); }\n+{ before(grammarAccess.getListItemAccess().getNameAssignment_1()); }\n+(rule__ListItem__NameAssignment_1)\n+{ after(grammarAccess.getListItemAccess().getNameAssignment_1()); }\n )\n \n ;\n@@ -2153,10 +2153,17 @@ rule__ListItem__Group_3__1__Impl\n }\n :\n (\n+(\n+{ before(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\n+(rule__ListItem__DocReferencesAssignment_3_1)\n+{ after(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\n+)\n+(\n { before(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\n (rule__ListItem__DocReferencesAssignment_3_1)*\n { after(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\n )\n+)\n \n ;\n finally {\n@@ -2249,10 +2256,17 @@ rule__ListItem__Group_4__1__Impl\n }\n :\n (\n+(\n+{ before(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\n+(rule__ListItem__ItemReferencesAssignment_4_1)\n+{ after(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\n+)\n+(\n { before(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\n (rule__ListItem__ItemReferencesAssignment_4_1)*\n { after(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\n )\n+)\n \n ;\n finally {\n@@ -2345,10 +2359,17 @@ rule__ListItem__Group_5__1__Impl\n }\n :\n (\n+(\n+{ before(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\n+(rule__ListItem__ModelReferencesAssignment_5_1)\n+{ after(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\n+)\n+(\n { before(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\n (rule__ListItem__ModelReferencesAssignment_5_1)*\n { after(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\n )\n+)\n \n ;\n finally {\n@@ -2393,14 +2414,14 @@ finally {\n \n \n \n-rule__Specification__IdAssignment_1\n+rule__Specification__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;\n@@ -2423,14 +2444,14 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__Refinement__IdAssignment_1\n+rule__Refinement__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;\n@@ -2483,14 +2504,14 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__Intent__IdAssignment_1\n+rule__Intent__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;\n@@ -2528,6 +2549,22 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n+rule__IntentType__TypeNameAssignment\n+ @init {\n+\t\tint stackSize = keepStackSize();\n+ }\n+:\n+(\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0()); }\n+(rule__IntentType__TypeNameAlternatives_0)\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0()); }\n+)\n+\n+;\n+finally {\n+\trestoreStackSize(stackSize);\n+}\n+\n rule__Decomposition__TypeAssignment_0\n @init {\n \t\tint stackSize = keepStackSize();\n@@ -2543,14 +2580,14 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__Decomposition__IdAssignment_1\n+rule__Decomposition__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;\n@@ -2618,6 +2655,22 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n+rule__DecompositionType__TypeNameAssignment\n+ @init {\n+\t\tint stackSize = keepStackSize();\n+ }\n+:\n+(\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0()); }\n+(rule__DecompositionType__TypeNameAlternatives_0)\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0()); }\n+)\n+\n+;\n+finally {\n+\trestoreStackSize(stackSize);\n+}\n+\n rule__Document__EntriesAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n@@ -2633,6 +2686,22 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n+rule__DocItemType__TypeNameAssignment\n+ @init {\n+\t\tint stackSize = keepStackSize();\n+ }\n+:\n+(\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0()); }\n+(rule__DocItemType__TypeNameAlternatives_0)\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0()); }\n+)\n+\n+;\n+finally {\n+\trestoreStackSize(stackSize);\n+}\n+\n rule__DocItem__TypeAssignment_0\n @init {\n \t\tint stackSize = keepStackSize();\n@@ -2648,14 +2717,14 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__DocItem__IdAssignment_1\n+rule__DocItem__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;\n@@ -2678,6 +2747,22 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n+rule__ModelType__TypeNameAssignment\n+ @init {\n+\t\tint stackSize = keepStackSize();\n+ }\n+:\n+(\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0()); }\n+(rule__ModelType__TypeNameAlternatives_0)\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0()); }\n+)\n+\n+;\n+finally {\n+\trestoreStackSize(stackSize);\n+}\n+\n rule__ModelItem__TypeAssignment_0\n @init {\n \t\tint stackSize = keepStackSize();\n@@ -2693,14 +2778,14 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__ModelItem__IdAssignment_1\n+rule__ModelItem__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;\n@@ -2723,6 +2808,22 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n+rule__ListItemType__TypeNameAssignment\n+ @init {\n+\t\tint stackSize = keepStackSize();\n+ }\n+:\n+(\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0()); }\n+(rule__ListItemType__TypeNameAlternatives_0)\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0()); }\n+)\n+\n+;\n+finally {\n+\trestoreStackSize(stackSize);\n+}\n+\n rule__ListItem__TypeAssignment_0\n @init {\n \t\tint stackSize = keepStackSize();\n@@ -2738,14 +2839,14 @@ finally {\n \trestoreStackSize(stackSize);\n }\n \n-rule__ListItem__IdAssignment_1\n+rule__ListItem__NameAssignment_1\n @init {\n \t\tint stackSize = keepStackSize();\n }\n :\n (\n-{ before(grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); }\n-\tRULE_ID{ after(grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); }\n+{ before(grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); }\n+\tRULE_ID{ after(grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); }\n )\n \n ;","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecification.g","sha":"2f0f83febe026383eed03a5f02b7967fd5fc4101","status":"modified"},{"additions":37,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java","changes":74,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":37,"filename":"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecificationLexer.java","new_code":" // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: ( '^' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: '^'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:10: ( ( '0' .. '9' )+ )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:12: ( '0' .. '9' )+\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:12: ( '0' .. '9' )+\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:13: '0' .. '9'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:24: ( options {greedy=false; } : . )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:52: .\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: ( '\\\\r' )? '\\\\n'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: ( '\\\\r' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: '\\\\r'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2942:16: ( . )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2942:18: .","new_methods":[],"old_code":" // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: ( '^' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: '^'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:10: ( ( '0' .. '9' )+ )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:12: ( '0' .. '9' )+\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:12: ( '0' .. '9' )+\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:13: '0' .. '9'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:24: ( options {greedy=false; } : . )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:52: .\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: ( '\\\\r' )? '\\\\n'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: ( '\\\\r' )?\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: '\\\\r'\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2841:16: ( . )\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2841:18: .","old_methods":[],"patch":"@@ -846,10 +846,10 @@ public final void mRULE_ID() throws RecognitionException {\n try {\n int _type = RULE_ID;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n {\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: ( '^' )?\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: ( '^' )?\n int alt1=2;\n int LA1_0 = input.LA(1);\n \n@@ -858,7 +858,7 @@ public final void mRULE_ID() throws RecognitionException {\n }\n switch (alt1) {\n case 1 :\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: '^'\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: '^'\n {\n match('^'); \n \n@@ -876,7 +876,7 @@ public final void mRULE_ID() throws RecognitionException {\n recover(mse);\n throw mse;}\n \n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n loop2:\n do {\n int alt2=2;\n@@ -925,10 +925,10 @@ public final void mRULE_INT() throws RecognitionException {\n try {\n int _type = RULE_INT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:10: ( ( '0' .. '9' )+ )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:12: ( '0' .. '9' )+\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:10: ( ( '0' .. '9' )+ )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:12: ( '0' .. '9' )+\n {\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:12: ( '0' .. '9' )+\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:12: ( '0' .. '9' )+\n int cnt3=0;\n loop3:\n do {\n@@ -942,7 +942,7 @@ public final void mRULE_INT() throws RecognitionException {\n \n switch (alt3) {\n \tcase 1 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:13: '0' .. '9'\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:13: '0' .. '9'\n \t {\n \t matchRange('0','9'); \n \n@@ -974,10 +974,10 @@ public final void mRULE_STRING() throws RecognitionException {\n try {\n int _type = RULE_STRING;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n {\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n int alt6=2;\n int LA6_0 = input.LA(1);\n \n@@ -995,10 +995,10 @@ else if ( (LA6_0=='\\'') ) {\n }\n switch (alt6) {\n case 1 :\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n {\n match('\\\"'); \n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n loop4:\n do {\n int alt4=3;\n@@ -1014,7 +1014,7 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n \n switch (alt4) {\n \tcase 1 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -1030,7 +1030,7 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1055,10 +1055,10 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n }\n break;\n case 2 :\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n {\n match('\\''); \n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n loop5:\n do {\n int alt5=3;\n@@ -1074,7 +1074,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\n \n switch (alt5) {\n \tcase 1 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -1090,7 +1090,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1133,12 +1133,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_ML_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:19: '/*' ( options {greedy=false; } : . )* '*/'\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:19: '/*' ( options {greedy=false; } : . )* '*/'\n {\n match(\"/*\"); \n \n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:24: ( options {greedy=false; } : . )*\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:24: ( options {greedy=false; } : . )*\n loop7:\n do {\n int alt7=2;\n@@ -1163,7 +1163,7 @@ else if ( ((LA7_0>='\\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\\uFFFF')) ) {\n \n switch (alt7) {\n \tcase 1 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:52: .\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:52: .\n \t {\n \t matchAny(); \n \n@@ -1193,12 +1193,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_SL_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n {\n match(\"//\"); \n \n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n loop8:\n do {\n int alt8=2;\n@@ -1211,7 +1211,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n \n switch (alt8) {\n \tcase 1 :\n- \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n+ \t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='\\t')||(input.LA(1)>='\\u000B' && input.LA(1)<='\\f')||(input.LA(1)>='\\u000E' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1231,7 +1231,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n } while (true);\n \n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:40: ( ( '\\\\r' )? '\\\\n' )?\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:40: ( ( '\\\\r' )? '\\\\n' )?\n int alt10=2;\n int LA10_0 = input.LA(1);\n \n@@ -1240,9 +1240,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt10) {\n case 1 :\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: ( '\\\\r' )? '\\\\n'\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: ( '\\\\r' )? '\\\\n'\n {\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: ( '\\\\r' )?\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: ( '\\\\r' )?\n int alt9=2;\n int LA9_0 = input.LA(1);\n \n@@ -1251,7 +1251,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt9) {\n case 1 :\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: '\\\\r'\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: '\\\\r'\n {\n match('\\r'); \n \n@@ -1283,10 +1283,10 @@ public final void mRULE_WS() throws RecognitionException {\n try {\n int _type = RULE_WS;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n {\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n int cnt11=0;\n loop11:\n do {\n@@ -1340,8 +1340,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\n try {\n int _type = RULE_ANY_OTHER;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2841:16: ( . )\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2841:18: .\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2942:16: ( . )\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2942:18: .\n {\n matchAny(); \n ","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java","sha":"1ea410586be287ba859369930d85590f6df88798","status":"modified"},{"additions":169,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.xtend","changes":181,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.xtend?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":12,"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","new_code":"* NOT generated by Xtext\nimport net.certware.intent.intentSpecification.Decomposition\nimport net.certware.intent.intentSpecification.DocItem\nimport net.certware.intent.intentSpecification.Document\nimport net.certware.intent.intentSpecification.Intent\nimport net.certware.intent.intentSpecification.ListItem\nimport net.certware.intent.intentSpecification.ModelItem\nimport net.certware.intent.intentSpecification.Refinement\nimport net.certware.intent.intentSpecification.Specification\nimport org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider\nimport org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider\nclass IntentSpecificationLabelProvider extends DefaultEObjectLabelProvider {\n\tnew(AdapterFactoryLabelProvider delegate) {\n\tdef image(Refinement e) {\n\t\t'obj16/refinement.gif'\n\t}\n\t\n\tdef image(Intent e) {\n\t\t'obj16/intent.gif'\n\t}\n\t\n\tdef image(Specification e) {\n\t\t'obj16/specification.gif'\n\t}\n\t\n\tdef image(Decomposition e) {\n\t\t'obj16/decomposition.gif'\n\t}\n\t\n\tdef image(Document e) {\n\t\t'obj16/document.gif'\n\t}\n\t\n\tdef image(ModelItem e) {\n\t\t'obj16/modelitem.gif'\n\t}\n\t\n\tdef image(ListItem e) {\n\t\t'obj16/listitem.gif'\n\t}\n\t\n\t/*\n\t * text responses\n\t */\n\tdef text(Intent e) {\n\t\tvar type = e.type\n\t\tvar typeName = type.typeName\n\t\t// \ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\n\t\tif ('basic'.equals(typeName)) {\n\t\t\treturn 'Basic' + ' ' + e.name\n\t\t}\n\t\tif ('purpose'.equals(typeName)) {\n\t\t\treturn 'Purpose' + ' ' + e.name\n\t\t}\n\t\tif ('principles'.equals(typeName)) {\n\t\t\treturn 'Principles' + ' ' + e.name\n\t\t}\n\t\tif ('models'.equals(typeName)) {\n\t\t\treturn 'Models' + ' ' + e.name\n\t\t}\n\t\tif ('design'.equals(typeName)) {\n\t\t\treturn 'Design' + ' ' + e.name\n\t\t}\n\t\tif ('implementation'.equals(typeName)) {\n\t\t\treturn 'Implementation' + ' ' + e.name\n\t\t}\n\t\tif ('operation'.equals(typeName)) {\n\t\t\treturn 'Operation' + ' ' + e.name\n\t\t}\n\t\t'Intent' + ' ' + e.name\n\t}\n\t\n\tdef text(Refinement e) {\n\t\t'Refinement' + ' ' + e.name\n\t}\n\t\n\tdef text(Decomposition e) {\n\t\tvar type = e.type\n\t\tvar typeName = type.typeName\n\t\tif ( 'environment'.equals(typeName)) {\n\t\t\treturn 'Environment' + ' ' + e.name\n\t\t}\n\t\tif ('operator'.equals(typeName)) {\n\t\t\treturn 'Operator' + ' ' + e.name\n\t\t}\n\t\tif ('system'.equals(typeName)) {\n\t\t\treturn 'System' + ' ' + e.name\n\t\t}\n\t\tif ('verification'.equals(typeName)) {\n\t\t\treturn 'V&V' + ' ' + e.name\n\t\t}\n\t\t'Decomposition' + ' ' + e.name\n\t}\n\n\tdef text(Document e) {\n\t\t'Document' // has no name or ID\n\t}\n\t\n\tdef text(DocItem e) {\n\t\tvar type = e.type\n\t\tvar typeName = type.typeName\n\t\tif ('condition'.equals(typeName)) {\n\t\t\treturn 'Condition' + ' ' + e.name\n\t\t}\n\t\tif ('figure'.equals(typeName)) {\n\t\t\treturn 'Figure' + ' ' + e.name\n\t\t}\n\t\tif ('break'.equals(typeName)) {\n\t\t\treturn 'Break'\n\t\t}\n\t\tif ('model'.equals(typeName)) {\n\t\t\treturn 'Model' + ' ' + e.name\n\t\t}\n\t\tif ('paragraph'.equals(typeName)) {\n\t\t\treturn 'Paragraph' + ' ' + e.name\n\t\t}\n\t\tif ('section'.equals(typeName)) {\n\t\t\treturn 'Section' + ' ' + e.name\n\t\t}\n\t\tif ('table'.equals(typeName)) {\n\t\t\treturn 'Table' + ' ' + e.name\n\t\t}\n\n\t\t'Item' + ' ' + e.name\t\t\n\t}\n\t\n\t\n\tdef text(ModelItem e) {\n\t\tvar type = e.type\n\t\tvar typeName = type.typeName\n\t\t\n\t\tif ('output'.equals(typeName)){\n\t\t\treturn 'Output' + ' ' + e.name\n\t\t}\n\t\tif ('mode'.equals(typeName)){\n\t\t\treturn 'Mode' + ' ' + e.name\n\t\t}\n\t\tif ('state'.equals(typeName)) {\n\t\t\treturn 'State' + ' ' + e.name\n\t\t}\n\t\tif ('macro'.equals(typeName)) {\n\t\t\treturn 'Macro' + ' ' + e.name\n\t\t}\n\t\tif ('function'.equals(typeName)) {\n\t\t\treturn 'Function' + ' ' + e.name\n\t\t}\n\t\tif ('input'.equals(typeName)) {\n\t\t\treturn 'Input' + ' ' + e.name\n\t\t}\n\t\t'Model' + ' ' + e.name\n\t}\n\t\n\tdef text(ListItem e) {\n\t\tvar type = e.type\n\t\t\n\t\tif ('hazard'.equals(type.typeName)) {\n\t\t\treturn 'Hazard' + ' ' + e.name\n\t\t}\n\t\tif ('requirement'.equals(type.typeName)) {\n\t\t\treturn 'Requirement' + ' ' + e.name\n\t\t}\n\t\tif ('goal'.equals(type.typeName)) {\n\t\t\treturn 'Goal' + ' ' + e.name\n\t\t} \n\t\tif ('constraint'.equals(type.typeName)) {\n\t\t\treturn 'Constraint' + ' ' + e.name\t\t\t\n\t\t}\n\t\t'List' + ' ' + e.name\n\t}","new_methods":[{"arguments":["Refinement e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"'obj16/refinement.gif'","signature":"def image(Refinement e)"},{"arguments":["Intent e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"'obj16/intent.gif'","signature":"def image(Intent e)"},{"arguments":["Specification e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"'obj16/specification.gif'","signature":"def image(Specification e)"},{"arguments":["Decomposition e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"'obj16/decomposition.gif'","signature":"def image(Decomposition e)"},{"arguments":["Document e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"'obj16/document.gif'","signature":"def image(Document e)"},{"arguments":["ModelItem e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"'obj16/modelitem.gif'","signature":"def image(ModelItem e)"},{"arguments":["ListItem e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"'obj16/listitem.gif'","signature":"def image(ListItem e)"},{"arguments":["Intent e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"var type = e.type\n\t\tvar typeName = type.typeName\n\t\t// \ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\n\t\tif ('basic'.equals(typeName)) {\n\t\t\treturn 'Basic' + ' ' + e.name","signature":"def text(Intent e)"},{"arguments":["Refinement e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"'Refinement' + ' ' + e.name","signature":"def text(Refinement e)"},{"arguments":["Decomposition e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"var type = e.type\n\t\tvar typeName = type.typeName\n\t\tif ( 'environment'.equals(typeName)) {\n\t\t\treturn 'Environment' + ' ' + e.name","signature":"def text(Decomposition e)"},{"arguments":["Document e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"'Document' // has no name or ID","signature":"def text(Document e)"},{"arguments":["DocItem e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"var type = e.type\n\t\tvar typeName = type.typeName\n\t\tif ('condition'.equals(typeName)) {\n\t\t\treturn 'Condition' + ' ' + e.name","signature":"def text(DocItem e)"},{"arguments":["ModelItem e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"var type = e.type\n\t\tvar typeName = type.typeName\n\t\t\n\t\tif ('output'.equals(typeName)){\n\t\t\treturn 'Output' + ' ' + e.name","signature":"def text(ModelItem e)"},{"arguments":["ListItem e"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"var type = e.type\n\t\t\n\t\tif ('hazard'.equals(type.typeName)) {\n\t\t\treturn 'Hazard' + ' ' + e.name","signature":"def text(ListItem e)"}],"old_code":"* generated by Xtext\nclass IntentSpecificationLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider {\n\tnew(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) {\n\t// Labels and icons can be computed like this:\n\t\n//\tdef text(Greeting ele) {\n//\t\t'A greeting to ' + ele.name\n//\t}\n//\n//\tdef image(Greeting ele) {\n//\t\t'Greeting.gif'\n//\t}","old_methods":[{"arguments":["Greeting ele"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"//\t\t'A greeting to ' + ele.name\n//","signature":"def text(Greeting ele)"},{"arguments":["Greeting ele"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend","implementation":"//\t\t'Greeting.gif'\n//","signature":"def image(Greeting ele)"}],"patch":"@@ -1,29 +1,186 @@\n /*\n-* generated by Xtext\n+* NOT generated by Xtext\n */\n package net.certware.intent.ui.labeling\n \n import com.google.inject.Inject\n+import net.certware.intent.intentSpecification.Decomposition\n+import net.certware.intent.intentSpecification.DocItem\n+import net.certware.intent.intentSpecification.Document\n+import net.certware.intent.intentSpecification.Intent\n+import net.certware.intent.intentSpecification.ListItem\n+import net.certware.intent.intentSpecification.ModelItem\n+import net.certware.intent.intentSpecification.Refinement\n+import net.certware.intent.intentSpecification.Specification\n+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider\n+import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider\n \n /**\n * Provides labels for a EObjects.\n * \n * see http://www.eclipse.org/Xtext/documentation.html#labelProvider\n */\n-class IntentSpecificationLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider {\n+class IntentSpecificationLabelProvider extends DefaultEObjectLabelProvider {\n \n \t@Inject\n-\tnew(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) {\n+\tnew(AdapterFactoryLabelProvider delegate) {\n \t\tsuper(delegate);\n \t}\n \n-\t// Labels and icons can be computed like this:\n-\t\n-//\tdef text(Greeting ele) {\n-//\t\t'A greeting to ' + ele.name\n-//\t}\n-//\n-//\tdef image(Greeting ele) {\n-//\t\t'Greeting.gif'\n-//\t}\n+\tdef image(Refinement e) {\n+\t\t'obj16/refinement.gif'\n+\t}\n+\t\n+\tdef image(Intent e) {\n+\t\t'obj16/intent.gif'\n+\t}\n+\t\n+\tdef image(Specification e) {\n+\t\t'obj16/specification.gif'\n+\t}\n+\t\n+\tdef image(Decomposition e) {\n+\t\t'obj16/decomposition.gif'\n+\t}\n+\t\n+\tdef image(Document e) {\n+\t\t'obj16/document.gif'\n+\t}\n+\t\n+\tdef image(ModelItem e) {\n+\t\t'obj16/modelitem.gif'\n+\t}\n+\t\n+\tdef image(ListItem e) {\n+\t\t'obj16/listitem.gif'\n+\t}\n+\t\n+\t/*\n+\t * text responses\n+\t */\n+\tdef text(Intent e) {\n+\t\tvar type = e.type\n+\t\tvar typeName = type.typeName\n+\t\t// \ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\n+\t\tif ('basic'.equals(typeName)) {\n+\t\t\treturn 'Basic' + ' ' + e.name\n+\t\t}\n+\t\tif ('purpose'.equals(typeName)) {\n+\t\t\treturn 'Purpose' + ' ' + e.name\n+\t\t}\n+\t\tif ('principles'.equals(typeName)) {\n+\t\t\treturn 'Principles' + ' ' + e.name\n+\t\t}\n+\t\tif ('models'.equals(typeName)) {\n+\t\t\treturn 'Models' + ' ' + e.name\n+\t\t}\n+\t\tif ('design'.equals(typeName)) {\n+\t\t\treturn 'Design' + ' ' + e.name\n+\t\t}\n+\t\tif ('implementation'.equals(typeName)) {\n+\t\t\treturn 'Implementation' + ' ' + e.name\n+\t\t}\n+\t\tif ('operation'.equals(typeName)) {\n+\t\t\treturn 'Operation' + ' ' + e.name\n+\t\t}\n+\t\t'Intent' + ' ' + e.name\n+\t}\n+\t\n+\tdef text(Refinement e) {\n+\t\t'Refinement' + ' ' + e.name\n+\t}\n+\t\n+\tdef text(Decomposition e) {\n+\t\tvar type = e.type\n+\t\tvar typeName = type.typeName\n+\t\tif ( 'environment'.equals(typeName)) {\n+\t\t\treturn 'Environment' + ' ' + e.name\n+\t\t}\n+\t\tif ('operator'.equals(typeName)) {\n+\t\t\treturn 'Operator' + ' ' + e.name\n+\t\t}\n+\t\tif ('system'.equals(typeName)) {\n+\t\t\treturn 'System' + ' ' + e.name\n+\t\t}\n+\t\tif ('verification'.equals(typeName)) {\n+\t\t\treturn 'V&V' + ' ' + e.name\n+\t\t}\n+\t\t'Decomposition' + ' ' + e.name\n+\t}\n+\n+\tdef text(Document e) {\n+\t\t'Document' // has no name or ID\n+\t}\n+\t\n+\tdef text(DocItem e) {\n+\t\tvar type = e.type\n+\t\tvar typeName = type.typeName\n+\t\tif ('condition'.equals(typeName)) {\n+\t\t\treturn 'Condition' + ' ' + e.name\n+\t\t}\n+\t\tif ('figure'.equals(typeName)) {\n+\t\t\treturn 'Figure' + ' ' + e.name\n+\t\t}\n+\t\tif ('break'.equals(typeName)) {\n+\t\t\treturn 'Break'\n+\t\t}\n+\t\tif ('model'.equals(typeName)) {\n+\t\t\treturn 'Model' + ' ' + e.name\n+\t\t}\n+\t\tif ('paragraph'.equals(typeName)) {\n+\t\t\treturn 'Paragraph' + ' ' + e.name\n+\t\t}\n+\t\tif ('section'.equals(typeName)) {\n+\t\t\treturn 'Section' + ' ' + e.name\n+\t\t}\n+\t\tif ('table'.equals(typeName)) {\n+\t\t\treturn 'Table' + ' ' + e.name\n+\t\t}\n+\n+\t\t'Item' + ' ' + e.name\t\t\n+\t}\n+\t\n+\t\n+\tdef text(ModelItem e) {\n+\t\tvar type = e.type\n+\t\tvar typeName = type.typeName\n+\t\t\n+\t\tif ('output'.equals(typeName)){\n+\t\t\treturn 'Output' + ' ' + e.name\n+\t\t}\n+\t\tif ('mode'.equals(typeName)){\n+\t\t\treturn 'Mode' + ' ' + e.name\n+\t\t}\n+\t\tif ('state'.equals(typeName)) {\n+\t\t\treturn 'State' + ' ' + e.name\n+\t\t}\n+\t\tif ('macro'.equals(typeName)) {\n+\t\t\treturn 'Macro' + ' ' + e.name\n+\t\t}\n+\t\tif ('function'.equals(typeName)) {\n+\t\t\treturn 'Function' + ' ' + e.name\n+\t\t}\n+\t\tif ('input'.equals(typeName)) {\n+\t\t\treturn 'Input' + ' ' + e.name\n+\t\t}\n+\t\t'Model' + ' ' + e.name\n+\t}\n+\t\n+\tdef text(ListItem e) {\n+\t\tvar type = e.type\n+\t\t\n+\t\tif ('hazard'.equals(type.typeName)) {\n+\t\t\treturn 'Hazard' + ' ' + e.name\n+\t\t}\n+\t\tif ('requirement'.equals(type.typeName)) {\n+\t\t\treturn 'Requirement' + ' ' + e.name\n+\t\t}\n+\t\tif ('goal'.equals(type.typeName)) {\n+\t\t\treturn 'Goal' + ' ' + e.name\n+\t\t} \n+\t\tif ('constraint'.equals(type.typeName)) {\n+\t\t\treturn 'Constraint' + ' ' + e.name\t\t\t\n+\t\t}\n+\t\t'List' + ' ' + e.name\n+\t}\n }","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.xtend","sha":"db5092061520be3b76f11f66af4d236ba42900e9","status":"modified"},{"additions":131,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.xtend","changes":139,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.xtend?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":8,"filename":"net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend","new_code":" * NOT generated by Xtext\n */\nimport net.certware.intent.intentSpecification.Decomposition\nimport net.certware.intent.intentSpecification.Intent\nimport net.certware.intent.intentSpecification.ListItem\nimport net.certware.intent.intentSpecification.ModelItem\nimport net.certware.intent.intentSpecification.Refinement\nimport net.certware.intent.validation.IntentSpecificationValidator\nimport org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider\nimport org.eclipse.xtext.ui.editor.quickfix.Fix\nimport org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor\nimport org.eclipse.xtext.validation.Issue\n * @see http://www.eclipse.org/Xtext/documentation.html#quickfixes\n * @author mrb@certware.net\nclass IntentSpecificationQuickfixProvider extends DefaultQuickfixProvider {\n\t\n\t/*\n\t * Fix duplicated intent entries by removing one.\n\t */\n\t@Fix(IntentSpecificationValidator::UNIQUE_INTENTS_REFINEMENT)\n\tdef removeIntent(Issue issue, IssueResolutionAcceptor acceptor) {\n\t\tacceptor.accept(issue,\n\t\t\t\"Remove duplicated entry\", // label\n\t\t\t\"Remove intent named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/intent.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar container = element as Refinement\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = container.intents\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as Intent\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next()\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t\n\t\t\t\tif (lastItem != null ) {\n\t\t\t\t\tlist.remove(lastItem)\n\t\t\t\t}\n\t\t\t]\n\t\t);\n\t}\n\n\t/*\n\t * Fix duplicated intent entries by removing one.\n\t */\n\t@Fix(IntentSpecificationValidator::UNIQUE_DECOMPOSITION_INTENT)\n\tdef removeDecomposition(Issue issue, IssueResolutionAcceptor acceptor) {\n\t\tacceptor.accept(issue,\n\t\t\t\"Remove duplicated decomposition\", // label\n\t\t\t\"Remove decomposition named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/decomposition.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar container = element as Intent\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = container.decompositions\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as Decomposition\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next() as Decomposition\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t\n\t\t\t\tif (lastItem != null ) {\n\t\t\t\t\tlist.remove(lastItem)\n\t\t\t\t}\n\t\t\t]\n\t\t);\n\t}\n\t/*\n\t * Fix duplicated list entries by removing one.\n\t */\n\t@Fix(IntentSpecificationValidator::UNIQUE_LIST_ITEM_LIST_ITEM)\n\tdef removeListItem(Issue issue, IssueResolutionAcceptor acceptor) {\n\t\tacceptor.accept(issue,\n\t\t\t\"Remove duplicated list item\", // label\n\t\t\t\"Remove list item named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/listitem.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar outerList = element as ListItem\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = outerList.itemReferences\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as ListItem\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next()\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t\n\t\t\t\tif (lastItem != null ) {\n\t\t\t\t\tlist.remove(lastItem)\n\t\t\t\t}\n\t\t\t]\n\t\t);\n\t}\n\t\n\t@Fix(IntentSpecificationValidator::UNIQUE_MODEL_ITEM_LIST_ITEM)\n\tdef removeModelItem(Issue issue, IssueResolutionAcceptor acceptor) {\n\t\tacceptor.accept(issue,\n\t\t\t\"Remove duplicated entry\", // label\n\t\t\t\"Remove model item named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/modelitem.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar outerList = element as ListItem\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = outerList.modelReferences\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as ModelItem\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next()\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t\t\n\t\t\t\tif (lastItem != null ) {\n\t\t\t\t\tlist.remove(lastItem)\n\t\t\t\t}\n\t\t\t]\n\t\t);\n\t}","new_methods":[{"arguments":["Issue issue"," IssueResolutionAcceptor acceptor"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend","implementation":"acceptor.accept(issue,\n\t\t\t\"Remove duplicated entry\", // label\n\t\t\t\"Remove intent named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/intent.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar container = element as Refinement\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = container.intents\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as Intent\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next()\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item","signature":"def removeIntent(Issue issue, IssueResolutionAcceptor acceptor)"},{"arguments":["Issue issue"," IssueResolutionAcceptor acceptor"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend","implementation":"acceptor.accept(issue,\n\t\t\t\"Remove duplicated decomposition\", // label\n\t\t\t\"Remove decomposition named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/decomposition.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar container = element as Intent\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = container.decompositions\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as Decomposition\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next() as Decomposition\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item","signature":"def removeDecomposition(Issue issue, IssueResolutionAcceptor acceptor)"},{"arguments":["Issue issue"," IssueResolutionAcceptor acceptor"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend","implementation":"acceptor.accept(issue,\n\t\t\t\"Remove duplicated list item\", // label\n\t\t\t\"Remove list item named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/listitem.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar outerList = element as ListItem\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = outerList.itemReferences\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as ListItem\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next()\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item","signature":"def removeListItem(Issue issue, IssueResolutionAcceptor acceptor)"},{"arguments":["Issue issue"," IssueResolutionAcceptor acceptor"],"filename":"net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend","implementation":"acceptor.accept(issue,\n\t\t\t\"Remove duplicated entry\", // label\n\t\t\t\"Remove model item named\" + ' ' + issue.data.get(0), // description\n\t\t\t\"obj16/modelitem.gif\", // icon\n\t\t\t[\n\t\t\t\telement, context |\n\t\t\t\tvar outerList = element as ListItem\n\t\t\t\tvar itemName = issue.data.get(0) as String\n\t\t\t\tvar list = outerList.modelReferences\n\t\t\t\tvar iter = list.iterator\n\t\t\t\tvar lastItem = null as ModelItem\n\t\t\t\twhile(iter.hasNext) {\n\t\t\t\t\tvar item = iter.next()\n\t\t\t\t\tif ( item.name.equals(itemName)) {\n\t\t\t\t\t\tlastItem = item","signature":"def removeModelItem(Issue issue, IssueResolutionAcceptor acceptor)"}],"old_code":"* generated by Xtext\n*/\n//import org.eclipse.xtext.ui.editor.quickfix.Fix\n//import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor\n//import org.eclipse.xtext.validation.Issue\n *\n * see http://www.eclipse.org/Xtext/documentation.html#quickfixes\nclass IntentSpecificationQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {","old_methods":[],"patch":"@@ -1,18 +1,141 @@\n /*\n-* generated by Xtext\n-*/\n+ * NOT generated by Xtext\n+ */\n package net.certware.intent.ui.quickfix\n \n-//import org.eclipse.xtext.ui.editor.quickfix.Fix\n-//import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor\n-//import org.eclipse.xtext.validation.Issue\n+import net.certware.intent.intentSpecification.Decomposition\n+import net.certware.intent.intentSpecification.Intent\n+import net.certware.intent.intentSpecification.ListItem\n+import net.certware.intent.intentSpecification.ModelItem\n+import net.certware.intent.intentSpecification.Refinement\n+import net.certware.intent.validation.IntentSpecificationValidator\n+import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider\n+import org.eclipse.xtext.ui.editor.quickfix.Fix\n+import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor\n+import org.eclipse.xtext.validation.Issue\n \n /**\n * Custom quickfixes.\n- *\n- * see http://www.eclipse.org/Xtext/documentation.html#quickfixes\n+ * @see http://www.eclipse.org/Xtext/documentation.html#quickfixes\n+ * @author mrb@certware.net\n */\n-class IntentSpecificationQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {\n+class IntentSpecificationQuickfixProvider extends DefaultQuickfixProvider {\n+\t\n+\t/*\n+\t * Fix duplicated intent entries by removing one.\n+\t */\n+\t@Fix(IntentSpecificationValidator::UNIQUE_INTENTS_REFINEMENT)\n+\tdef removeIntent(Issue issue, IssueResolutionAcceptor acceptor) {\n+\t\tacceptor.accept(issue,\n+\t\t\t\"Remove duplicated entry\", // label\n+\t\t\t\"Remove intent named\" + ' ' + issue.data.get(0), // description\n+\t\t\t\"obj16/intent.gif\", // icon\n+\t\t\t[\n+\t\t\t\telement, context |\n+\t\t\t\tvar container = element as Refinement\n+\t\t\t\tvar itemName = issue.data.get(0) as String\n+\t\t\t\tvar list = container.intents\n+\t\t\t\tvar iter = list.iterator\n+\t\t\t\tvar lastItem = null as Intent\n+\t\t\t\twhile(iter.hasNext) {\n+\t\t\t\t\tvar item = iter.next()\n+\t\t\t\t\tif ( item.name.equals(itemName)) {\n+\t\t\t\t\t\tlastItem = item\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\tif (lastItem != null ) {\n+\t\t\t\t\tlist.remove(lastItem)\n+\t\t\t\t}\n+\t\t\t]\n+\t\t);\n+\t}\n+\n+\t/*\n+\t * Fix duplicated intent entries by removing one.\n+\t */\n+\t@Fix(IntentSpecificationValidator::UNIQUE_DECOMPOSITION_INTENT)\n+\tdef removeDecomposition(Issue issue, IssueResolutionAcceptor acceptor) {\n+\t\tacceptor.accept(issue,\n+\t\t\t\"Remove duplicated decomposition\", // label\n+\t\t\t\"Remove decomposition named\" + ' ' + issue.data.get(0), // description\n+\t\t\t\"obj16/decomposition.gif\", // icon\n+\t\t\t[\n+\t\t\t\telement, context |\n+\t\t\t\tvar container = element as Intent\n+\t\t\t\tvar itemName = issue.data.get(0) as String\n+\t\t\t\tvar list = container.decompositions\n+\t\t\t\tvar iter = list.iterator\n+\t\t\t\tvar lastItem = null as Decomposition\n+\t\t\t\twhile(iter.hasNext) {\n+\t\t\t\t\tvar item = iter.next() as Decomposition\n+\t\t\t\t\tif ( item.name.equals(itemName)) {\n+\t\t\t\t\t\tlastItem = item\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\tif (lastItem != null ) {\n+\t\t\t\t\tlist.remove(lastItem)\n+\t\t\t\t}\n+\t\t\t]\n+\t\t);\n+\t}\n+\t/*\n+\t * Fix duplicated list entries by removing one.\n+\t */\n+\t@Fix(IntentSpecificationValidator::UNIQUE_LIST_ITEM_LIST_ITEM)\n+\tdef removeListItem(Issue issue, IssueResolutionAcceptor acceptor) {\n+\t\tacceptor.accept(issue,\n+\t\t\t\"Remove duplicated list item\", // label\n+\t\t\t\"Remove list item named\" + ' ' + issue.data.get(0), // description\n+\t\t\t\"obj16/listitem.gif\", // icon\n+\t\t\t[\n+\t\t\t\telement, context |\n+\t\t\t\tvar outerList = element as ListItem\n+\t\t\t\tvar itemName = issue.data.get(0) as String\n+\t\t\t\tvar list = outerList.itemReferences\n+\t\t\t\tvar iter = list.iterator\n+\t\t\t\tvar lastItem = null as ListItem\n+\t\t\t\twhile(iter.hasNext) {\n+\t\t\t\t\tvar item = iter.next()\n+\t\t\t\t\tif ( item.name.equals(itemName)) {\n+\t\t\t\t\t\tlastItem = item\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\tif (lastItem != null ) {\n+\t\t\t\t\tlist.remove(lastItem)\n+\t\t\t\t}\n+\t\t\t]\n+\t\t);\n+\t}\n+\t\n+\t@Fix(IntentSpecificationValidator::UNIQUE_MODEL_ITEM_LIST_ITEM)\n+\tdef removeModelItem(Issue issue, IssueResolutionAcceptor acceptor) {\n+\t\tacceptor.accept(issue,\n+\t\t\t\"Remove duplicated entry\", // label\n+\t\t\t\"Remove model item named\" + ' ' + issue.data.get(0), // description\n+\t\t\t\"obj16/modelitem.gif\", // icon\n+\t\t\t[\n+\t\t\t\telement, context |\n+\t\t\t\tvar outerList = element as ListItem\n+\t\t\t\tvar itemName = issue.data.get(0) as String\n+\t\t\t\tvar list = outerList.modelReferences\n+\t\t\t\tvar iter = list.iterator\n+\t\t\t\tvar lastItem = null as ModelItem\n+\t\t\t\twhile(iter.hasNext) {\n+\t\t\t\t\tvar item = iter.next()\n+\t\t\t\t\tif ( item.name.equals(itemName)) {\n+\t\t\t\t\t\tlastItem = item\n+\t\t\t\t\t}\n+\t\t\t\t}\n+\t\t\t\t\n+\t\t\t\tif (lastItem != null ) {\n+\t\t\t\t\tlist.remove(lastItem)\n+\t\t\t\t}\n+\t\t\t]\n+\t\t);\n+\t}\n \n //\t@Fix(MyDslValidator::INVALID_NAME)\n //\tdef capitalizeName(Issue issue, IssueResolutionAcceptor acceptor) {","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.xtend","sha":"44be548a658b3731af7b97c3654097721a89d19f","status":"modified"},{"additions":1,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fwizard%2FIntentSpecificationNewProject.xpt","changes":2,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fwizard%2FIntentSpecificationNewProject.xpt?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":1,"filename":"net.certware.intent.ui/src/net/certware/intent/ui/wizard/IntentSpecificationNewProject.xpt","new_code":"«FILE \"src/model/Model.intent\"-»","new_methods":[],"old_code":"«FILE \"src/model/Model.intentspecification\"-»","old_methods":[],"patch":"@@ -6,7 +6,7 @@\n «ENDDEFINE»\n \n «DEFINE model FOR IntentSpecificationProjectInfo»\n-«FILE \"src/model/Model.intentspecification\"-»\n+«FILE \"src/model/Model.intent\"-»\n /*\n * This is an example model\n */","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fwizard%2FIntentSpecificationNewProject.xpt","sha":"564de2e356a15c25618cd9ebb9667822f7ef6c19","status":"modified"},{"additions":290,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.java","changes":291,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":1,"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","new_code":" * NOT generated by Xtext\nimport net.certware.intent.intentSpecification.Decomposition;\nimport net.certware.intent.intentSpecification.DecompositionType;\nimport net.certware.intent.intentSpecification.DocItem;\nimport net.certware.intent.intentSpecification.DocItemType;\nimport net.certware.intent.intentSpecification.Document;\nimport net.certware.intent.intentSpecification.Intent;\nimport net.certware.intent.intentSpecification.IntentType;\nimport net.certware.intent.intentSpecification.ListItem;\nimport net.certware.intent.intentSpecification.ListItemType;\nimport net.certware.intent.intentSpecification.ModelItem;\nimport net.certware.intent.intentSpecification.ModelType;\nimport net.certware.intent.intentSpecification.Refinement;\nimport net.certware.intent.intentSpecification.Specification;\n \n public String image(final Refinement e) {\n return \"obj16/refinement.gif\";\n }\n \n public String image(final Intent e) {\n return \"obj16/intent.gif\";\n }\n \n public String image(final Specification e) {\n return \"obj16/specification.gif\";\n }\n \n public String image(final Decomposition e) {\n return \"obj16/decomposition.gif\";\n }\n \n public String image(final Document e) {\n return \"obj16/document.gif\";\n }\n \n public String image(final ModelItem e) {\n return \"obj16/modelitem.gif\";\n }\n \n public String image(final ListItem e) {\n return \"obj16/listitem.gif\";\n }\n \n /**\n * text responses\n */\n public String text(final Intent e) {\n String _xblockexpression = null;\n {\n IntentType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"basic\".equals(typeName);\n if (_equals) {\n String _plus = (\"Basic\" + \" \");\n String _name = e.getName();\n return (_plus + _name);\n }\n boolean _equals_1 = \"purpose\".equals(typeName);\n if (_equals_1) {\n String _plus_1 = (\"Purpose\" + \" \");\n String _name_1 = e.getName();\n return (_plus_1 + _name_1);\n }\n boolean _equals_2 = \"principles\".equals(typeName);\n if (_equals_2) {\n String _plus_2 = (\"Principles\" + \" \");\n String _name_2 = e.getName();\n return (_plus_2 + _name_2);\n }\n boolean _equals_3 = \"models\".equals(typeName);\n if (_equals_3) {\n String _plus_3 = (\"Models\" + \" \");\n String _name_3 = e.getName();\n return (_plus_3 + _name_3);\n }\n boolean _equals_4 = \"design\".equals(typeName);\n if (_equals_4) {\n String _plus_4 = (\"Design\" + \" \");\n String _name_4 = e.getName();\n return (_plus_4 + _name_4);\n }\n boolean _equals_5 = \"implementation\".equals(typeName);\n if (_equals_5) {\n String _plus_5 = (\"Implementation\" + \" \");\n String _name_5 = e.getName();\n return (_plus_5 + _name_5);\n }\n boolean _equals_6 = \"operation\".equals(typeName);\n if (_equals_6) {\n String _plus_6 = (\"Operation\" + \" \");\n String _name_6 = e.getName();\n return (_plus_6 + _name_6);\n }\n String _plus_7 = (\"Intent\" + \" \");\n String _name_7 = e.getName();\n String _plus_8 = (_plus_7 + _name_7);\n _xblockexpression = (_plus_8);\n }\n return _xblockexpression;\n }\n \n public String text(final Refinement e) {\n String _plus = (\"Refinement\" + \" \");\n String _name = e.getName();\n String _plus_1 = (_plus + _name);\n return _plus_1;\n }\n \n public String text(final Decomposition e) {\n String _xblockexpression = null;\n {\n DecompositionType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"environment\".equals(typeName);\n if (_equals) {\n String _plus = (\"Environment\" + \" \");\n String _name = e.getName();\n return (_plus + _name);\n }\n boolean _equals_1 = \"operator\".equals(typeName);\n if (_equals_1) {\n String _plus_1 = (\"Operator\" + \" \");\n String _name_1 = e.getName();\n return (_plus_1 + _name_1);\n }\n boolean _equals_2 = \"system\".equals(typeName);\n if (_equals_2) {\n String _plus_2 = (\"System\" + \" \");\n String _name_2 = e.getName();\n return (_plus_2 + _name_2);\n }\n boolean _equals_3 = \"verification\".equals(typeName);\n if (_equals_3) {\n String _plus_3 = (\"V&V\" + \" \");\n String _name_3 = e.getName();\n return (_plus_3 + _name_3);\n }\n String _plus_4 = (\"Decomposition\" + \" \");\n String _name_4 = e.getName();\n String _plus_5 = (_plus_4 + _name_4);\n _xblockexpression = (_plus_5);\n }\n return _xblockexpression;\n }\n \n public String text(final Document e) {\n return \"Document\";\n }\n \n public String text(final DocItem e) {\n String _xblockexpression = null;\n {\n DocItemType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"condition\".equals(typeName);\n if (_equals) {\n String _plus = (\"Condition\" + \" \");\n String _name = e.getName();\n return (_plus + _name);\n }\n boolean _equals_1 = \"figure\".equals(typeName);\n if (_equals_1) {\n String _plus_1 = (\"Figure\" + \" \");\n String _name_1 = e.getName();\n return (_plus_1 + _name_1);\n }\n boolean _equals_2 = \"break\".equals(typeName);\n if (_equals_2) {\n return \"Break\";\n }\n boolean _equals_3 = \"model\".equals(typeName);\n if (_equals_3) {\n String _plus_2 = (\"Model\" + \" \");\n String _name_2 = e.getName();\n return (_plus_2 + _name_2);\n }\n boolean _equals_4 = \"paragraph\".equals(typeName);\n if (_equals_4) {\n String _plus_3 = (\"Paragraph\" + \" \");\n String _name_3 = e.getName();\n return (_plus_3 + _name_3);\n }\n boolean _equals_5 = \"section\".equals(typeName);\n if (_equals_5) {\n String _plus_4 = (\"Section\" + \" \");\n String _name_4 = e.getName();\n return (_plus_4 + _name_4);\n }\n boolean _equals_6 = \"table\".equals(typeName);\n if (_equals_6) {\n String _plus_5 = (\"Table\" + \" \");\n String _name_5 = e.getName();\n return (_plus_5 + _name_5);\n }\n String _plus_6 = (\"Item\" + \" \");\n String _name_6 = e.getName();\n String _plus_7 = (_plus_6 + _name_6);\n _xblockexpression = (_plus_7);\n }\n return _xblockexpression;\n }\n \n public String text(final ModelItem e) {\n String _xblockexpression = null;\n {\n ModelType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"output\".equals(typeName);\n if (_equals) {\n String _plus = (\"Output\" + \" \");\n String _name = e.getName();\n return (_plus + _name);\n }\n boolean _equals_1 = \"mode\".equals(typeName);\n if (_equals_1) {\n String _plus_1 = (\"Mode\" + \" \");\n String _name_1 = e.getName();\n return (_plus_1 + _name_1);\n }\n boolean _equals_2 = \"state\".equals(typeName);\n if (_equals_2) {\n String _plus_2 = (\"State\" + \" \");\n String _name_2 = e.getName();\n return (_plus_2 + _name_2);\n }\n boolean _equals_3 = \"macro\".equals(typeName);\n if (_equals_3) {\n String _plus_3 = (\"Macro\" + \" \");\n String _name_3 = e.getName();\n return (_plus_3 + _name_3);\n }\n boolean _equals_4 = \"function\".equals(typeName);\n if (_equals_4) {\n String _plus_4 = (\"Function\" + \" \");\n String _name_4 = e.getName();\n return (_plus_4 + _name_4);\n }\n boolean _equals_5 = \"input\".equals(typeName);\n if (_equals_5) {\n String _plus_5 = (\"Input\" + \" \");\n String _name_5 = e.getName();\n return (_plus_5 + _name_5);\n }\n String _plus_6 = (\"Model\" + \" \");\n String _name_6 = e.getName();\n String _plus_7 = (_plus_6 + _name_6);\n _xblockexpression = (_plus_7);\n }\n return _xblockexpression;\n }\n \n public String text(final ListItem e) {\n String _xblockexpression = null;\n {\n ListItemType type = e.getType();\n String _typeName = type.getTypeName();\n boolean _equals = \"hazard\".equals(_typeName);\n if (_equals) {\n String _plus = (\"Hazard\" + \" \");\n String _name = e.getName();\n return (_plus + _name);\n }\n String _typeName_1 = type.getTypeName();\n boolean _equals_1 = \"requirement\".equals(_typeName_1);\n if (_equals_1) {\n String _plus_1 = (\"Requirement\" + \" \");\n String _name_1 = e.getName();\n return (_plus_1 + _name_1);\n }\n String _typeName_2 = type.getTypeName();\n boolean _equals_2 = \"goal\".equals(_typeName_2);\n if (_equals_2) {\n String _plus_2 = (\"Goal\" + \" \");\n String _name_2 = e.getName();\n return (_plus_2 + _name_2);\n }\n String _typeName_3 = type.getTypeName();\n boolean _equals_3 = \"constraint\".equals(_typeName_3);\n if (_equals_3) {\n String _plus_3 = (\"Constraint\" + \" \");\n String _name_3 = e.getName();\n return (_plus_3 + _name_3);\n }\n String _plus_4 = (\"List\" + \" \");\n String _name_4 = e.getName();\n String _plus_5 = (_plus_4 + _name_4);\n _xblockexpression = (_plus_5);\n }\n return _xblockexpression;\n }","new_methods":[{"arguments":["final Refinement e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"return \"obj16/refinement.gif\";","signature":"String image(final Refinement e)"},{"arguments":["final Intent e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"return \"obj16/intent.gif\";","signature":"String image(final Intent e)"},{"arguments":["final Specification e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"return \"obj16/specification.gif\";","signature":"String image(final Specification e)"},{"arguments":["final Decomposition e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"return \"obj16/decomposition.gif\";","signature":"String image(final Decomposition e)"},{"arguments":["final Document e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"return \"obj16/document.gif\";","signature":"String image(final Document e)"},{"arguments":["final ModelItem e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"return \"obj16/modelitem.gif\";","signature":"String image(final ModelItem e)"},{"arguments":["final ListItem e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"return \"obj16/listitem.gif\";","signature":"String image(final ListItem e)"},{"arguments":["final Intent e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"String _xblockexpression = null;\n {\n IntentType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"basic\".equals(typeName);\n if (_equals) {\n String _plus = (\"Basic\" + \" \");\n String _name = e.getName();\n return (_plus + _name);","signature":"String text(final Intent e)"},{"arguments":["final Refinement e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"String _plus = (\"Refinement\" + \" \");\n String _name = e.getName();\n String _plus_1 = (_plus + _name);\n return _plus_1;","signature":"String text(final Refinement e)"},{"arguments":["final Decomposition e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"String _xblockexpression = null;\n {\n DecompositionType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"environment\".equals(typeName);\n if (_equals) {\n String _plus = (\"Environment\" + \" \");\n String _name = e.getName();\n return (_plus + _name);","signature":"String text(final Decomposition e)"},{"arguments":["final Document e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"return \"Document\";","signature":"String text(final Document e)"},{"arguments":["final DocItem e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"String _xblockexpression = null;\n {\n DocItemType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"condition\".equals(typeName);\n if (_equals) {\n String _plus = (\"Condition\" + \" \");\n String _name = e.getName();\n return (_plus + _name);","signature":"String text(final DocItem e)"},{"arguments":["final ModelItem e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"String _xblockexpression = null;\n {\n ModelType type = e.getType();\n String typeName = type.getTypeName();\n boolean _equals = \"output\".equals(typeName);\n if (_equals) {\n String _plus = (\"Output\" + \" \");\n String _name = e.getName();\n return (_plus + _name);","signature":"String text(final ModelItem e)"},{"arguments":["final ListItem e"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java","implementation":"String _xblockexpression = null;\n {\n ListItemType type = e.getType();\n String _typeName = type.getTypeName();\n boolean _equals = \"hazard\".equals(_typeName);\n if (_equals) {\n String _plus = (\"Hazard\" + \" \");\n String _name = e.getName();\n return (_plus + _name);","signature":"String text(final ListItem e)"}],"old_code":" * generated by Xtext","old_methods":[],"patch":"@@ -1,9 +1,22 @@\n /**\n- * generated by Xtext\n+ * NOT generated by Xtext\n */\n package net.certware.intent.ui.labeling;\n \n import com.google.inject.Inject;\n+import net.certware.intent.intentSpecification.Decomposition;\n+import net.certware.intent.intentSpecification.DecompositionType;\n+import net.certware.intent.intentSpecification.DocItem;\n+import net.certware.intent.intentSpecification.DocItemType;\n+import net.certware.intent.intentSpecification.Document;\n+import net.certware.intent.intentSpecification.Intent;\n+import net.certware.intent.intentSpecification.IntentType;\n+import net.certware.intent.intentSpecification.ListItem;\n+import net.certware.intent.intentSpecification.ListItemType;\n+import net.certware.intent.intentSpecification.ModelItem;\n+import net.certware.intent.intentSpecification.ModelType;\n+import net.certware.intent.intentSpecification.Refinement;\n+import net.certware.intent.intentSpecification.Specification;\n import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;\n import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider;\n \n@@ -18,4 +31,280 @@ public class IntentSpecificationLabelProvider extends DefaultEObjectLabelProvide\n public IntentSpecificationLabelProvider(final AdapterFactoryLabelProvider delegate) {\n super(delegate);\n }\n+ \n+ public String image(final Refinement e) {\n+ return \"obj16/refinement.gif\";\n+ }\n+ \n+ public String image(final Intent e) {\n+ return \"obj16/intent.gif\";\n+ }\n+ \n+ public String image(final Specification e) {\n+ return \"obj16/specification.gif\";\n+ }\n+ \n+ public String image(final Decomposition e) {\n+ return \"obj16/decomposition.gif\";\n+ }\n+ \n+ public String image(final Document e) {\n+ return \"obj16/document.gif\";\n+ }\n+ \n+ public String image(final ModelItem e) {\n+ return \"obj16/modelitem.gif\";\n+ }\n+ \n+ public String image(final ListItem e) {\n+ return \"obj16/listitem.gif\";\n+ }\n+ \n+ /**\n+ * text responses\n+ */\n+ public String text(final Intent e) {\n+ String _xblockexpression = null;\n+ {\n+ IntentType type = e.getType();\n+ String typeName = type.getTypeName();\n+ boolean _equals = \"basic\".equals(typeName);\n+ if (_equals) {\n+ String _plus = (\"Basic\" + \" \");\n+ String _name = e.getName();\n+ return (_plus + _name);\n+ }\n+ boolean _equals_1 = \"purpose\".equals(typeName);\n+ if (_equals_1) {\n+ String _plus_1 = (\"Purpose\" + \" \");\n+ String _name_1 = e.getName();\n+ return (_plus_1 + _name_1);\n+ }\n+ boolean _equals_2 = \"principles\".equals(typeName);\n+ if (_equals_2) {\n+ String _plus_2 = (\"Principles\" + \" \");\n+ String _name_2 = e.getName();\n+ return (_plus_2 + _name_2);\n+ }\n+ boolean _equals_3 = \"models\".equals(typeName);\n+ if (_equals_3) {\n+ String _plus_3 = (\"Models\" + \" \");\n+ String _name_3 = e.getName();\n+ return (_plus_3 + _name_3);\n+ }\n+ boolean _equals_4 = \"design\".equals(typeName);\n+ if (_equals_4) {\n+ String _plus_4 = (\"Design\" + \" \");\n+ String _name_4 = e.getName();\n+ return (_plus_4 + _name_4);\n+ }\n+ boolean _equals_5 = \"implementation\".equals(typeName);\n+ if (_equals_5) {\n+ String _plus_5 = (\"Implementation\" + \" \");\n+ String _name_5 = e.getName();\n+ return (_plus_5 + _name_5);\n+ }\n+ boolean _equals_6 = \"operation\".equals(typeName);\n+ if (_equals_6) {\n+ String _plus_6 = (\"Operation\" + \" \");\n+ String _name_6 = e.getName();\n+ return (_plus_6 + _name_6);\n+ }\n+ String _plus_7 = (\"Intent\" + \" \");\n+ String _name_7 = e.getName();\n+ String _plus_8 = (_plus_7 + _name_7);\n+ _xblockexpression = (_plus_8);\n+ }\n+ return _xblockexpression;\n+ }\n+ \n+ public String text(final Refinement e) {\n+ String _plus = (\"Refinement\" + \" \");\n+ String _name = e.getName();\n+ String _plus_1 = (_plus + _name);\n+ return _plus_1;\n+ }\n+ \n+ public String text(final Decomposition e) {\n+ String _xblockexpression = null;\n+ {\n+ DecompositionType type = e.getType();\n+ String typeName = type.getTypeName();\n+ boolean _equals = \"environment\".equals(typeName);\n+ if (_equals) {\n+ String _plus = (\"Environment\" + \" \");\n+ String _name = e.getName();\n+ return (_plus + _name);\n+ }\n+ boolean _equals_1 = \"operator\".equals(typeName);\n+ if (_equals_1) {\n+ String _plus_1 = (\"Operator\" + \" \");\n+ String _name_1 = e.getName();\n+ return (_plus_1 + _name_1);\n+ }\n+ boolean _equals_2 = \"system\".equals(typeName);\n+ if (_equals_2) {\n+ String _plus_2 = (\"System\" + \" \");\n+ String _name_2 = e.getName();\n+ return (_plus_2 + _name_2);\n+ }\n+ boolean _equals_3 = \"verification\".equals(typeName);\n+ if (_equals_3) {\n+ String _plus_3 = (\"V&V\" + \" \");\n+ String _name_3 = e.getName();\n+ return (_plus_3 + _name_3);\n+ }\n+ String _plus_4 = (\"Decomposition\" + \" \");\n+ String _name_4 = e.getName();\n+ String _plus_5 = (_plus_4 + _name_4);\n+ _xblockexpression = (_plus_5);\n+ }\n+ return _xblockexpression;\n+ }\n+ \n+ public String text(final Document e) {\n+ return \"Document\";\n+ }\n+ \n+ public String text(final DocItem e) {\n+ String _xblockexpression = null;\n+ {\n+ DocItemType type = e.getType();\n+ String typeName = type.getTypeName();\n+ boolean _equals = \"condition\".equals(typeName);\n+ if (_equals) {\n+ String _plus = (\"Condition\" + \" \");\n+ String _name = e.getName();\n+ return (_plus + _name);\n+ }\n+ boolean _equals_1 = \"figure\".equals(typeName);\n+ if (_equals_1) {\n+ String _plus_1 = (\"Figure\" + \" \");\n+ String _name_1 = e.getName();\n+ return (_plus_1 + _name_1);\n+ }\n+ boolean _equals_2 = \"break\".equals(typeName);\n+ if (_equals_2) {\n+ return \"Break\";\n+ }\n+ boolean _equals_3 = \"model\".equals(typeName);\n+ if (_equals_3) {\n+ String _plus_2 = (\"Model\" + \" \");\n+ String _name_2 = e.getName();\n+ return (_plus_2 + _name_2);\n+ }\n+ boolean _equals_4 = \"paragraph\".equals(typeName);\n+ if (_equals_4) {\n+ String _plus_3 = (\"Paragraph\" + \" \");\n+ String _name_3 = e.getName();\n+ return (_plus_3 + _name_3);\n+ }\n+ boolean _equals_5 = \"section\".equals(typeName);\n+ if (_equals_5) {\n+ String _plus_4 = (\"Section\" + \" \");\n+ String _name_4 = e.getName();\n+ return (_plus_4 + _name_4);\n+ }\n+ boolean _equals_6 = \"table\".equals(typeName);\n+ if (_equals_6) {\n+ String _plus_5 = (\"Table\" + \" \");\n+ String _name_5 = e.getName();\n+ return (_plus_5 + _name_5);\n+ }\n+ String _plus_6 = (\"Item\" + \" \");\n+ String _name_6 = e.getName();\n+ String _plus_7 = (_plus_6 + _name_6);\n+ _xblockexpression = (_plus_7);\n+ }\n+ return _xblockexpression;\n+ }\n+ \n+ public String text(final ModelItem e) {\n+ String _xblockexpression = null;\n+ {\n+ ModelType type = e.getType();\n+ String typeName = type.getTypeName();\n+ boolean _equals = \"output\".equals(typeName);\n+ if (_equals) {\n+ String _plus = (\"Output\" + \" \");\n+ String _name = e.getName();\n+ return (_plus + _name);\n+ }\n+ boolean _equals_1 = \"mode\".equals(typeName);\n+ if (_equals_1) {\n+ String _plus_1 = (\"Mode\" + \" \");\n+ String _name_1 = e.getName();\n+ return (_plus_1 + _name_1);\n+ }\n+ boolean _equals_2 = \"state\".equals(typeName);\n+ if (_equals_2) {\n+ String _plus_2 = (\"State\" + \" \");\n+ String _name_2 = e.getName();\n+ return (_plus_2 + _name_2);\n+ }\n+ boolean _equals_3 = \"macro\".equals(typeName);\n+ if (_equals_3) {\n+ String _plus_3 = (\"Macro\" + \" \");\n+ String _name_3 = e.getName();\n+ return (_plus_3 + _name_3);\n+ }\n+ boolean _equals_4 = \"function\".equals(typeName);\n+ if (_equals_4) {\n+ String _plus_4 = (\"Function\" + \" \");\n+ String _name_4 = e.getName();\n+ return (_plus_4 + _name_4);\n+ }\n+ boolean _equals_5 = \"input\".equals(typeName);\n+ if (_equals_5) {\n+ String _plus_5 = (\"Input\" + \" \");\n+ String _name_5 = e.getName();\n+ return (_plus_5 + _name_5);\n+ }\n+ String _plus_6 = (\"Model\" + \" \");\n+ String _name_6 = e.getName();\n+ String _plus_7 = (_plus_6 + _name_6);\n+ _xblockexpression = (_plus_7);\n+ }\n+ return _xblockexpression;\n+ }\n+ \n+ public String text(final ListItem e) {\n+ String _xblockexpression = null;\n+ {\n+ ListItemType type = e.getType();\n+ String _typeName = type.getTypeName();\n+ boolean _equals = \"hazard\".equals(_typeName);\n+ if (_equals) {\n+ String _plus = (\"Hazard\" + \" \");\n+ String _name = e.getName();\n+ return (_plus + _name);\n+ }\n+ String _typeName_1 = type.getTypeName();\n+ boolean _equals_1 = \"requirement\".equals(_typeName_1);\n+ if (_equals_1) {\n+ String _plus_1 = (\"Requirement\" + \" \");\n+ String _name_1 = e.getName();\n+ return (_plus_1 + _name_1);\n+ }\n+ String _typeName_2 = type.getTypeName();\n+ boolean _equals_2 = \"goal\".equals(_typeName_2);\n+ if (_equals_2) {\n+ String _plus_2 = (\"Goal\" + \" \");\n+ String _name_2 = e.getName();\n+ return (_plus_2 + _name_2);\n+ }\n+ String _typeName_3 = type.getTypeName();\n+ boolean _equals_3 = \"constraint\".equals(_typeName_3);\n+ if (_equals_3) {\n+ String _plus_3 = (\"Constraint\" + \" \");\n+ String _name_3 = e.getName();\n+ return (_plus_3 + _name_3);\n+ }\n+ String _plus_4 = (\"List\" + \" \");\n+ String _name_4 = e.getName();\n+ String _plus_5 = (_plus_4 + _name_4);\n+ _xblockexpression = (_plus_5);\n+ }\n+ return _xblockexpression;\n+ }\n }","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.java","sha":"0c00b035e5b9e5a25b1e829f8abb31b37914673b","status":"modified"},{"additions":187,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.java","changes":190,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":3,"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java","new_code":" * NOT generated by Xtext\nimport com.google.common.base.Objects;\nimport java.util.Iterator;\nimport net.certware.intent.intentSpecification.Decomposition;\nimport net.certware.intent.intentSpecification.Intent;\nimport net.certware.intent.intentSpecification.ListItem;\nimport net.certware.intent.intentSpecification.ModelItem;\nimport net.certware.intent.intentSpecification.Refinement;\nimport net.certware.intent.validation.IntentSpecificationValidator;\nimport org.eclipse.emf.common.util.EList;\nimport org.eclipse.emf.ecore.EObject;\nimport org.eclipse.xtext.ui.editor.model.edit.IModificationContext;\nimport org.eclipse.xtext.ui.editor.model.edit.ISemanticModification;\nimport org.eclipse.xtext.ui.editor.quickfix.Fix;\nimport org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor;\nimport org.eclipse.xtext.validation.Issue;\n * @see http://www.eclipse.org/Xtext/documentation.html#quickfixes\n * @author mrb@certware.net\n /**\n * Fix duplicated intent entries by removing one.\n */\n @Fix(IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT)\n public void removeIntent(final Issue issue, final IssueResolutionAcceptor acceptor) {\n String _plus = (\"Remove intent named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n Refinement container = ((Refinement) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList list = container.getIntents();\n Iterator iter = list.iterator();\n Intent lastItem = ((Intent) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Intent item = iter.next();\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;\n }\n }\n boolean _hasNext_1 = iter.hasNext();\n _while = _hasNext_1;\n }\n boolean _notEquals = (!Objects.equal(lastItem, null));\n if (_notEquals) {\n list.remove(lastItem);\n }\n }\n };\n acceptor.accept(issue, \n \"Remove duplicated entry\", _plus_1, \n \"obj16/intent.gif\", _function);\n }\n \n /**\n * Fix duplicated intent entries by removing one.\n */\n @Fix(IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT)\n public void removeDecomposition(final Issue issue, final IssueResolutionAcceptor acceptor) {\n String _plus = (\"Remove decomposition named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n Intent container = ((Intent) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList list = container.getDecompositions();\n Iterator iter = list.iterator();\n Decomposition lastItem = ((Decomposition) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Decomposition _next = iter.next();\n Decomposition item = ((Decomposition) _next);\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;\n }\n }\n boolean _hasNext_1 = iter.hasNext();\n _while = _hasNext_1;\n }\n boolean _notEquals = (!Objects.equal(lastItem, null));\n if (_notEquals) {\n list.remove(lastItem);\n }\n }\n };\n acceptor.accept(issue, \n \"Remove duplicated decomposition\", _plus_1, \n \"obj16/decomposition.gif\", _function);\n }\n \n /**\n * Fix duplicated list entries by removing one.\n */\n @Fix(IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM)\n public void removeListItem(final Issue issue, final IssueResolutionAcceptor acceptor) {\n String _plus = (\"Remove list item named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n ListItem outerList = ((ListItem) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList list = outerList.getItemReferences();\n Iterator iter = list.iterator();\n ListItem lastItem = ((ListItem) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ListItem item = iter.next();\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;\n }\n }\n boolean _hasNext_1 = iter.hasNext();\n _while = _hasNext_1;\n }\n boolean _notEquals = (!Objects.equal(lastItem, null));\n if (_notEquals) {\n list.remove(lastItem);\n }\n }\n };\n acceptor.accept(issue, \n \"Remove duplicated list item\", _plus_1, \n \"obj16/listitem.gif\", _function);\n }\n \n @Fix(IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM)\n public void removeModelItem(final Issue issue, final IssueResolutionAcceptor acceptor) {\n String _plus = (\"Remove model item named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n ListItem outerList = ((ListItem) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList list = outerList.getModelReferences();\n Iterator iter = list.iterator();\n ModelItem lastItem = ((ModelItem) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ModelItem item = iter.next();\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;\n }\n }\n boolean _hasNext_1 = iter.hasNext();\n _while = _hasNext_1;\n }\n boolean _notEquals = (!Objects.equal(lastItem, null));\n if (_notEquals) {\n list.remove(lastItem);\n }\n }\n };\n acceptor.accept(issue, \n \"Remove duplicated entry\", _plus_1, \n \"obj16/modelitem.gif\", _function);\n }","new_methods":[{"arguments":["final Issue issue"," final IssueResolutionAcceptor acceptor"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java","implementation":"String _plus = (\"Remove intent named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n Refinement container = ((Refinement) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList list = container.getIntents();\n Iterator iter = list.iterator();\n Intent lastItem = ((Intent) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Intent item = iter.next();\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;","signature":"void removeIntent(final Issue issue, final IssueResolutionAcceptor acceptor)"},{"arguments":["final Issue issue"," final IssueResolutionAcceptor acceptor"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java","implementation":"String _plus = (\"Remove decomposition named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n Intent container = ((Intent) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList list = container.getDecompositions();\n Iterator iter = list.iterator();\n Decomposition lastItem = ((Decomposition) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Decomposition _next = iter.next();\n Decomposition item = ((Decomposition) _next);\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;","signature":"void removeDecomposition(final Issue issue, final IssueResolutionAcceptor acceptor)"},{"arguments":["final Issue issue"," final IssueResolutionAcceptor acceptor"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java","implementation":"String _plus = (\"Remove list item named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n ListItem outerList = ((ListItem) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList list = outerList.getItemReferences();\n Iterator iter = list.iterator();\n ListItem lastItem = ((ListItem) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ListItem item = iter.next();\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;","signature":"void removeListItem(final Issue issue, final IssueResolutionAcceptor acceptor)"},{"arguments":["final Issue issue"," final IssueResolutionAcceptor acceptor"],"filename":"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java","implementation":"String _plus = (\"Remove model item named\" + \" \");\n String[] _data = issue.getData();\n String _get = _data[0];\n String _plus_1 = (_plus + _get);\n final ISemanticModification _function = new ISemanticModification() {\n public void apply(final EObject element, final IModificationContext context) throws Exception {\n ListItem outerList = ((ListItem) element);\n String[] _data = issue.getData();\n String _get = _data[0];\n String itemName = ((String) _get);\n EList list = outerList.getModelReferences();\n Iterator iter = list.iterator();\n ModelItem lastItem = ((ModelItem) null);\n boolean _hasNext = iter.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ModelItem item = iter.next();\n String _name = item.getName();\n boolean _equals = _name.equals(itemName);\n if (_equals) {\n lastItem = item;","signature":"void removeModelItem(final Issue issue, final IssueResolutionAcceptor acceptor)"}],"old_code":" * generated by Xtext\n * \n * see http://www.eclipse.org/Xtext/documentation.html#quickfixes","old_methods":[],"patch":"@@ -1,15 +1,199 @@\n /**\n- * generated by Xtext\n+ * NOT generated by Xtext\n */\n package net.certware.intent.ui.quickfix;\n \n+import com.google.common.base.Objects;\n+import java.util.Iterator;\n+import net.certware.intent.intentSpecification.Decomposition;\n+import net.certware.intent.intentSpecification.Intent;\n+import net.certware.intent.intentSpecification.ListItem;\n+import net.certware.intent.intentSpecification.ModelItem;\n+import net.certware.intent.intentSpecification.Refinement;\n+import net.certware.intent.validation.IntentSpecificationValidator;\n+import org.eclipse.emf.common.util.EList;\n+import org.eclipse.emf.ecore.EObject;\n+import org.eclipse.xtext.ui.editor.model.edit.IModificationContext;\n+import org.eclipse.xtext.ui.editor.model.edit.ISemanticModification;\n import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider;\n+import org.eclipse.xtext.ui.editor.quickfix.Fix;\n+import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor;\n+import org.eclipse.xtext.validation.Issue;\n \n /**\n * Custom quickfixes.\n- * \n- * see http://www.eclipse.org/Xtext/documentation.html#quickfixes\n+ * @see http://www.eclipse.org/Xtext/documentation.html#quickfixes\n+ * @author mrb@certware.net\n */\n @SuppressWarnings(\"all\")\n public class IntentSpecificationQuickfixProvider extends DefaultQuickfixProvider {\n+ /**\n+ * Fix duplicated intent entries by removing one.\n+ */\n+ @Fix(IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT)\n+ public void removeIntent(final Issue issue, final IssueResolutionAcceptor acceptor) {\n+ String _plus = (\"Remove intent named\" + \" \");\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String _plus_1 = (_plus + _get);\n+ final ISemanticModification _function = new ISemanticModification() {\n+ public void apply(final EObject element, final IModificationContext context) throws Exception {\n+ Refinement container = ((Refinement) element);\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String itemName = ((String) _get);\n+ EList list = container.getIntents();\n+ Iterator iter = list.iterator();\n+ Intent lastItem = ((Intent) null);\n+ boolean _hasNext = iter.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ Intent item = iter.next();\n+ String _name = item.getName();\n+ boolean _equals = _name.equals(itemName);\n+ if (_equals) {\n+ lastItem = item;\n+ }\n+ }\n+ boolean _hasNext_1 = iter.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ boolean _notEquals = (!Objects.equal(lastItem, null));\n+ if (_notEquals) {\n+ list.remove(lastItem);\n+ }\n+ }\n+ };\n+ acceptor.accept(issue, \n+ \"Remove duplicated entry\", _plus_1, \n+ \"obj16/intent.gif\", _function);\n+ }\n+ \n+ /**\n+ * Fix duplicated intent entries by removing one.\n+ */\n+ @Fix(IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT)\n+ public void removeDecomposition(final Issue issue, final IssueResolutionAcceptor acceptor) {\n+ String _plus = (\"Remove decomposition named\" + \" \");\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String _plus_1 = (_plus + _get);\n+ final ISemanticModification _function = new ISemanticModification() {\n+ public void apply(final EObject element, final IModificationContext context) throws Exception {\n+ Intent container = ((Intent) element);\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String itemName = ((String) _get);\n+ EList list = container.getDecompositions();\n+ Iterator iter = list.iterator();\n+ Decomposition lastItem = ((Decomposition) null);\n+ boolean _hasNext = iter.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ Decomposition _next = iter.next();\n+ Decomposition item = ((Decomposition) _next);\n+ String _name = item.getName();\n+ boolean _equals = _name.equals(itemName);\n+ if (_equals) {\n+ lastItem = item;\n+ }\n+ }\n+ boolean _hasNext_1 = iter.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ boolean _notEquals = (!Objects.equal(lastItem, null));\n+ if (_notEquals) {\n+ list.remove(lastItem);\n+ }\n+ }\n+ };\n+ acceptor.accept(issue, \n+ \"Remove duplicated decomposition\", _plus_1, \n+ \"obj16/decomposition.gif\", _function);\n+ }\n+ \n+ /**\n+ * Fix duplicated list entries by removing one.\n+ */\n+ @Fix(IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM)\n+ public void removeListItem(final Issue issue, final IssueResolutionAcceptor acceptor) {\n+ String _plus = (\"Remove list item named\" + \" \");\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String _plus_1 = (_plus + _get);\n+ final ISemanticModification _function = new ISemanticModification() {\n+ public void apply(final EObject element, final IModificationContext context) throws Exception {\n+ ListItem outerList = ((ListItem) element);\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String itemName = ((String) _get);\n+ EList list = outerList.getItemReferences();\n+ Iterator iter = list.iterator();\n+ ListItem lastItem = ((ListItem) null);\n+ boolean _hasNext = iter.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ ListItem item = iter.next();\n+ String _name = item.getName();\n+ boolean _equals = _name.equals(itemName);\n+ if (_equals) {\n+ lastItem = item;\n+ }\n+ }\n+ boolean _hasNext_1 = iter.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ boolean _notEquals = (!Objects.equal(lastItem, null));\n+ if (_notEquals) {\n+ list.remove(lastItem);\n+ }\n+ }\n+ };\n+ acceptor.accept(issue, \n+ \"Remove duplicated list item\", _plus_1, \n+ \"obj16/listitem.gif\", _function);\n+ }\n+ \n+ @Fix(IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM)\n+ public void removeModelItem(final Issue issue, final IssueResolutionAcceptor acceptor) {\n+ String _plus = (\"Remove model item named\" + \" \");\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String _plus_1 = (_plus + _get);\n+ final ISemanticModification _function = new ISemanticModification() {\n+ public void apply(final EObject element, final IModificationContext context) throws Exception {\n+ ListItem outerList = ((ListItem) element);\n+ String[] _data = issue.getData();\n+ String _get = _data[0];\n+ String itemName = ((String) _get);\n+ EList list = outerList.getModelReferences();\n+ Iterator iter = list.iterator();\n+ ModelItem lastItem = ((ModelItem) null);\n+ boolean _hasNext = iter.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ ModelItem item = iter.next();\n+ String _name = item.getName();\n+ boolean _equals = _name.equals(itemName);\n+ if (_equals) {\n+ lastItem = item;\n+ }\n+ }\n+ boolean _hasNext_1 = iter.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ boolean _notEquals = (!Objects.equal(lastItem, null));\n+ if (_notEquals) {\n+ list.remove(lastItem);\n+ }\n+ }\n+ };\n+ acceptor.accept(issue, \n+ \"Remove duplicated entry\", _plus_1, \n+ \"obj16/modelitem.gif\", _function);\n+ }\n }","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.java","sha":"b4d28f50087b281d599cf0e2ac7dcde57b03c15c","status":"modified"},{"additions":32,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.ecore","changes":44,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.ecore?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":12,"filename":"net.certware.intent/src-gen/net/certware/intent/IntentSpecification.ecore","new_code":" \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n ","new_methods":[],"old_code":" \n \n \n \n \n \n \n \n \n \n \n ","old_methods":[],"patch":"@@ -3,26 +3,31 @@\n xmlns:ecore=\"http://www.eclipse.org/emf/2002/Ecore\" name=\"intentSpecification\" nsURI=\"http://www.certware.net/intent/IntentSpecification\"\n nsPrefix=\"intentSpecification\">\n \n- \n+ \n \n \n \n- \n+ \n \n \n \n \n- \n- \n+ \n+ \n \n \n \n+ \n+ \n+ \n \n- \n- \n+ \n+ \n \n \n@@ -31,23 +36,38 @@\n \n \n+ \n+ \n+ \n \n \n \n+ \n+ \n+ \n \n- \n- \n+ \n+ \n \n \n+ \n+ \n+ \n \n- \n- \n+ \n+ \n \n \n+ \n+ \n+ \n \n- \n- \n+ \n+ \n \n ","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.ecore","sha":"cddff653591222ff87c6f4aa003c852e2657f69d","status":"modified"},{"additions":27,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.genmodel","changes":39,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.genmodel?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":12,"filename":"net.certware.intent/src-gen/net/certware/intent/IntentSpecification.genmodel","new_code":" \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n ","new_methods":[],"old_code":" \n \n \n \n \n \n \n \n \n \n \n ","old_methods":[],"patch":"@@ -9,44 +9,59 @@\n \n \n- \n+ \n \n \n \n- \n+ \n \n \n \n \n- \n- \n+ \n+ \n \n \n \n+ \n+ \n+ \n \n- \n- \n+ \n+ \n \n \n \n \n \n+ \n+ \n+ \n \n \n \n+ \n+ \n+ \n \n- \n- \n+ \n+ \n \n \n+ \n+ \n+ \n \n- \n- \n+ \n+ \n \n \n+ \n+ \n+ \n \n- \n- \n+ \n+ \n \n \n ","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.genmodel","sha":"9e5c3914e6ea6b49dca859fc23f99c66ff79e11e","status":"modified"},{"additions":20,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDecomposition.java","changes":40,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDecomposition.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":20,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/Decomposition.java","new_code":" *
  • {@link net.certware.intent.intentSpecification.Decomposition#getName Name}
    • \n * Returns the value of the 'Type' containment reference.\n * If the meaning of the 'Type' containment reference isn't clear,\n * @return the value of the 'Type' containment reference.\n * @see #setType(DecompositionType)\n * @model containment=\"true\"\n DecompositionType getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}' containment reference.\n * @param value the new value of the 'Type' containment reference.\n void setType(DecompositionType value);\n * Returns the value of the 'Name' attribute.\n * If the meaning of the 'Name' attribute isn't clear,\n * @return the value of the 'Name' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getName Name}' attribute.\n * @param value the new value of the 'Name' attribute.\n * @see #getName()\n void setName(String value);","new_methods":[],"old_code":" *
  • {@link net.certware.intent.intentSpecification.Decomposition#getId Id}
    • \n * Returns the value of the 'Type' attribute.\n * If the meaning of the 'Type' attribute isn't clear,\n * @return the value of the 'Type' attribute.\n * @see #setType(String)\n * @model\n String getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}' attribute.\n * @param value the new value of the 'Type' attribute.\n void setType(String value);\n * Returns the value of the 'Id' attribute.\n * If the meaning of the 'Id' attribute isn't clear,\n * @return the value of the 'Id' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getId Id}' attribute.\n * @param value the new value of the 'Id' attribute.\n * @see #getId()\n void setId(String value);","old_methods":[],"patch":"@@ -15,7 +15,7 @@\n * The following features are supported:\n *
      \n *
    • {@link net.certware.intent.intentSpecification.Decomposition#getType Type}
      • \n- *
    • {@link net.certware.intent.intentSpecification.Decomposition#getId Id}
      • \n+ *
    • {@link net.certware.intent.intentSpecification.Decomposition#getName Name}
      • \n *
    • {@link net.certware.intent.intentSpecification.Decomposition#getDesc Desc}
      • \n *
    • {@link net.certware.intent.intentSpecification.Decomposition#getDocuments Documents}
      • \n *
    • {@link net.certware.intent.intentSpecification.Decomposition#getModels Models}
      • \n@@ -30,56 +30,56 @@\n public interface Decomposition extends EObject\n {\n /**\n- * Returns the value of the 'Type' attribute.\n+ * Returns the value of the 'Type' containment reference.\n * \n *

      \n- * If the meaning of the 'Type' attribute isn't clear,\n+ * If the meaning of the 'Type' containment reference isn't clear,\n * there really should be more of a description here...\n *

      \n * \n- * @return the value of the 'Type' attribute.\n- * @see #setType(String)\n+ * @return the value of the 'Type' containment reference.\n+ * @see #setType(DecompositionType)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Type()\n- * @model\n+ * @model containment=\"true\"\n * @generated\n */\n- String getType();\n+ DecompositionType getType();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}' containment reference.\n * \n * \n- * @param value the new value of the 'Type' attribute.\n+ * @param value the new value of the 'Type' containment reference.\n * @see #getType()\n * @generated\n */\n- void setType(String value);\n+ void setType(DecompositionType value);\n \n /**\n- * Returns the value of the 'Id' attribute.\n+ * Returns the value of the 'Name' attribute.\n * \n *

      \n- * If the meaning of the 'Id' attribute isn't clear,\n+ * If the meaning of the 'Name' attribute isn't clear,\n * there really should be more of a description here...\n *

      \n * \n- * @return the value of the 'Id' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Id()\n+ * @return the value of the 'Name' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getId Id}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getName Name}' attribute.\n * \n * \n- * @param value the new value of the 'Id' attribute.\n- * @see #getId()\n+ * @param value the new value of the 'Name' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the 'Desc' attribute.","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDecomposition.java","sha":"98f71982458d95d10e32701be8e35af734635926","status":"modified"},{"additions":20,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDocItem.java","changes":40,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDocItem.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":20,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/DocItem.java","new_code":" *
    • {@link net.certware.intent.intentSpecification.DocItem#getName Name}
      • \n * Returns the value of the 'Type' containment reference.\n * If the meaning of the 'Type' containment reference isn't clear,\n * @return the value of the 'Type' containment reference.\n * @see #setType(DocItemType)\n * @model containment=\"true\"\n DocItemType getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getType Type}' containment reference.\n * @param value the new value of the 'Type' containment reference.\n void setType(DocItemType value);\n * Returns the value of the 'Name' attribute.\n * If the meaning of the 'Name' attribute isn't clear,\n * @return the value of the 'Name' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getName Name}' attribute.\n * @param value the new value of the 'Name' attribute.\n * @see #getName()\n void setName(String value);","new_methods":[],"old_code":" *
    • {@link net.certware.intent.intentSpecification.DocItem#getId Id}
      • \n * Returns the value of the 'Type' attribute.\n * If the meaning of the 'Type' attribute isn't clear,\n * @return the value of the 'Type' attribute.\n * @see #setType(String)\n * @model\n String getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getType Type}' attribute.\n * @param value the new value of the 'Type' attribute.\n void setType(String value);\n * Returns the value of the 'Id' attribute.\n * If the meaning of the 'Id' attribute isn't clear,\n * @return the value of the 'Id' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getId Id}' attribute.\n * @param value the new value of the 'Id' attribute.\n * @see #getId()\n void setId(String value);","old_methods":[],"patch":"@@ -13,7 +13,7 @@\n * The following features are supported:\n *
        \n *
      • {@link net.certware.intent.intentSpecification.DocItem#getType Type}
        • \n- *
      • {@link net.certware.intent.intentSpecification.DocItem#getId Id}
        • \n+ *
      • {@link net.certware.intent.intentSpecification.DocItem#getName Name}
        • \n *
      • {@link net.certware.intent.intentSpecification.DocItem#getRef Ref}
        • \n *
      \n *

      \n@@ -25,56 +25,56 @@\n public interface DocItem extends EObject\n {\n /**\n- * Returns the value of the 'Type' attribute.\n+ * Returns the value of the 'Type' containment reference.\n * \n *

      \n- * If the meaning of the 'Type' attribute isn't clear,\n+ * If the meaning of the 'Type' containment reference isn't clear,\n * there really should be more of a description here...\n *

      \n * \n- * @return the value of the 'Type' attribute.\n- * @see #setType(String)\n+ * @return the value of the 'Type' containment reference.\n+ * @see #setType(DocItemType)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Type()\n- * @model\n+ * @model containment=\"true\"\n * @generated\n */\n- String getType();\n+ DocItemType getType();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getType Type}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getType Type}' containment reference.\n * \n * \n- * @param value the new value of the 'Type' attribute.\n+ * @param value the new value of the 'Type' containment reference.\n * @see #getType()\n * @generated\n */\n- void setType(String value);\n+ void setType(DocItemType value);\n \n /**\n- * Returns the value of the 'Id' attribute.\n+ * Returns the value of the 'Name' attribute.\n * \n *

      \n- * If the meaning of the 'Id' attribute isn't clear,\n+ * If the meaning of the 'Name' attribute isn't clear,\n * there really should be more of a description here...\n *

      \n * \n- * @return the value of the 'Id' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Id()\n+ * @return the value of the 'Name' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getId Id}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getName Name}' attribute.\n * \n * \n- * @param value the new value of the 'Id' attribute.\n- * @see #getId()\n+ * @param value the new value of the 'Name' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the 'Ref' attribute.","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDocItem.java","sha":"4575af3ab69ca85d66d4190c97f0825bcf08246c","status":"modified"},{"additions":20,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntent.java","changes":40,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntent.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":20,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/Intent.java","new_code":" *
    • {@link net.certware.intent.intentSpecification.Intent#getName Name}
      • \n * Returns the value of the 'Type' containment reference.\n * If the meaning of the 'Type' containment reference isn't clear,\n * @return the value of the 'Type' containment reference.\n * @see #setType(IntentType)\n * @model containment=\"true\"\n IntentType getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getType Type}' containment reference.\n * @param value the new value of the 'Type' containment reference.\n void setType(IntentType value);\n * Returns the value of the 'Name' attribute.\n * If the meaning of the 'Name' attribute isn't clear,\n * @return the value of the 'Name' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getName Name}' attribute.\n * @param value the new value of the 'Name' attribute.\n * @see #getName()\n void setName(String value);","new_methods":[],"old_code":" *
    • {@link net.certware.intent.intentSpecification.Intent#getId Id}
      • \n * Returns the value of the 'Type' attribute.\n * If the meaning of the 'Type' attribute isn't clear,\n * @return the value of the 'Type' attribute.\n * @see #setType(String)\n * @model\n String getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getType Type}' attribute.\n * @param value the new value of the 'Type' attribute.\n void setType(String value);\n * Returns the value of the 'Id' attribute.\n * If the meaning of the 'Id' attribute isn't clear,\n * @return the value of the 'Id' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getId Id}' attribute.\n * @param value the new value of the 'Id' attribute.\n * @see #getId()\n void setId(String value);","old_methods":[],"patch":"@@ -15,7 +15,7 @@\n * The following features are supported:\n *
        \n *
      • {@link net.certware.intent.intentSpecification.Intent#getType Type}
        • \n- *
      • {@link net.certware.intent.intentSpecification.Intent#getId Id}
        • \n+ *
      • {@link net.certware.intent.intentSpecification.Intent#getName Name}
        • \n *
      • {@link net.certware.intent.intentSpecification.Intent#getDesc Desc}
        • \n *
      • {@link net.certware.intent.intentSpecification.Intent#getDecompositions Decompositions}
        • \n *
      \n@@ -28,56 +28,56 @@\n public interface Intent extends EObject\n {\n /**\n- * Returns the value of the 'Type' attribute.\n+ * Returns the value of the 'Type' containment reference.\n * \n *

      \n- * If the meaning of the 'Type' attribute isn't clear,\n+ * If the meaning of the 'Type' containment reference isn't clear,\n * there really should be more of a description here...\n *

      \n * \n- * @return the value of the 'Type' attribute.\n- * @see #setType(String)\n+ * @return the value of the 'Type' containment reference.\n+ * @see #setType(IntentType)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Type()\n- * @model\n+ * @model containment=\"true\"\n * @generated\n */\n- String getType();\n+ IntentType getType();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getType Type}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getType Type}' containment reference.\n * \n * \n- * @param value the new value of the 'Type' attribute.\n+ * @param value the new value of the 'Type' containment reference.\n * @see #getType()\n * @generated\n */\n- void setType(String value);\n+ void setType(IntentType value);\n \n /**\n- * Returns the value of the 'Id' attribute.\n+ * Returns the value of the 'Name' attribute.\n * \n *

      \n- * If the meaning of the 'Id' attribute isn't clear,\n+ * If the meaning of the 'Name' attribute isn't clear,\n * there really should be more of a description here...\n *

      \n * \n- * @return the value of the 'Id' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Id()\n+ * @return the value of the 'Name' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getId Id}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getName Name}' attribute.\n * \n * \n- * @param value the new value of the 'Id' attribute.\n- * @see #getId()\n+ * @param value the new value of the 'Name' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the 'Desc' attribute.","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntent.java","sha":"183b90ab1821495c327905917801b010015ecfb6","status":"modified"},{"additions":45,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationFactory.java","changes":45,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationFactory.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":0,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/IntentSpecificationFactory.java","new_code":" /**\n * Returns a new object of class 'Intent Type'.\n * \n * \n * @return a new object of class 'Intent Type'.\n * @generated\n */\n IntentType createIntentType();\n\n /**\n * Returns a new object of class 'Decomposition Type'.\n * \n * \n * @return a new object of class 'Decomposition Type'.\n * @generated\n */\n DecompositionType createDecompositionType();\n\n /**\n * Returns a new object of class 'Doc Item Type'.\n * \n * \n * @return a new object of class 'Doc Item Type'.\n * @generated\n */\n DocItemType createDocItemType();\n\n /**\n * Returns a new object of class 'Model Type'.\n * \n * \n * @return a new object of class 'Model Type'.\n * @generated\n */\n ModelType createModelType();\n\n /**\n * Returns a new object of class 'List Item Type'.\n * \n * \n * @return a new object of class 'List Item Type'.\n * @generated\n */\n ListItemType createListItemType();\n","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -49,6 +49,15 @@ public interface IntentSpecificationFactory extends EFactory\n */\n Intent createIntent();\n \n+ /**\n+ * Returns a new object of class 'Intent Type'.\n+ * \n+ * \n+ * @return a new object of class 'Intent Type'.\n+ * @generated\n+ */\n+ IntentType createIntentType();\n+\n /**\n * Returns a new object of class 'Decomposition'.\n * \n@@ -58,6 +67,15 @@ public interface IntentSpecificationFactory extends EFactory\n */\n Decomposition createDecomposition();\n \n+ /**\n+ * Returns a new object of class 'Decomposition Type'.\n+ * \n+ * \n+ * @return a new object of class 'Decomposition Type'.\n+ * @generated\n+ */\n+ DecompositionType createDecompositionType();\n+\n /**\n * Returns a new object of class 'Document'.\n * \n@@ -67,6 +85,15 @@ public interface IntentSpecificationFactory extends EFactory\n */\n Document createDocument();\n \n+ /**\n+ * Returns a new object of class 'Doc Item Type'.\n+ * \n+ * \n+ * @return a new object of class 'Doc Item Type'.\n+ * @generated\n+ */\n+ DocItemType createDocItemType();\n+\n /**\n * Returns a new object of class 'Doc Item'.\n * \n@@ -76,6 +103,15 @@ public interface IntentSpecificationFactory extends EFactory\n */\n DocItem createDocItem();\n \n+ /**\n+ * Returns a new object of class 'Model Type'.\n+ * \n+ * \n+ * @return a new object of class 'Model Type'.\n+ * @generated\n+ */\n+ ModelType createModelType();\n+\n /**\n * Returns a new object of class 'Model Item'.\n * \n@@ -85,6 +121,15 @@ public interface IntentSpecificationFactory extends EFactory\n */\n ModelItem createModelItem();\n \n+ /**\n+ * Returns a new object of class 'List Item Type'.\n+ * \n+ * \n+ * @return a new object of class 'List Item Type'.\n+ * @generated\n+ */\n+ ListItemType createListItemType();\n+\n /**\n * Returns a new object of class 'List Item'.\n * ","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationFactory.java","sha":"3ec7f532719ab204c89e50c25ce52cdfecf21e4b","status":"modified"},{"additions":426,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationPackage.java","changes":517,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationPackage.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":91,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/IntentSpecificationPackage.java","new_code":" * The feature id for the 'Name' attribute.\n int SPECIFICATION__NAME = 0;\n * The feature id for the 'Name' attribute.\n int REFINEMENT__NAME = 0;\n * The feature id for the 'Type' containment reference.\n * The feature id for the 'Name' attribute.\n int INTENT__NAME = 1;\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.IntentTypeImpl Intent Type}' class.\n * \n * \n * @see net.certware.intent.intentSpecification.impl.IntentTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getIntentType()\n * @generated\n */\n int INTENT_TYPE = 3;\n\n /**\n * The feature id for the 'Type Name' attribute.\n * \n * \n * @generated\n * @ordered\n */\n int INTENT_TYPE__TYPE_NAME = 0;\n\n /**\n * The number of structural features of the 'Intent Type' class.\n * \n * \n * @generated\n * @ordered\n */\n int INTENT_TYPE_FEATURE_COUNT = 1;\n\n int DECOMPOSITION = 4;\n * The feature id for the 'Type' containment reference.\n * The feature id for the 'Name' attribute.\n int DECOMPOSITION__NAME = 1;\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DecompositionTypeImpl Decomposition Type}' class.\n * \n * \n * @see net.certware.intent.intentSpecification.impl.DecompositionTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecompositionType()\n * @generated\n */\n int DECOMPOSITION_TYPE = 5;\n\n /**\n * The feature id for the 'Type Name' attribute.\n * \n * \n * @generated\n * @ordered\n */\n int DECOMPOSITION_TYPE__TYPE_NAME = 0;\n\n /**\n * The number of structural features of the 'Decomposition Type' class.\n * \n * \n * @generated\n * @ordered\n */\n int DECOMPOSITION_TYPE_FEATURE_COUNT = 1;\n\n int DOCUMENT = 6;\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DocItemTypeImpl Doc Item Type}' class.\n * \n * \n * @see net.certware.intent.intentSpecification.impl.DocItemTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItemType()\n * @generated\n */\n int DOC_ITEM_TYPE = 7;\n\n /**\n * The feature id for the 'Type Name' attribute.\n * \n * \n * @generated\n * @ordered\n */\n int DOC_ITEM_TYPE__TYPE_NAME = 0;\n\n /**\n * The number of structural features of the 'Doc Item Type' class.\n * \n * \n * @generated\n * @ordered\n */\n int DOC_ITEM_TYPE_FEATURE_COUNT = 1;\n\n int DOC_ITEM = 8;\n * The feature id for the 'Type' containment reference.\n * The feature id for the 'Name' attribute.\n int DOC_ITEM__NAME = 1;\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ModelTypeImpl Model Type}' class.\n * \n * \n * @see net.certware.intent.intentSpecification.impl.ModelTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelType()\n * @generated\n */\n int MODEL_TYPE = 9;\n\n /**\n * The feature id for the 'Type Name' attribute.\n * \n * \n * @generated\n * @ordered\n */\n int MODEL_TYPE__TYPE_NAME = 0;\n\n /**\n * The number of structural features of the 'Model Type' class.\n * \n * \n * @generated\n * @ordered\n */\n int MODEL_TYPE_FEATURE_COUNT = 1;\n\n int MODEL_ITEM = 10;\n * The feature id for the 'Type' containment reference.\n * The feature id for the 'Name' attribute.\n int MODEL_ITEM__NAME = 1;\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ListItemTypeImpl List Item Type}' class.\n * \n * \n * @see net.certware.intent.intentSpecification.impl.ListItemTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItemType()\n * @generated\n */\n int LIST_ITEM_TYPE = 11;\n\n /**\n * The feature id for the 'Type Name' attribute.\n * \n * \n * @generated\n * @ordered\n */\n int LIST_ITEM_TYPE__TYPE_NAME = 0;\n\n /**\n * The number of structural features of the 'List Item Type' class.\n * \n * \n * @generated\n * @ordered\n */\n int LIST_ITEM_TYPE_FEATURE_COUNT = 1;\n\n int LIST_ITEM = 12;\n * The feature id for the 'Type' containment reference.\n * The feature id for the 'Name' attribute.\n int LIST_ITEM__NAME = 1;\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Specification#getName Name}'.\n * @return the meta object for the attribute 'Name'.\n * @see net.certware.intent.intentSpecification.Specification#getName()\n EAttribute getSpecification_Name();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getName Name}'.\n * @return the meta object for the attribute 'Name'.\n * @see net.certware.intent.intentSpecification.Refinement#getName()\n EAttribute getRefinement_Name();\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.Intent#getType Type}'.\n * @return the meta object for the containment reference 'Type'.\n EReference getIntent_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getName Name}'.\n * @return the meta object for the attribute 'Name'.\n * @see net.certware.intent.intentSpecification.Intent#getName()\n EAttribute getIntent_Name();\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.IntentType Intent Type}'.\n * \n * \n * @return the meta object for class 'Intent Type'.\n * @see net.certware.intent.intentSpecification.IntentType\n * @generated\n */\n EClass getIntentType();\n\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.IntentType#getTypeName Type Name}'.\n * \n * \n * @return the meta object for the attribute 'Type Name'.\n * @see net.certware.intent.intentSpecification.IntentType#getTypeName()\n * @see #getIntentType()\n * @generated\n */\n EAttribute getIntentType_TypeName();\n\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}'.\n * @return the meta object for the containment reference 'Type'.\n EReference getDecomposition_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getName Name}'.\n * @return the meta object for the attribute 'Name'.\n * @see net.certware.intent.intentSpecification.Decomposition#getName()\n EAttribute getDecomposition_Name();\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DecompositionType Decomposition Type}'.\n * \n * \n * @return the meta object for class 'Decomposition Type'.\n * @see net.certware.intent.intentSpecification.DecompositionType\n * @generated\n */\n EClass getDecompositionType();\n\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DecompositionType#getTypeName Type Name}'.\n * \n * \n * @return the meta object for the attribute 'Type Name'.\n * @see net.certware.intent.intentSpecification.DecompositionType#getTypeName()\n * @see #getDecompositionType()\n * @generated\n */\n EAttribute getDecompositionType_TypeName();\n\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DocItemType Doc Item Type}'.\n * \n * \n * @return the meta object for class 'Doc Item Type'.\n * @see net.certware.intent.intentSpecification.DocItemType\n * @generated\n */\n EClass getDocItemType();\n\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItemType#getTypeName Type Name}'.\n * \n * \n * @return the meta object for the attribute 'Type Name'.\n * @see net.certware.intent.intentSpecification.DocItemType#getTypeName()\n * @see #getDocItemType()\n * @generated\n */\n EAttribute getDocItemType_TypeName();\n\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.DocItem#getType Type}'.\n * @return the meta object for the containment reference 'Type'.\n EReference getDocItem_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getName Name}'.\n * @return the meta object for the attribute 'Name'.\n * @see net.certware.intent.intentSpecification.DocItem#getName()\n EAttribute getDocItem_Name();\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ModelType Model Type}'.\n * \n * \n * @return the meta object for class 'Model Type'.\n * @see net.certware.intent.intentSpecification.ModelType\n * @generated\n */\n EClass getModelType();\n\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelType#getTypeName Type Name}'.\n * \n * \n * @return the meta object for the attribute 'Type Name'.\n * @see net.certware.intent.intentSpecification.ModelType#getTypeName()\n * @see #getModelType()\n * @generated\n */\n EAttribute getModelType_TypeName();\n\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}'.\n * @return the meta object for the containment reference 'Type'.\n EReference getModelItem_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getName Name}'.\n * @return the meta object for the attribute 'Name'.\n * @see net.certware.intent.intentSpecification.ModelItem#getName()\n EAttribute getModelItem_Name();\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ListItemType List Item Type}'.\n * \n * \n * @return the meta object for class 'List Item Type'.\n * @see net.certware.intent.intentSpecification.ListItemType\n * @generated\n */\n EClass getListItemType();\n\n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItemType#getTypeName Type Name}'.\n * \n * \n * @return the meta object for the attribute 'Type Name'.\n * @see net.certware.intent.intentSpecification.ListItemType#getTypeName()\n * @see #getListItemType()\n * @generated\n */\n EAttribute getListItemType_TypeName();\n\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.ListItem#getType Type}'.\n * @return the meta object for the containment reference 'Type'.\n EReference getListItem_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getName Name}'.\n * @return the meta object for the attribute 'Name'.\n * @see net.certware.intent.intentSpecification.ListItem#getName()\n EAttribute getListItem_Name();\n * The meta object literal for the 'Name' attribute feature.\n EAttribute SPECIFICATION__NAME = eINSTANCE.getSpecification_Name();\n * The meta object literal for the 'Name' attribute feature.\n EAttribute REFINEMENT__NAME = eINSTANCE.getRefinement_Name();\n * The meta object literal for the 'Type' containment reference feature.\n EReference INTENT__TYPE = eINSTANCE.getIntent_Type();\n * The meta object literal for the 'Name' attribute feature.\n EAttribute INTENT__NAME = eINSTANCE.getIntent_Name();\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.IntentTypeImpl Intent Type}' class.\n * \n * \n * @see net.certware.intent.intentSpecification.impl.IntentTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getIntentType()\n * @generated\n */\n EClass INTENT_TYPE = eINSTANCE.getIntentType();\n\n /**\n * The meta object literal for the 'Type Name' attribute feature.\n * \n * \n * @generated\n */\n EAttribute INTENT_TYPE__TYPE_NAME = eINSTANCE.getIntentType_TypeName();\n\n * The meta object literal for the 'Type' containment reference feature.\n EReference DECOMPOSITION__TYPE = eINSTANCE.getDecomposition_Type();\n * The meta object literal for the 'Name' attribute feature.\n EAttribute DECOMPOSITION__NAME = eINSTANCE.getDecomposition_Name();\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DecompositionTypeImpl Decomposition Type}' class.\n * \n * \n * @see net.certware.intent.intentSpecification.impl.DecompositionTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecompositionType()\n * @generated\n */\n EClass DECOMPOSITION_TYPE = eINSTANCE.getDecompositionType();\n\n /**\n * The meta object literal for the 'Type Name' attribute feature.\n * \n * \n * @generated\n */\n EAttribute DECOMPOSITION_TYPE__TYPE_NAME = eINSTANCE.getDecompositionType_TypeName();\n\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DocItemTypeImpl Doc Item Type}' class.\n * \n * \n * @see net.certware.intent.intentSpecification.impl.DocItemTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItemType()\n * @generated\n */\n EClass DOC_ITEM_TYPE = eINSTANCE.getDocItemType();\n\n /**\n * The meta object literal for the 'Type Name' attribute feature.\n * \n * \n * @generated\n */\n EAttribute DOC_ITEM_TYPE__TYPE_NAME = eINSTANCE.getDocItemType_TypeName();\n\n * The meta object literal for the 'Type' containment reference feature.\n EReference DOC_ITEM__TYPE = eINSTANCE.getDocItem_Type();\n * The meta object literal for the 'Name' attribute feature.\n EAttribute DOC_ITEM__NAME = eINSTANCE.getDocItem_Name();\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ModelTypeImpl Model Type}' class.\n * \n * \n * @see net.certware.intent.intentSpecification.impl.ModelTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelType()\n * @generated\n */\n EClass MODEL_TYPE = eINSTANCE.getModelType();\n\n /**\n * The meta object literal for the 'Type Name' attribute feature.\n * \n * \n * @generated\n */\n EAttribute MODEL_TYPE__TYPE_NAME = eINSTANCE.getModelType_TypeName();\n\n * The meta object literal for the 'Type' containment reference feature.\n EReference MODEL_ITEM__TYPE = eINSTANCE.getModelItem_Type();\n * The meta object literal for the 'Name' attribute feature.\n EAttribute MODEL_ITEM__NAME = eINSTANCE.getModelItem_Name();\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ListItemTypeImpl List Item Type}' class.\n * \n * \n * @see net.certware.intent.intentSpecification.impl.ListItemTypeImpl\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItemType()\n * @generated\n */\n EClass LIST_ITEM_TYPE = eINSTANCE.getListItemType();\n\n /**\n * The meta object literal for the 'Type Name' attribute feature.\n * \n * \n * @generated\n */\n EAttribute LIST_ITEM_TYPE__TYPE_NAME = eINSTANCE.getListItemType_TypeName();\n\n * The meta object literal for the 'Type' containment reference feature.\n EReference LIST_ITEM__TYPE = eINSTANCE.getListItem_Type();\n * The meta object literal for the 'Name' attribute feature.\n EAttribute LIST_ITEM__NAME = eINSTANCE.getListItem_Name();","new_methods":[],"old_code":" * The feature id for the 'Id' attribute.\n int SPECIFICATION__ID = 0;\n * The feature id for the 'Id' attribute.\n int REFINEMENT__ID = 0;\n * The feature id for the 'Type' attribute.\n * The feature id for the 'Id' attribute.\n int INTENT__ID = 1;\n int DECOMPOSITION = 3;\n * The feature id for the 'Type' attribute.\n * The feature id for the 'Id' attribute.\n int DECOMPOSITION__ID = 1;\n int DOCUMENT = 4;\n int DOC_ITEM = 5;\n * The feature id for the 'Type' attribute.\n * The feature id for the 'Id' attribute.\n int DOC_ITEM__ID = 1;\n int MODEL_ITEM = 6;\n * The feature id for the 'Type' attribute.\n * The feature id for the 'Id' attribute.\n int MODEL_ITEM__ID = 1;\n int LIST_ITEM = 7;\n * The feature id for the 'Type' attribute.\n * The feature id for the 'Id' attribute.\n int LIST_ITEM__ID = 1;\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Specification#getId Id}'.\n * @return the meta object for the attribute 'Id'.\n * @see net.certware.intent.intentSpecification.Specification#getId()\n EAttribute getSpecification_Id();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getId Id}'.\n * @return the meta object for the attribute 'Id'.\n * @see net.certware.intent.intentSpecification.Refinement#getId()\n EAttribute getRefinement_Id();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getType Type}'.\n * @return the meta object for the attribute 'Type'.\n EAttribute getIntent_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getId Id}'.\n * @return the meta object for the attribute 'Id'.\n * @see net.certware.intent.intentSpecification.Intent#getId()\n EAttribute getIntent_Id();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}'.\n * @return the meta object for the attribute 'Type'.\n EAttribute getDecomposition_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getId Id}'.\n * @return the meta object for the attribute 'Id'.\n * @see net.certware.intent.intentSpecification.Decomposition#getId()\n EAttribute getDecomposition_Id();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getType Type}'.\n * @return the meta object for the attribute 'Type'.\n EAttribute getDocItem_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getId Id}'.\n * @return the meta object for the attribute 'Id'.\n * @see net.certware.intent.intentSpecification.DocItem#getId()\n EAttribute getDocItem_Id();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}'.\n * @return the meta object for the attribute 'Type'.\n EAttribute getModelItem_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getId Id}'.\n * @return the meta object for the attribute 'Id'.\n * @see net.certware.intent.intentSpecification.ModelItem#getId()\n EAttribute getModelItem_Id();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getType Type}'.\n * @return the meta object for the attribute 'Type'.\n EAttribute getListItem_Type();\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getId Id}'.\n * @return the meta object for the attribute 'Id'.\n * @see net.certware.intent.intentSpecification.ListItem#getId()\n EAttribute getListItem_Id();\n * The meta object literal for the 'Id' attribute feature.\n EAttribute SPECIFICATION__ID = eINSTANCE.getSpecification_Id();\n * The meta object literal for the 'Id' attribute feature.\n EAttribute REFINEMENT__ID = eINSTANCE.getRefinement_Id();\n * The meta object literal for the 'Type' attribute feature.\n EAttribute INTENT__TYPE = eINSTANCE.getIntent_Type();\n * The meta object literal for the 'Id' attribute feature.\n EAttribute INTENT__ID = eINSTANCE.getIntent_Id();\n * The meta object literal for the 'Type' attribute feature.\n EAttribute DECOMPOSITION__TYPE = eINSTANCE.getDecomposition_Type();\n * The meta object literal for the 'Id' attribute feature.\n EAttribute DECOMPOSITION__ID = eINSTANCE.getDecomposition_Id();\n * The meta object literal for the 'Type' attribute feature.\n EAttribute DOC_ITEM__TYPE = eINSTANCE.getDocItem_Type();\n * The meta object literal for the 'Id' attribute feature.\n EAttribute DOC_ITEM__ID = eINSTANCE.getDocItem_Id();\n * The meta object literal for the 'Type' attribute feature.\n EAttribute MODEL_ITEM__TYPE = eINSTANCE.getModelItem_Type();\n * The meta object literal for the 'Id' attribute feature.\n EAttribute MODEL_ITEM__ID = eINSTANCE.getModelItem_Id();\n * The meta object literal for the 'Type' attribute feature.\n EAttribute LIST_ITEM__TYPE = eINSTANCE.getListItem_Type();\n * The meta object literal for the 'Id' attribute feature.\n EAttribute LIST_ITEM__ID = eINSTANCE.getListItem_Id();","old_methods":[],"patch":"@@ -67,13 +67,13 @@ public interface IntentSpecificationPackage extends EPackage\n int SPECIFICATION = 0;\n \n /**\n- * The feature id for the 'Id' attribute.\n+ * The feature id for the 'Name' attribute.\n * \n * \n * @generated\n * @ordered\n */\n- int SPECIFICATION__ID = 0;\n+ int SPECIFICATION__NAME = 0;\n \n /**\n * The feature id for the 'Refinements' containment reference list.\n@@ -104,13 +104,13 @@ public interface IntentSpecificationPackage extends EPackage\n int REFINEMENT = 1;\n \n /**\n- * The feature id for the 'Id' attribute.\n+ * The feature id for the 'Name' attribute.\n * \n * \n * @generated\n * @ordered\n */\n- int REFINEMENT__ID = 0;\n+ int REFINEMENT__NAME = 0;\n \n /**\n * The feature id for the 'Desc' attribute.\n@@ -150,7 +150,7 @@ public interface IntentSpecificationPackage extends EPackage\n int INTENT = 2;\n \n /**\n- * The feature id for the 'Type' attribute.\n+ * The feature id for the 'Type' containment reference.\n * \n * \n * @generated\n@@ -159,13 +159,13 @@ public interface IntentSpecificationPackage extends EPackage\n int INTENT__TYPE = 0;\n \n /**\n- * The feature id for the 'Id' attribute.\n+ * The feature id for the 'Name' attribute.\n * \n * \n * @generated\n * @ordered\n */\n- int INTENT__ID = 1;\n+ int INTENT__NAME = 1;\n \n /**\n * The feature id for the 'Desc' attribute.\n@@ -194,6 +194,34 @@ public interface IntentSpecificationPackage extends EPackage\n */\n int INTENT_FEATURE_COUNT = 4;\n \n+ /**\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.IntentTypeImpl Intent Type}' class.\n+ * \n+ * \n+ * @see net.certware.intent.intentSpecification.impl.IntentTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getIntentType()\n+ * @generated\n+ */\n+ int INTENT_TYPE = 3;\n+\n+ /**\n+ * The feature id for the 'Type Name' attribute.\n+ * \n+ * \n+ * @generated\n+ * @ordered\n+ */\n+ int INTENT_TYPE__TYPE_NAME = 0;\n+\n+ /**\n+ * The number of structural features of the 'Intent Type' class.\n+ * \n+ * \n+ * @generated\n+ * @ordered\n+ */\n+ int INTENT_TYPE_FEATURE_COUNT = 1;\n+\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DecompositionImpl Decomposition}' class.\n * \n@@ -202,10 +230,10 @@ public interface IntentSpecificationPackage extends EPackage\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecomposition()\n * @generated\n */\n- int DECOMPOSITION = 3;\n+ int DECOMPOSITION = 4;\n \n /**\n- * The feature id for the 'Type' attribute.\n+ * The feature id for the 'Type' containment reference.\n * \n * \n * @generated\n@@ -214,13 +242,13 @@ public interface IntentSpecificationPackage extends EPackage\n int DECOMPOSITION__TYPE = 0;\n \n /**\n- * The feature id for the 'Id' attribute.\n+ * The feature id for the 'Name' attribute.\n * \n * \n * @generated\n * @ordered\n */\n- int DECOMPOSITION__ID = 1;\n+ int DECOMPOSITION__NAME = 1;\n \n /**\n * The feature id for the 'Desc' attribute.\n@@ -267,6 +295,34 @@ public interface IntentSpecificationPackage extends EPackage\n */\n int DECOMPOSITION_FEATURE_COUNT = 6;\n \n+ /**\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DecompositionTypeImpl Decomposition Type}' class.\n+ * \n+ * \n+ * @see net.certware.intent.intentSpecification.impl.DecompositionTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecompositionType()\n+ * @generated\n+ */\n+ int DECOMPOSITION_TYPE = 5;\n+\n+ /**\n+ * The feature id for the 'Type Name' attribute.\n+ * \n+ * \n+ * @generated\n+ * @ordered\n+ */\n+ int DECOMPOSITION_TYPE__TYPE_NAME = 0;\n+\n+ /**\n+ * The number of structural features of the 'Decomposition Type' class.\n+ * \n+ * \n+ * @generated\n+ * @ordered\n+ */\n+ int DECOMPOSITION_TYPE_FEATURE_COUNT = 1;\n+\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DocumentImpl Document}' class.\n * \n@@ -275,7 +331,7 @@ public interface IntentSpecificationPackage extends EPackage\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocument()\n * @generated\n */\n- int DOCUMENT = 4;\n+ int DOCUMENT = 6;\n \n /**\n * The feature id for the 'Entries' containment reference list.\n@@ -295,6 +351,34 @@ public interface IntentSpecificationPackage extends EPackage\n */\n int DOCUMENT_FEATURE_COUNT = 1;\n \n+ /**\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DocItemTypeImpl Doc Item Type}' class.\n+ * \n+ * \n+ * @see net.certware.intent.intentSpecification.impl.DocItemTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItemType()\n+ * @generated\n+ */\n+ int DOC_ITEM_TYPE = 7;\n+\n+ /**\n+ * The feature id for the 'Type Name' attribute.\n+ * \n+ * \n+ * @generated\n+ * @ordered\n+ */\n+ int DOC_ITEM_TYPE__TYPE_NAME = 0;\n+\n+ /**\n+ * The number of structural features of the 'Doc Item Type' class.\n+ * \n+ * \n+ * @generated\n+ * @ordered\n+ */\n+ int DOC_ITEM_TYPE_FEATURE_COUNT = 1;\n+\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DocItemImpl Doc Item}' class.\n * \n@@ -303,10 +387,10 @@ public interface IntentSpecificationPackage extends EPackage\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItem()\n * @generated\n */\n- int DOC_ITEM = 5;\n+ int DOC_ITEM = 8;\n \n /**\n- * The feature id for the 'Type' attribute.\n+ * The feature id for the 'Type' containment reference.\n * \n * \n * @generated\n@@ -315,13 +399,13 @@ public interface IntentSpecificationPackage extends EPackage\n int DOC_ITEM__TYPE = 0;\n \n /**\n- * The feature id for the 'Id' attribute.\n+ * The feature id for the 'Name' attribute.\n * \n * \n * @generated\n * @ordered\n */\n- int DOC_ITEM__ID = 1;\n+ int DOC_ITEM__NAME = 1;\n \n /**\n * The feature id for the 'Ref' attribute.\n@@ -341,6 +425,34 @@ public interface IntentSpecificationPackage extends EPackage\n */\n int DOC_ITEM_FEATURE_COUNT = 3;\n \n+ /**\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ModelTypeImpl Model Type}' class.\n+ * \n+ * \n+ * @see net.certware.intent.intentSpecification.impl.ModelTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelType()\n+ * @generated\n+ */\n+ int MODEL_TYPE = 9;\n+\n+ /**\n+ * The feature id for the 'Type Name' attribute.\n+ * \n+ * \n+ * @generated\n+ * @ordered\n+ */\n+ int MODEL_TYPE__TYPE_NAME = 0;\n+\n+ /**\n+ * The number of structural features of the 'Model Type' class.\n+ * \n+ * \n+ * @generated\n+ * @ordered\n+ */\n+ int MODEL_TYPE_FEATURE_COUNT = 1;\n+\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ModelItemImpl Model Item}' class.\n * \n@@ -349,10 +461,10 @@ public interface IntentSpecificationPackage extends EPackage\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelItem()\n * @generated\n */\n- int MODEL_ITEM = 6;\n+ int MODEL_ITEM = 10;\n \n /**\n- * The feature id for the 'Type' attribute.\n+ * The feature id for the 'Type' containment reference.\n * \n * \n * @generated\n@@ -361,13 +473,13 @@ public interface IntentSpecificationPackage extends EPackage\n int MODEL_ITEM__TYPE = 0;\n \n /**\n- * The feature id for the 'Id' attribute.\n+ * The feature id for the 'Name' attribute.\n * \n * \n * @generated\n * @ordered\n */\n- int MODEL_ITEM__ID = 1;\n+ int MODEL_ITEM__NAME = 1;\n \n /**\n * The feature id for the 'Desc' attribute.\n@@ -387,6 +499,34 @@ public interface IntentSpecificationPackage extends EPackage\n */\n int MODEL_ITEM_FEATURE_COUNT = 3;\n \n+ /**\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ListItemTypeImpl List Item Type}' class.\n+ * \n+ * \n+ * @see net.certware.intent.intentSpecification.impl.ListItemTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItemType()\n+ * @generated\n+ */\n+ int LIST_ITEM_TYPE = 11;\n+\n+ /**\n+ * The feature id for the 'Type Name' attribute.\n+ * \n+ * \n+ * @generated\n+ * @ordered\n+ */\n+ int LIST_ITEM_TYPE__TYPE_NAME = 0;\n+\n+ /**\n+ * The number of structural features of the 'List Item Type' class.\n+ * \n+ * \n+ * @generated\n+ * @ordered\n+ */\n+ int LIST_ITEM_TYPE_FEATURE_COUNT = 1;\n+\n /**\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ListItemImpl List Item}' class.\n * \n@@ -395,10 +535,10 @@ public interface IntentSpecificationPackage extends EPackage\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItem()\n * @generated\n */\n- int LIST_ITEM = 7;\n+ int LIST_ITEM = 12;\n \n /**\n- * The feature id for the 'Type' attribute.\n+ * The feature id for the 'Type' containment reference.\n * \n * \n * @generated\n@@ -407,13 +547,13 @@ public interface IntentSpecificationPackage extends EPackage\n int LIST_ITEM__TYPE = 0;\n \n /**\n- * The feature id for the 'Id' attribute.\n+ * The feature id for the 'Name' attribute.\n * \n * \n * @generated\n * @ordered\n */\n- int LIST_ITEM__ID = 1;\n+ int LIST_ITEM__NAME = 1;\n \n /**\n * The feature id for the 'Desc' attribute.\n@@ -472,15 +612,15 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getSpecification();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Specification#getId Id}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Specification#getName Name}'.\n * \n * \n- * @return the meta object for the attribute 'Id'.\n- * @see net.certware.intent.intentSpecification.Specification#getId()\n+ * @return the meta object for the attribute 'Name'.\n+ * @see net.certware.intent.intentSpecification.Specification#getName()\n * @see #getSpecification()\n * @generated\n */\n- EAttribute getSpecification_Id();\n+ EAttribute getSpecification_Name();\n \n /**\n * Returns the meta object for the containment reference list '{@link net.certware.intent.intentSpecification.Specification#getRefinements Refinements}'.\n@@ -504,15 +644,15 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getRefinement();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getId Id}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getName Name}'.\n * \n * \n- * @return the meta object for the attribute 'Id'.\n- * @see net.certware.intent.intentSpecification.Refinement#getId()\n+ * @return the meta object for the attribute 'Name'.\n+ * @see net.certware.intent.intentSpecification.Refinement#getName()\n * @see #getRefinement()\n * @generated\n */\n- EAttribute getRefinement_Id();\n+ EAttribute getRefinement_Name();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getDesc Desc}'.\n@@ -547,26 +687,26 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getIntent();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getType Type}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.Intent#getType Type}'.\n * \n * \n- * @return the meta object for the attribute 'Type'.\n+ * @return the meta object for the containment reference 'Type'.\n * @see net.certware.intent.intentSpecification.Intent#getType()\n * @see #getIntent()\n * @generated\n */\n- EAttribute getIntent_Type();\n+ EReference getIntent_Type();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getId Id}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getName Name}'.\n * \n * \n- * @return the meta object for the attribute 'Id'.\n- * @see net.certware.intent.intentSpecification.Intent#getId()\n+ * @return the meta object for the attribute 'Name'.\n+ * @see net.certware.intent.intentSpecification.Intent#getName()\n * @see #getIntent()\n * @generated\n */\n- EAttribute getIntent_Id();\n+ EAttribute getIntent_Name();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getDesc Desc}'.\n@@ -590,6 +730,27 @@ public interface IntentSpecificationPackage extends EPackage\n */\n EReference getIntent_Decompositions();\n \n+ /**\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.IntentType Intent Type}'.\n+ * \n+ * \n+ * @return the meta object for class 'Intent Type'.\n+ * @see net.certware.intent.intentSpecification.IntentType\n+ * @generated\n+ */\n+ EClass getIntentType();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.IntentType#getTypeName Type Name}'.\n+ * \n+ * \n+ * @return the meta object for the attribute 'Type Name'.\n+ * @see net.certware.intent.intentSpecification.IntentType#getTypeName()\n+ * @see #getIntentType()\n+ * @generated\n+ */\n+ EAttribute getIntentType_TypeName();\n+\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.Decomposition Decomposition}'.\n * \n@@ -601,26 +762,26 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getDecomposition();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}'.\n * \n * \n- * @return the meta object for the attribute 'Type'.\n+ * @return the meta object for the containment reference 'Type'.\n * @see net.certware.intent.intentSpecification.Decomposition#getType()\n * @see #getDecomposition()\n * @generated\n */\n- EAttribute getDecomposition_Type();\n+ EReference getDecomposition_Type();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getId Id}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getName Name}'.\n * \n * \n- * @return the meta object for the attribute 'Id'.\n- * @see net.certware.intent.intentSpecification.Decomposition#getId()\n+ * @return the meta object for the attribute 'Name'.\n+ * @see net.certware.intent.intentSpecification.Decomposition#getName()\n * @see #getDecomposition()\n * @generated\n */\n- EAttribute getDecomposition_Id();\n+ EAttribute getDecomposition_Name();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getDesc Desc}'.\n@@ -666,6 +827,27 @@ public interface IntentSpecificationPackage extends EPackage\n */\n EReference getDecomposition_Items();\n \n+ /**\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DecompositionType Decomposition Type}'.\n+ * \n+ * \n+ * @return the meta object for class 'Decomposition Type'.\n+ * @see net.certware.intent.intentSpecification.DecompositionType\n+ * @generated\n+ */\n+ EClass getDecompositionType();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DecompositionType#getTypeName Type Name}'.\n+ * \n+ * \n+ * @return the meta object for the attribute 'Type Name'.\n+ * @see net.certware.intent.intentSpecification.DecompositionType#getTypeName()\n+ * @see #getDecompositionType()\n+ * @generated\n+ */\n+ EAttribute getDecompositionType_TypeName();\n+\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.Document Document}'.\n * \n@@ -687,6 +869,27 @@ public interface IntentSpecificationPackage extends EPackage\n */\n EReference getDocument_Entries();\n \n+ /**\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DocItemType Doc Item Type}'.\n+ * \n+ * \n+ * @return the meta object for class 'Doc Item Type'.\n+ * @see net.certware.intent.intentSpecification.DocItemType\n+ * @generated\n+ */\n+ EClass getDocItemType();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItemType#getTypeName Type Name}'.\n+ * \n+ * \n+ * @return the meta object for the attribute 'Type Name'.\n+ * @see net.certware.intent.intentSpecification.DocItemType#getTypeName()\n+ * @see #getDocItemType()\n+ * @generated\n+ */\n+ EAttribute getDocItemType_TypeName();\n+\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DocItem Doc Item}'.\n * \n@@ -698,26 +901,26 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getDocItem();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getType Type}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.DocItem#getType Type}'.\n * \n * \n- * @return the meta object for the attribute 'Type'.\n+ * @return the meta object for the containment reference 'Type'.\n * @see net.certware.intent.intentSpecification.DocItem#getType()\n * @see #getDocItem()\n * @generated\n */\n- EAttribute getDocItem_Type();\n+ EReference getDocItem_Type();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getId Id}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getName Name}'.\n * \n * \n- * @return the meta object for the attribute 'Id'.\n- * @see net.certware.intent.intentSpecification.DocItem#getId()\n+ * @return the meta object for the attribute 'Name'.\n+ * @see net.certware.intent.intentSpecification.DocItem#getName()\n * @see #getDocItem()\n * @generated\n */\n- EAttribute getDocItem_Id();\n+ EAttribute getDocItem_Name();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getRef Ref}'.\n@@ -730,6 +933,27 @@ public interface IntentSpecificationPackage extends EPackage\n */\n EAttribute getDocItem_Ref();\n \n+ /**\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ModelType Model Type}'.\n+ * \n+ * \n+ * @return the meta object for class 'Model Type'.\n+ * @see net.certware.intent.intentSpecification.ModelType\n+ * @generated\n+ */\n+ EClass getModelType();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelType#getTypeName Type Name}'.\n+ * \n+ * \n+ * @return the meta object for the attribute 'Type Name'.\n+ * @see net.certware.intent.intentSpecification.ModelType#getTypeName()\n+ * @see #getModelType()\n+ * @generated\n+ */\n+ EAttribute getModelType_TypeName();\n+\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ModelItem Model Item}'.\n * \n@@ -741,26 +965,26 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getModelItem();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}'.\n * \n * \n- * @return the meta object for the attribute 'Type'.\n+ * @return the meta object for the containment reference 'Type'.\n * @see net.certware.intent.intentSpecification.ModelItem#getType()\n * @see #getModelItem()\n * @generated\n */\n- EAttribute getModelItem_Type();\n+ EReference getModelItem_Type();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getId Id}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getName Name}'.\n * \n * \n- * @return the meta object for the attribute 'Id'.\n- * @see net.certware.intent.intentSpecification.ModelItem#getId()\n+ * @return the meta object for the attribute 'Name'.\n+ * @see net.certware.intent.intentSpecification.ModelItem#getName()\n * @see #getModelItem()\n * @generated\n */\n- EAttribute getModelItem_Id();\n+ EAttribute getModelItem_Name();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getDesc Desc}'.\n@@ -773,6 +997,27 @@ public interface IntentSpecificationPackage extends EPackage\n */\n EAttribute getModelItem_Desc();\n \n+ /**\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ListItemType List Item Type}'.\n+ * \n+ * \n+ * @return the meta object for class 'List Item Type'.\n+ * @see net.certware.intent.intentSpecification.ListItemType\n+ * @generated\n+ */\n+ EClass getListItemType();\n+\n+ /**\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItemType#getTypeName Type Name}'.\n+ * \n+ * \n+ * @return the meta object for the attribute 'Type Name'.\n+ * @see net.certware.intent.intentSpecification.ListItemType#getTypeName()\n+ * @see #getListItemType()\n+ * @generated\n+ */\n+ EAttribute getListItemType_TypeName();\n+\n /**\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ListItem List Item}'.\n * \n@@ -784,26 +1029,26 @@ public interface IntentSpecificationPackage extends EPackage\n EClass getListItem();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getType Type}'.\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.ListItem#getType Type}'.\n * \n * \n- * @return the meta object for the attribute 'Type'.\n+ * @return the meta object for the containment reference 'Type'.\n * @see net.certware.intent.intentSpecification.ListItem#getType()\n * @see #getListItem()\n * @generated\n */\n- EAttribute getListItem_Type();\n+ EReference getListItem_Type();\n \n /**\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getId Id}'.\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getName Name}'.\n * \n * \n- * @return the meta object for the attribute 'Id'.\n- * @see net.certware.intent.intentSpecification.ListItem#getId()\n+ * @return the meta object for the attribute 'Name'.\n+ * @see net.certware.intent.intentSpecification.ListItem#getName()\n * @see #getListItem()\n * @generated\n */\n- EAttribute getListItem_Id();\n+ EAttribute getListItem_Name();\n \n /**\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getDesc Desc}'.\n@@ -883,12 +1128,12 @@ interface Literals\n EClass SPECIFICATION = eINSTANCE.getSpecification();\n \n /**\n- * The meta object literal for the 'Id' attribute feature.\n+ * The meta object literal for the 'Name' attribute feature.\n * \n * \n * @generated\n */\n- EAttribute SPECIFICATION__ID = eINSTANCE.getSpecification_Id();\n+ EAttribute SPECIFICATION__NAME = eINSTANCE.getSpecification_Name();\n \n /**\n * The meta object literal for the 'Refinements' containment reference list feature.\n@@ -909,12 +1154,12 @@ interface Literals\n EClass REFINEMENT = eINSTANCE.getRefinement();\n \n /**\n- * The meta object literal for the 'Id' attribute feature.\n+ * The meta object literal for the 'Name' attribute feature.\n * \n * \n * @generated\n */\n- EAttribute REFINEMENT__ID = eINSTANCE.getRefinement_Id();\n+ EAttribute REFINEMENT__NAME = eINSTANCE.getRefinement_Name();\n \n /**\n * The meta object literal for the 'Desc' attribute feature.\n@@ -943,20 +1188,20 @@ interface Literals\n EClass INTENT = eINSTANCE.getIntent();\n \n /**\n- * The meta object literal for the 'Type' attribute feature.\n+ * The meta object literal for the 'Type' containment reference feature.\n * \n * \n * @generated\n */\n- EAttribute INTENT__TYPE = eINSTANCE.getIntent_Type();\n+ EReference INTENT__TYPE = eINSTANCE.getIntent_Type();\n \n /**\n- * The meta object literal for the 'Id' attribute feature.\n+ * The meta object literal for the 'Name' attribute feature.\n * \n * \n * @generated\n */\n- EAttribute INTENT__ID = eINSTANCE.getIntent_Id();\n+ EAttribute INTENT__NAME = eINSTANCE.getIntent_Name();\n \n /**\n * The meta object literal for the 'Desc' attribute feature.\n@@ -974,6 +1219,24 @@ interface Literals\n */\n EReference INTENT__DECOMPOSITIONS = eINSTANCE.getIntent_Decompositions();\n \n+ /**\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.IntentTypeImpl Intent Type}' class.\n+ * \n+ * \n+ * @see net.certware.intent.intentSpecification.impl.IntentTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getIntentType()\n+ * @generated\n+ */\n+ EClass INTENT_TYPE = eINSTANCE.getIntentType();\n+\n+ /**\n+ * The meta object literal for the 'Type Name' attribute feature.\n+ * \n+ * \n+ * @generated\n+ */\n+ EAttribute INTENT_TYPE__TYPE_NAME = eINSTANCE.getIntentType_TypeName();\n+\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DecompositionImpl Decomposition}' class.\n * \n@@ -985,20 +1248,20 @@ interface Literals\n EClass DECOMPOSITION = eINSTANCE.getDecomposition();\n \n /**\n- * The meta object literal for the 'Type' attribute feature.\n+ * The meta object literal for the 'Type' containment reference feature.\n * \n * \n * @generated\n */\n- EAttribute DECOMPOSITION__TYPE = eINSTANCE.getDecomposition_Type();\n+ EReference DECOMPOSITION__TYPE = eINSTANCE.getDecomposition_Type();\n \n /**\n- * The meta object literal for the 'Id' attribute feature.\n+ * The meta object literal for the 'Name' attribute feature.\n * \n * \n * @generated\n */\n- EAttribute DECOMPOSITION__ID = eINSTANCE.getDecomposition_Id();\n+ EAttribute DECOMPOSITION__NAME = eINSTANCE.getDecomposition_Name();\n \n /**\n * The meta object literal for the 'Desc' attribute feature.\n@@ -1032,6 +1295,24 @@ interface Literals\n */\n EReference DECOMPOSITION__ITEMS = eINSTANCE.getDecomposition_Items();\n \n+ /**\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DecompositionTypeImpl Decomposition Type}' class.\n+ * \n+ * \n+ * @see net.certware.intent.intentSpecification.impl.DecompositionTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecompositionType()\n+ * @generated\n+ */\n+ EClass DECOMPOSITION_TYPE = eINSTANCE.getDecompositionType();\n+\n+ /**\n+ * The meta object literal for the 'Type Name' attribute feature.\n+ * \n+ * \n+ * @generated\n+ */\n+ EAttribute DECOMPOSITION_TYPE__TYPE_NAME = eINSTANCE.getDecompositionType_TypeName();\n+\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DocumentImpl Document}' class.\n * \n@@ -1050,6 +1331,24 @@ interface Literals\n */\n EReference DOCUMENT__ENTRIES = eINSTANCE.getDocument_Entries();\n \n+ /**\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DocItemTypeImpl Doc Item Type}' class.\n+ * \n+ * \n+ * @see net.certware.intent.intentSpecification.impl.DocItemTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItemType()\n+ * @generated\n+ */\n+ EClass DOC_ITEM_TYPE = eINSTANCE.getDocItemType();\n+\n+ /**\n+ * The meta object literal for the 'Type Name' attribute feature.\n+ * \n+ * \n+ * @generated\n+ */\n+ EAttribute DOC_ITEM_TYPE__TYPE_NAME = eINSTANCE.getDocItemType_TypeName();\n+\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DocItemImpl Doc Item}' class.\n * \n@@ -1061,20 +1360,20 @@ interface Literals\n EClass DOC_ITEM = eINSTANCE.getDocItem();\n \n /**\n- * The meta object literal for the 'Type' attribute feature.\n+ * The meta object literal for the 'Type' containment reference feature.\n * \n * \n * @generated\n */\n- EAttribute DOC_ITEM__TYPE = eINSTANCE.getDocItem_Type();\n+ EReference DOC_ITEM__TYPE = eINSTANCE.getDocItem_Type();\n \n /**\n- * The meta object literal for the 'Id' attribute feature.\n+ * The meta object literal for the 'Name' attribute feature.\n * \n * \n * @generated\n */\n- EAttribute DOC_ITEM__ID = eINSTANCE.getDocItem_Id();\n+ EAttribute DOC_ITEM__NAME = eINSTANCE.getDocItem_Name();\n \n /**\n * The meta object literal for the 'Ref' attribute feature.\n@@ -1084,6 +1383,24 @@ interface Literals\n */\n EAttribute DOC_ITEM__REF = eINSTANCE.getDocItem_Ref();\n \n+ /**\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ModelTypeImpl Model Type}' class.\n+ * \n+ * \n+ * @see net.certware.intent.intentSpecification.impl.ModelTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelType()\n+ * @generated\n+ */\n+ EClass MODEL_TYPE = eINSTANCE.getModelType();\n+\n+ /**\n+ * The meta object literal for the 'Type Name' attribute feature.\n+ * \n+ * \n+ * @generated\n+ */\n+ EAttribute MODEL_TYPE__TYPE_NAME = eINSTANCE.getModelType_TypeName();\n+\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ModelItemImpl Model Item}' class.\n * \n@@ -1095,20 +1412,20 @@ interface Literals\n EClass MODEL_ITEM = eINSTANCE.getModelItem();\n \n /**\n- * The meta object literal for the 'Type' attribute feature.\n+ * The meta object literal for the 'Type' containment reference feature.\n * \n * \n * @generated\n */\n- EAttribute MODEL_ITEM__TYPE = eINSTANCE.getModelItem_Type();\n+ EReference MODEL_ITEM__TYPE = eINSTANCE.getModelItem_Type();\n \n /**\n- * The meta object literal for the 'Id' attribute feature.\n+ * The meta object literal for the 'Name' attribute feature.\n * \n * \n * @generated\n */\n- EAttribute MODEL_ITEM__ID = eINSTANCE.getModelItem_Id();\n+ EAttribute MODEL_ITEM__NAME = eINSTANCE.getModelItem_Name();\n \n /**\n * The meta object literal for the 'Desc' attribute feature.\n@@ -1118,6 +1435,24 @@ interface Literals\n */\n EAttribute MODEL_ITEM__DESC = eINSTANCE.getModelItem_Desc();\n \n+ /**\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ListItemTypeImpl List Item Type}' class.\n+ * \n+ * \n+ * @see net.certware.intent.intentSpecification.impl.ListItemTypeImpl\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItemType()\n+ * @generated\n+ */\n+ EClass LIST_ITEM_TYPE = eINSTANCE.getListItemType();\n+\n+ /**\n+ * The meta object literal for the 'Type Name' attribute feature.\n+ * \n+ * \n+ * @generated\n+ */\n+ EAttribute LIST_ITEM_TYPE__TYPE_NAME = eINSTANCE.getListItemType_TypeName();\n+\n /**\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ListItemImpl List Item}' class.\n * \n@@ -1129,20 +1464,20 @@ interface Literals\n EClass LIST_ITEM = eINSTANCE.getListItem();\n \n /**\n- * The meta object literal for the 'Type' attribute feature.\n+ * The meta object literal for the 'Type' containment reference feature.\n * \n * \n * @generated\n */\n- EAttribute LIST_ITEM__TYPE = eINSTANCE.getListItem_Type();\n+ EReference LIST_ITEM__TYPE = eINSTANCE.getListItem_Type();\n \n /**\n- * The meta object literal for the 'Id' attribute feature.\n+ * The meta object literal for the 'Name' attribute feature.\n * \n * \n * @generated\n */\n- EAttribute LIST_ITEM__ID = eINSTANCE.getListItem_Id();\n+ EAttribute LIST_ITEM__NAME = eINSTANCE.getListItem_Name();\n \n /**\n * The meta object literal for the 'Desc' attribute feature.","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationPackage.java","sha":"fa6f0420fb0406fd2ff002cc9dae4f7f37d79ce5","status":"modified"},{"additions":20,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FListItem.java","changes":40,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FListItem.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":20,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/ListItem.java","new_code":" *
    • {@link net.certware.intent.intentSpecification.ListItem#getName Name}
      • \n * Returns the value of the 'Type' containment reference.\n * If the meaning of the 'Type' containment reference isn't clear,\n * @return the value of the 'Type' containment reference.\n * @see #setType(ListItemType)\n * @model containment=\"true\"\n ListItemType getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getType Type}' containment reference.\n * @param value the new value of the 'Type' containment reference.\n void setType(ListItemType value);\n * Returns the value of the 'Name' attribute.\n * If the meaning of the 'Name' attribute isn't clear,\n * @return the value of the 'Name' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getName Name}' attribute.\n * @param value the new value of the 'Name' attribute.\n * @see #getName()\n void setName(String value);","new_methods":[],"old_code":" *
    • {@link net.certware.intent.intentSpecification.ListItem#getId Id}
      • \n * Returns the value of the 'Type' attribute.\n * If the meaning of the 'Type' attribute isn't clear,\n * @return the value of the 'Type' attribute.\n * @see #setType(String)\n * @model\n String getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getType Type}' attribute.\n * @param value the new value of the 'Type' attribute.\n void setType(String value);\n * Returns the value of the 'Id' attribute.\n * If the meaning of the 'Id' attribute isn't clear,\n * @return the value of the 'Id' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getId Id}' attribute.\n * @param value the new value of the 'Id' attribute.\n * @see #getId()\n void setId(String value);","old_methods":[],"patch":"@@ -15,7 +15,7 @@\n * The following features are supported:\n *
        \n *
      • {@link net.certware.intent.intentSpecification.ListItem#getType Type}
        • \n- *
      • {@link net.certware.intent.intentSpecification.ListItem#getId Id}
        • \n+ *
      • {@link net.certware.intent.intentSpecification.ListItem#getName Name}
        • \n *
      • {@link net.certware.intent.intentSpecification.ListItem#getDesc Desc}
        • \n *
      • {@link net.certware.intent.intentSpecification.ListItem#getDocReferences Doc References}
        • \n *
      • {@link net.certware.intent.intentSpecification.ListItem#getItemReferences Item References}
        • \n@@ -30,56 +30,56 @@\n public interface ListItem extends EObject\n {\n /**\n- * Returns the value of the 'Type' attribute.\n+ * Returns the value of the 'Type' containment reference.\n * \n *

        \n- * If the meaning of the 'Type' attribute isn't clear,\n+ * If the meaning of the 'Type' containment reference isn't clear,\n * there really should be more of a description here...\n *

        \n * \n- * @return the value of the 'Type' attribute.\n- * @see #setType(String)\n+ * @return the value of the 'Type' containment reference.\n+ * @see #setType(ListItemType)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Type()\n- * @model\n+ * @model containment=\"true\"\n * @generated\n */\n- String getType();\n+ ListItemType getType();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getType Type}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getType Type}' containment reference.\n * \n * \n- * @param value the new value of the 'Type' attribute.\n+ * @param value the new value of the 'Type' containment reference.\n * @see #getType()\n * @generated\n */\n- void setType(String value);\n+ void setType(ListItemType value);\n \n /**\n- * Returns the value of the 'Id' attribute.\n+ * Returns the value of the 'Name' attribute.\n * \n *

        \n- * If the meaning of the 'Id' attribute isn't clear,\n+ * If the meaning of the 'Name' attribute isn't clear,\n * there really should be more of a description here...\n *

        \n * \n- * @return the value of the 'Id' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Id()\n+ * @return the value of the 'Name' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getId Id}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getName Name}' attribute.\n * \n * \n- * @param value the new value of the 'Id' attribute.\n- * @see #getId()\n+ * @param value the new value of the 'Name' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the 'Desc' attribute.","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FListItem.java","sha":"1e59d53484b55c601b11970d6803d0cc0e0f9204","status":"modified"},{"additions":20,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FModelItem.java","changes":40,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FModelItem.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":20,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/ModelItem.java","new_code":" *
      • {@link net.certware.intent.intentSpecification.ModelItem#getName Name}
        • \n * Returns the value of the 'Type' containment reference.\n * If the meaning of the 'Type' containment reference isn't clear,\n * @return the value of the 'Type' containment reference.\n * @see #setType(ModelType)\n * @model containment=\"true\"\n ModelType getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}' containment reference.\n * @param value the new value of the 'Type' containment reference.\n void setType(ModelType value);\n * Returns the value of the 'Name' attribute.\n * If the meaning of the 'Name' attribute isn't clear,\n * @return the value of the 'Name' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getName Name}' attribute.\n * @param value the new value of the 'Name' attribute.\n * @see #getName()\n void setName(String value);","new_methods":[],"old_code":" *
      • {@link net.certware.intent.intentSpecification.ModelItem#getId Id}
        • \n * Returns the value of the 'Type' attribute.\n * If the meaning of the 'Type' attribute isn't clear,\n * @return the value of the 'Type' attribute.\n * @see #setType(String)\n * @model\n String getType();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}' attribute.\n * @param value the new value of the 'Type' attribute.\n void setType(String value);\n * Returns the value of the 'Id' attribute.\n * If the meaning of the 'Id' attribute isn't clear,\n * @return the value of the 'Id' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getId Id}' attribute.\n * @param value the new value of the 'Id' attribute.\n * @see #getId()\n void setId(String value);","old_methods":[],"patch":"@@ -13,7 +13,7 @@\n * The following features are supported:\n *
          \n *
        • {@link net.certware.intent.intentSpecification.ModelItem#getType Type}
          • \n- *
        • {@link net.certware.intent.intentSpecification.ModelItem#getId Id}
          • \n+ *
        • {@link net.certware.intent.intentSpecification.ModelItem#getName Name}
          • \n *
        • {@link net.certware.intent.intentSpecification.ModelItem#getDesc Desc}
          • \n *
        \n *

        \n@@ -25,56 +25,56 @@\n public interface ModelItem extends EObject\n {\n /**\n- * Returns the value of the 'Type' attribute.\n+ * Returns the value of the 'Type' containment reference.\n * \n *

        \n- * If the meaning of the 'Type' attribute isn't clear,\n+ * If the meaning of the 'Type' containment reference isn't clear,\n * there really should be more of a description here...\n *

        \n * \n- * @return the value of the 'Type' attribute.\n- * @see #setType(String)\n+ * @return the value of the 'Type' containment reference.\n+ * @see #setType(ModelType)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Type()\n- * @model\n+ * @model containment=\"true\"\n * @generated\n */\n- String getType();\n+ ModelType getType();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}' containment reference.\n * \n * \n- * @param value the new value of the 'Type' attribute.\n+ * @param value the new value of the 'Type' containment reference.\n * @see #getType()\n * @generated\n */\n- void setType(String value);\n+ void setType(ModelType value);\n \n /**\n- * Returns the value of the 'Id' attribute.\n+ * Returns the value of the 'Name' attribute.\n * \n *

        \n- * If the meaning of the 'Id' attribute isn't clear,\n+ * If the meaning of the 'Name' attribute isn't clear,\n * there really should be more of a description here...\n *

        \n * \n- * @return the value of the 'Id' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Id()\n+ * @return the value of the 'Name' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getId Id}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getName Name}' attribute.\n * \n * \n- * @param value the new value of the 'Id' attribute.\n- * @see #getId()\n+ * @param value the new value of the 'Name' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the 'Desc' attribute.","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FModelItem.java","sha":"6515c20f33eaa74279f6ee4750ff83d794b16a3e","status":"modified"},{"additions":11,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FRefinement.java","changes":22,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FRefinement.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":11,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/Refinement.java","new_code":" *
      • {@link net.certware.intent.intentSpecification.Refinement#getName Name}
        • \n * Returns the value of the 'Name' attribute.\n * If the meaning of the 'Name' attribute isn't clear,\n * @return the value of the 'Name' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getRefinement_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Refinement#getName Name}' attribute.\n * @param value the new value of the 'Name' attribute.\n * @see #getName()\n void setName(String value);","new_methods":[],"old_code":" *
      • {@link net.certware.intent.intentSpecification.Refinement#getId Id}
        • \n * Returns the value of the 'Id' attribute.\n * If the meaning of the 'Id' attribute isn't clear,\n * @return the value of the 'Id' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getRefinement_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Refinement#getId Id}' attribute.\n * @param value the new value of the 'Id' attribute.\n * @see #getId()\n void setId(String value);","old_methods":[],"patch":"@@ -14,7 +14,7 @@\n *

        \n * The following features are supported:\n *

          \n- *
        • {@link net.certware.intent.intentSpecification.Refinement#getId Id}
          • \n+ *
        • {@link net.certware.intent.intentSpecification.Refinement#getName Name}
          • \n *
        • {@link net.certware.intent.intentSpecification.Refinement#getDesc Desc}
          • \n *
        • {@link net.certware.intent.intentSpecification.Refinement#getIntents Intents}
          • \n *
        \n@@ -27,30 +27,30 @@\n public interface Refinement extends EObject\n {\n /**\n- * Returns the value of the 'Id' attribute.\n+ * Returns the value of the 'Name' attribute.\n * \n *

        \n- * If the meaning of the 'Id' attribute isn't clear,\n+ * If the meaning of the 'Name' attribute isn't clear,\n * there really should be more of a description here...\n *

        \n * \n- * @return the value of the 'Id' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getRefinement_Id()\n+ * @return the value of the 'Name' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getRefinement_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Refinement#getId Id}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Refinement#getName Name}' attribute.\n * \n * \n- * @param value the new value of the 'Id' attribute.\n- * @see #getId()\n+ * @param value the new value of the 'Name' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the 'Desc' attribute.","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FRefinement.java","sha":"1d9d3af033b6e5d4df49bc08cac78021b388aa7b","status":"modified"},{"additions":11,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FSpecification.java","changes":22,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FSpecification.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":11,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/Specification.java","new_code":" *
      • {@link net.certware.intent.intentSpecification.Specification#getName Name}
        • \n * Returns the value of the 'Name' attribute.\n * If the meaning of the 'Name' attribute isn't clear,\n * @return the value of the 'Name' attribute.\n * @see #setName(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getSpecification_Name()\n String getName();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Specification#getName Name}' attribute.\n * @param value the new value of the 'Name' attribute.\n * @see #getName()\n void setName(String value);","new_methods":[],"old_code":" *
      • {@link net.certware.intent.intentSpecification.Specification#getId Id}
        • \n * Returns the value of the 'Id' attribute.\n * If the meaning of the 'Id' attribute isn't clear,\n * @return the value of the 'Id' attribute.\n * @see #setId(String)\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getSpecification_Id()\n String getId();\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Specification#getId Id}' attribute.\n * @param value the new value of the 'Id' attribute.\n * @see #getId()\n void setId(String value);","old_methods":[],"patch":"@@ -14,7 +14,7 @@\n *

        \n * The following features are supported:\n *

          \n- *
        • {@link net.certware.intent.intentSpecification.Specification#getId Id}
          • \n+ *
        • {@link net.certware.intent.intentSpecification.Specification#getName Name}
          • \n *
        • {@link net.certware.intent.intentSpecification.Specification#getRefinements Refinements}
          • \n *
        \n *

        \n@@ -26,30 +26,30 @@\n public interface Specification extends EObject\n {\n /**\n- * Returns the value of the 'Id' attribute.\n+ * Returns the value of the 'Name' attribute.\n * \n *

        \n- * If the meaning of the 'Id' attribute isn't clear,\n+ * If the meaning of the 'Name' attribute isn't clear,\n * there really should be more of a description here...\n *

        \n * \n- * @return the value of the 'Id' attribute.\n- * @see #setId(String)\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getSpecification_Id()\n+ * @return the value of the 'Name' attribute.\n+ * @see #setName(String)\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getSpecification_Name()\n * @model\n * @generated\n */\n- String getId();\n+ String getName();\n \n /**\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Specification#getId Id}' attribute.\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Specification#getName Name}' attribute.\n * \n * \n- * @param value the new value of the 'Id' attribute.\n- * @see #getId()\n+ * @param value the new value of the 'Name' attribute.\n+ * @see #getName()\n * @generated\n */\n- void setId(String value);\n+ void setName(String value);\n \n /**\n * Returns the value of the 'Refinements' containment reference list.","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FSpecification.java","sha":"71f6a8f6d515198d0585dd974691752bbbc83c76","status":"modified"},{"additions":60,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDecompositionImpl.java","changes":104,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDecompositionImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":44,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/DecompositionImpl.java","new_code":"import net.certware.intent.intentSpecification.DecompositionType;\n *
      • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getName Name}
        • \n * The cached value of the '{@link #getType() Type}' containment reference.\n protected DecompositionType type;\n * The default value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public DecompositionType getType()\n public NotificationChain basicSetType(DecompositionType newType, NotificationChain msgs)\n DecompositionType oldType = type;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, oldType, newType);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setType(DecompositionType newType)\n if (newType != type)\n {\n NotificationChain msgs = null;\n if (type != null)\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DECOMPOSITION__TYPE, null, msgs);\n if (newType != null)\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DECOMPOSITION__TYPE, null, msgs);\n msgs = basicSetType(newType, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, newType, newType));\n }\n\n /**\n * \n * \n * @generated\n */\n public String getName()\n {\n return name;\n public void setName(String newName)\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__NAME, oldName, name));\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\n return basicSetType(null, msgs);\n case IntentSpecificationPackage.DECOMPOSITION__NAME:\n return getName();\n setType((DecompositionType)newValue);\n case IntentSpecificationPackage.DECOMPOSITION__NAME:\n setName((String)newValue);\n setType((DecompositionType)null);\n case IntentSpecificationPackage.DECOMPOSITION__NAME:\n setName(NAME_EDEFAULT);\n return type != null;\n case IntentSpecificationPackage.DECOMPOSITION__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);","new_methods":[],"old_code":" *
      • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getId Id}
        • \n * The default value of the '{@link #getType() Type}' attribute.\n protected static final String TYPE_EDEFAULT = null;\n * The cached value of the '{@link #getType() Type}' attribute.\n * @see #getType()\n protected String type = TYPE_EDEFAULT;\n * The default value of the '{@link #getId() Id}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getId() Id}' attribute.\n * \n * \n * @see #getId()\n * @generated\n * @ordered\n */\n protected String id = ID_EDEFAULT;\n public String getType()\n public void setType(String newType)\n String oldType = type;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, oldType, type));\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__ID, oldId, id));\n case IntentSpecificationPackage.DECOMPOSITION__ID:\n return getId();\n setType((String)newValue);\n case IntentSpecificationPackage.DECOMPOSITION__ID:\n setId((String)newValue);\n setType(TYPE_EDEFAULT);\n case IntentSpecificationPackage.DECOMPOSITION__ID:\n setId(ID_EDEFAULT);\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n case IntentSpecificationPackage.DECOMPOSITION__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (type: \");\n result.append(type);\n result.append(\", id: \");\n result.append(id);","old_methods":[],"patch":"@@ -5,6 +5,7 @@\n import java.util.Collection;\n \n import net.certware.intent.intentSpecification.Decomposition;\n+import net.certware.intent.intentSpecification.DecompositionType;\n import net.certware.intent.intentSpecification.Document;\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n import net.certware.intent.intentSpecification.ListItem;\n@@ -32,7 +33,7 @@\n * The following features are implemented:\n *
          \n *
        • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getType Type}
          • \n- *
        • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getId Id}
          • \n+ *
        • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getName Name}
          • \n *
        • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getDesc Desc}
          • \n *
        • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getDocuments Documents}
          • \n *
        • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getModels Models}
          • \n@@ -45,44 +46,34 @@\n public class DecompositionImpl extends MinimalEObjectImpl.Container implements Decomposition\n {\n /**\n- * The default value of the '{@link #getType() Type}' attribute.\n+ * The cached value of the '{@link #getType() Type}' containment reference.\n * \n * \n * @see #getType()\n * @generated\n * @ordered\n */\n- protected static final String TYPE_EDEFAULT = null;\n+ protected DecompositionType type;\n \n /**\n- * The cached value of the '{@link #getType() Type}' attribute.\n+ * The default value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getType()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String type = TYPE_EDEFAULT;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The default value of the '{@link #getId() Id}' attribute.\n+ * The cached value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getId() Id}' attribute.\n- * \n- * \n- * @see #getId()\n- * @generated\n- * @ordered\n- */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The default value of the '{@link #getDesc() Desc}' attribute.\n@@ -160,7 +151,7 @@ protected EClass eStaticClass()\n * \n * @generated\n */\n- public String getType()\n+ public DecompositionType getType()\n {\n return type;\n }\n@@ -170,35 +161,60 @@ public String getType()\n * \n * @generated\n */\n- public void setType(String newType)\n+ public NotificationChain basicSetType(DecompositionType newType, NotificationChain msgs)\n {\n- String oldType = type;\n+ DecompositionType oldType = type;\n type = newType;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, oldType, type));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, oldType, newType);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * \n * \n * @generated\n */\n- public String getId()\n+ public void setType(DecompositionType newType)\n {\n- return id;\n+ if (newType != type)\n+ {\n+ NotificationChain msgs = null;\n+ if (type != null)\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DECOMPOSITION__TYPE, null, msgs);\n+ if (newType != null)\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DECOMPOSITION__TYPE, null, msgs);\n+ msgs = basicSetType(newType, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, newType, newType));\n+ }\n+\n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public String getName()\n+ {\n+ return name;\n }\n \n /**\n * \n * \n * @generated\n */\n- public void setId(String newId)\n+ public void setName(String newName)\n {\n- String oldId = id;\n- id = newId;\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__NAME, oldName, name));\n }\n \n /**\n@@ -276,6 +292,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,\n {\n switch (featureID)\n {\n+ case IntentSpecificationPackage.DECOMPOSITION__TYPE:\n+ return basicSetType(null, msgs);\n case IntentSpecificationPackage.DECOMPOSITION__DOCUMENTS:\n return ((InternalEList)getDocuments()).basicRemove(otherEnd, msgs);\n case IntentSpecificationPackage.DECOMPOSITION__MODELS:\n@@ -298,8 +316,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\n return getType();\n- case IntentSpecificationPackage.DECOMPOSITION__ID:\n- return getId();\n+ case IntentSpecificationPackage.DECOMPOSITION__NAME:\n+ return getName();\n case IntentSpecificationPackage.DECOMPOSITION__DESC:\n return getDesc();\n case IntentSpecificationPackage.DECOMPOSITION__DOCUMENTS:\n@@ -324,10 +342,10 @@ public void eSet(int featureID, Object newValue)\n switch (featureID)\n {\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\n- setType((String)newValue);\n+ setType((DecompositionType)newValue);\n return;\n- case IntentSpecificationPackage.DECOMPOSITION__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.DECOMPOSITION__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.DECOMPOSITION__DESC:\n setDesc((String)newValue);\n@@ -359,10 +377,10 @@ public void eUnset(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\n- setType(TYPE_EDEFAULT);\n+ setType((DecompositionType)null);\n return;\n- case IntentSpecificationPackage.DECOMPOSITION__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.DECOMPOSITION__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.DECOMPOSITION__DESC:\n setDesc(DESC_EDEFAULT);\n@@ -391,9 +409,9 @@ public boolean eIsSet(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n- case IntentSpecificationPackage.DECOMPOSITION__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ return type != null;\n+ case IntentSpecificationPackage.DECOMPOSITION__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.DECOMPOSITION__DESC:\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\n case IntentSpecificationPackage.DECOMPOSITION__DOCUMENTS:\n@@ -417,10 +435,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (type: \");\n- result.append(type);\n- result.append(\", id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(\", desc: \");\n result.append(desc);\n result.append(')');","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDecompositionImpl.java","sha":"cc51c09add295af4f04cd7806970f3b2cde2d214","status":"modified"},{"additions":76,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDocItemImpl.java","changes":120,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDocItemImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":44,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/DocItemImpl.java","new_code":"import net.certware.intent.intentSpecification.DocItemType;\nimport org.eclipse.emf.common.notify.NotificationChain;\nimport org.eclipse.emf.ecore.InternalEObject;\n *
        • {@link net.certware.intent.intentSpecification.impl.DocItemImpl#getName Name}
          • \n * The cached value of the '{@link #getType() Type}' containment reference.\n protected DocItemType type;\n * The default value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public DocItemType getType()\n public NotificationChain basicSetType(DocItemType newType, NotificationChain msgs)\n DocItemType oldType = type;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, oldType, newType);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setType(DocItemType newType)\n if (newType != type)\n {\n NotificationChain msgs = null;\n if (type != null)\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DOC_ITEM__TYPE, null, msgs);\n if (newType != null)\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DOC_ITEM__TYPE, null, msgs);\n msgs = basicSetType(newType, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, newType, newType));\n public String getName()\n return name;\n }\n\n /**\n * \n * \n * @generated\n */\n public void setName(String newName)\n {\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__NAME, oldName, name));\n /**\n * \n * \n * @generated\n */\n @Override\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n {\n switch (featureID)\n {\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\n return basicSetType(null, msgs);\n }\n return super.eInverseRemove(otherEnd, featureID, msgs);\n }\n\n case IntentSpecificationPackage.DOC_ITEM__NAME:\n return getName();\n setType((DocItemType)newValue);\n case IntentSpecificationPackage.DOC_ITEM__NAME:\n setName((String)newValue);\n setType((DocItemType)null);\n case IntentSpecificationPackage.DOC_ITEM__NAME:\n setName(NAME_EDEFAULT);\n return type != null;\n case IntentSpecificationPackage.DOC_ITEM__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);","new_methods":[{"arguments":["String newName"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/DocItemImpl.java","implementation":"String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__NAME, oldName, name));\n /**\n * \n * \n * @generated\n */\n @Override\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n {\n switch (featureID)\n {\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\n return basicSetType(null, msgs);","signature":"void setName(String newName)"}],"old_code":" *
        • {@link net.certware.intent.intentSpecification.impl.DocItemImpl#getId Id}
          • \n * The default value of the '{@link #getType() Type}' attribute.\n protected static final String TYPE_EDEFAULT = null;\n * The cached value of the '{@link #getType() Type}' attribute.\n * @see #getType()\n protected String type = TYPE_EDEFAULT;\n * The default value of the '{@link #getId() Id}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getId() Id}' attribute.\n * \n * \n * @see #getId()\n * @generated\n * @ordered\n */\n protected String id = ID_EDEFAULT;\n public String getType()\n public void setType(String newType)\n String oldType = type;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, oldType, type));\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__ID, oldId, id));\n case IntentSpecificationPackage.DOC_ITEM__ID:\n return getId();\n setType((String)newValue);\n case IntentSpecificationPackage.DOC_ITEM__ID:\n setId((String)newValue);\n setType(TYPE_EDEFAULT);\n case IntentSpecificationPackage.DOC_ITEM__ID:\n setId(ID_EDEFAULT);\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n case IntentSpecificationPackage.DOC_ITEM__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (type: \");\n result.append(type);\n result.append(\", id: \");\n result.append(id);","old_methods":[],"patch":"@@ -3,11 +3,14 @@\n package net.certware.intent.intentSpecification.impl;\n \n import net.certware.intent.intentSpecification.DocItem;\n+import net.certware.intent.intentSpecification.DocItemType;\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n \n import org.eclipse.emf.common.notify.Notification;\n+import org.eclipse.emf.common.notify.NotificationChain;\n \n import org.eclipse.emf.ecore.EClass;\n+import org.eclipse.emf.ecore.InternalEObject;\n \n import org.eclipse.emf.ecore.impl.ENotificationImpl;\n import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;\n@@ -20,7 +23,7 @@\n * The following features are implemented:\n *
            \n *
          • {@link net.certware.intent.intentSpecification.impl.DocItemImpl#getType Type}
            • \n- *
          • {@link net.certware.intent.intentSpecification.impl.DocItemImpl#getId Id}
            • \n+ *
          • {@link net.certware.intent.intentSpecification.impl.DocItemImpl#getName Name}
            • \n *
          • {@link net.certware.intent.intentSpecification.impl.DocItemImpl#getRef Ref}
            • \n *
          \n *

          \n@@ -30,44 +33,34 @@\n public class DocItemImpl extends MinimalEObjectImpl.Container implements DocItem\n {\n /**\n- * The default value of the '{@link #getType() Type}' attribute.\n+ * The cached value of the '{@link #getType() Type}' containment reference.\n * \n * \n * @see #getType()\n * @generated\n * @ordered\n */\n- protected static final String TYPE_EDEFAULT = null;\n+ protected DocItemType type;\n \n /**\n- * The cached value of the '{@link #getType() Type}' attribute.\n+ * The default value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getType()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String type = TYPE_EDEFAULT;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The default value of the '{@link #getId() Id}' attribute.\n+ * The cached value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getId() Id}' attribute.\n- * \n- * \n- * @see #getId()\n- * @generated\n- * @ordered\n- */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The default value of the '{@link #getRef() Ref}' attribute.\n@@ -115,7 +108,7 @@ protected EClass eStaticClass()\n * \n * @generated\n */\n- public String getType()\n+ public DocItemType getType()\n {\n return type;\n }\n@@ -125,35 +118,60 @@ public String getType()\n * \n * @generated\n */\n- public void setType(String newType)\n+ public NotificationChain basicSetType(DocItemType newType, NotificationChain msgs)\n {\n- String oldType = type;\n+ DocItemType oldType = type;\n type = newType;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, oldType, type));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, oldType, newType);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * \n * \n * @generated\n */\n- public String getId()\n+ public void setType(DocItemType newType)\n {\n- return id;\n+ if (newType != type)\n+ {\n+ NotificationChain msgs = null;\n+ if (type != null)\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DOC_ITEM__TYPE, null, msgs);\n+ if (newType != null)\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DOC_ITEM__TYPE, null, msgs);\n+ msgs = basicSetType(newType, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, newType, newType));\n }\n \n /**\n * \n * \n * @generated\n */\n- public void setId(String newId)\n+ public String getName()\n {\n- String oldId = id;\n- id = newId;\n+ return name;\n+ }\n+\n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public void setName(String newName)\n+ {\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__NAME, oldName, name));\n }\n \n /**\n@@ -179,6 +197,22 @@ public void setRef(String newRef)\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__REF, oldRef, ref));\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ @Override\n+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n+ {\n+ switch (featureID)\n+ {\n+ case IntentSpecificationPackage.DOC_ITEM__TYPE:\n+ return basicSetType(null, msgs);\n+ }\n+ return super.eInverseRemove(otherEnd, featureID, msgs);\n+ }\n+\n /**\n * \n * \n@@ -191,8 +225,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\n return getType();\n- case IntentSpecificationPackage.DOC_ITEM__ID:\n- return getId();\n+ case IntentSpecificationPackage.DOC_ITEM__NAME:\n+ return getName();\n case IntentSpecificationPackage.DOC_ITEM__REF:\n return getRef();\n }\n@@ -210,10 +244,10 @@ public void eSet(int featureID, Object newValue)\n switch (featureID)\n {\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\n- setType((String)newValue);\n+ setType((DocItemType)newValue);\n return;\n- case IntentSpecificationPackage.DOC_ITEM__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.DOC_ITEM__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.DOC_ITEM__REF:\n setRef((String)newValue);\n@@ -233,10 +267,10 @@ public void eUnset(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\n- setType(TYPE_EDEFAULT);\n+ setType((DocItemType)null);\n return;\n- case IntentSpecificationPackage.DOC_ITEM__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.DOC_ITEM__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.DOC_ITEM__REF:\n setRef(REF_EDEFAULT);\n@@ -256,9 +290,9 @@ public boolean eIsSet(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n- case IntentSpecificationPackage.DOC_ITEM__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ return type != null;\n+ case IntentSpecificationPackage.DOC_ITEM__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.DOC_ITEM__REF:\n return REF_EDEFAULT == null ? ref != null : !REF_EDEFAULT.equals(ref);\n }\n@@ -276,10 +310,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (type: \");\n- result.append(type);\n- result.append(\", id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(\", ref: \");\n result.append(ref);\n result.append(')');","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDocItemImpl.java","sha":"20e203b0e66bd479ef9ea74aea32e9acae72df48","status":"modified"},{"additions":60,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentImpl.java","changes":104,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":44,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentImpl.java","new_code":"import net.certware.intent.intentSpecification.IntentType;\n *
        • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getName Name}
          • \n * The cached value of the '{@link #getType() Type}' containment reference.\n protected IntentType type;\n * The default value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public IntentType getType()\n public NotificationChain basicSetType(IntentType newType, NotificationChain msgs)\n IntentType oldType = type;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, oldType, newType);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setType(IntentType newType)\n if (newType != type)\n {\n NotificationChain msgs = null;\n if (type != null)\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.INTENT__TYPE, null, msgs);\n if (newType != null)\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.INTENT__TYPE, null, msgs);\n msgs = basicSetType(newType, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, newType, newType));\n }\n\n /**\n * \n * \n * @generated\n */\n public String getName()\n {\n return name;\n public void setName(String newName)\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__NAME, oldName, name));\n case IntentSpecificationPackage.INTENT__TYPE:\n return basicSetType(null, msgs);\n case IntentSpecificationPackage.INTENT__NAME:\n return getName();\n setType((IntentType)newValue);\n case IntentSpecificationPackage.INTENT__NAME:\n setName((String)newValue);\n setType((IntentType)null);\n case IntentSpecificationPackage.INTENT__NAME:\n setName(NAME_EDEFAULT);\n return type != null;\n case IntentSpecificationPackage.INTENT__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);","new_methods":[],"old_code":" *
        • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getId Id}
          • \n * The default value of the '{@link #getType() Type}' attribute.\n protected static final String TYPE_EDEFAULT = null;\n * The cached value of the '{@link #getType() Type}' attribute.\n * @see #getType()\n protected String type = TYPE_EDEFAULT;\n * The default value of the '{@link #getId() Id}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getId() Id}' attribute.\n * \n * \n * @see #getId()\n * @generated\n * @ordered\n */\n protected String id = ID_EDEFAULT;\n public String getType()\n public void setType(String newType)\n String oldType = type;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, oldType, type));\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__ID, oldId, id));\n case IntentSpecificationPackage.INTENT__ID:\n return getId();\n setType((String)newValue);\n case IntentSpecificationPackage.INTENT__ID:\n setId((String)newValue);\n setType(TYPE_EDEFAULT);\n case IntentSpecificationPackage.INTENT__ID:\n setId(ID_EDEFAULT);\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n case IntentSpecificationPackage.INTENT__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (type: \");\n result.append(type);\n result.append(\", id: \");\n result.append(id);","old_methods":[],"patch":"@@ -7,6 +7,7 @@\n import net.certware.intent.intentSpecification.Decomposition;\n import net.certware.intent.intentSpecification.Intent;\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n+import net.certware.intent.intentSpecification.IntentType;\n \n import org.eclipse.emf.common.notify.Notification;\n import org.eclipse.emf.common.notify.NotificationChain;\n@@ -30,7 +31,7 @@\n * The following features are implemented:\n *
            \n *
          • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getType Type}
            • \n- *
          • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getId Id}
            • \n+ *
          • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getName Name}
            • \n *
          • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getDesc Desc}
            • \n *
          • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getDecompositions Decompositions}
            • \n *
          \n@@ -41,44 +42,34 @@\n public class IntentImpl extends MinimalEObjectImpl.Container implements Intent\n {\n /**\n- * The default value of the '{@link #getType() Type}' attribute.\n+ * The cached value of the '{@link #getType() Type}' containment reference.\n * \n * \n * @see #getType()\n * @generated\n * @ordered\n */\n- protected static final String TYPE_EDEFAULT = null;\n+ protected IntentType type;\n \n /**\n- * The cached value of the '{@link #getType() Type}' attribute.\n+ * The default value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getType()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String type = TYPE_EDEFAULT;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The default value of the '{@link #getId() Id}' attribute.\n+ * The cached value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getId() Id}' attribute.\n- * \n- * \n- * @see #getId()\n- * @generated\n- * @ordered\n- */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The default value of the '{@link #getDesc() Desc}' attribute.\n@@ -136,7 +127,7 @@ protected EClass eStaticClass()\n * \n * @generated\n */\n- public String getType()\n+ public IntentType getType()\n {\n return type;\n }\n@@ -146,35 +137,60 @@ public String getType()\n * \n * @generated\n */\n- public void setType(String newType)\n+ public NotificationChain basicSetType(IntentType newType, NotificationChain msgs)\n {\n- String oldType = type;\n+ IntentType oldType = type;\n type = newType;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, oldType, type));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, oldType, newType);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * \n * \n * @generated\n */\n- public String getId()\n+ public void setType(IntentType newType)\n {\n- return id;\n+ if (newType != type)\n+ {\n+ NotificationChain msgs = null;\n+ if (type != null)\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.INTENT__TYPE, null, msgs);\n+ if (newType != null)\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.INTENT__TYPE, null, msgs);\n+ msgs = basicSetType(newType, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, newType, newType));\n+ }\n+\n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public String getName()\n+ {\n+ return name;\n }\n \n /**\n * \n * \n * @generated\n */\n- public void setId(String newId)\n+ public void setName(String newName)\n {\n- String oldId = id;\n- id = newId;\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__NAME, oldName, name));\n }\n \n /**\n@@ -224,6 +240,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,\n {\n switch (featureID)\n {\n+ case IntentSpecificationPackage.INTENT__TYPE:\n+ return basicSetType(null, msgs);\n case IntentSpecificationPackage.INTENT__DECOMPOSITIONS:\n return ((InternalEList)getDecompositions()).basicRemove(otherEnd, msgs);\n }\n@@ -242,8 +260,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n case IntentSpecificationPackage.INTENT__TYPE:\n return getType();\n- case IntentSpecificationPackage.INTENT__ID:\n- return getId();\n+ case IntentSpecificationPackage.INTENT__NAME:\n+ return getName();\n case IntentSpecificationPackage.INTENT__DESC:\n return getDesc();\n case IntentSpecificationPackage.INTENT__DECOMPOSITIONS:\n@@ -264,10 +282,10 @@ public void eSet(int featureID, Object newValue)\n switch (featureID)\n {\n case IntentSpecificationPackage.INTENT__TYPE:\n- setType((String)newValue);\n+ setType((IntentType)newValue);\n return;\n- case IntentSpecificationPackage.INTENT__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.INTENT__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.INTENT__DESC:\n setDesc((String)newValue);\n@@ -291,10 +309,10 @@ public void eUnset(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.INTENT__TYPE:\n- setType(TYPE_EDEFAULT);\n+ setType((IntentType)null);\n return;\n- case IntentSpecificationPackage.INTENT__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.INTENT__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.INTENT__DESC:\n setDesc(DESC_EDEFAULT);\n@@ -317,9 +335,9 @@ public boolean eIsSet(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.INTENT__TYPE:\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n- case IntentSpecificationPackage.INTENT__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ return type != null;\n+ case IntentSpecificationPackage.INTENT__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.INTENT__DESC:\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\n case IntentSpecificationPackage.INTENT__DECOMPOSITIONS:\n@@ -339,10 +357,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (type: \");\n- result.append(type);\n- result.append(\", id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(\", desc: \");\n result.append(desc);\n result.append(')');","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentImpl.java","sha":"813aa2e46c32953c6e4544ed666b1e9a1ab2d54a","status":"modified"},{"additions":60,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationFactoryImpl.java","changes":60,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationFactoryImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":0,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java","new_code":" case IntentSpecificationPackage.INTENT_TYPE: return createIntentType();\n case IntentSpecificationPackage.DECOMPOSITION_TYPE: return createDecompositionType();\n case IntentSpecificationPackage.DOC_ITEM_TYPE: return createDocItemType();\n case IntentSpecificationPackage.MODEL_TYPE: return createModelType();\n case IntentSpecificationPackage.LIST_ITEM_TYPE: return createListItemType();\n /**\n * \n * \n * @generated\n */\n public IntentType createIntentType()\n {\n IntentTypeImpl intentType = new IntentTypeImpl();\n return intentType;\n }\n\n /**\n * \n * \n * @generated\n */\n public DecompositionType createDecompositionType()\n {\n DecompositionTypeImpl decompositionType = new DecompositionTypeImpl();\n return decompositionType;\n }\n\n /**\n * \n * \n * @generated\n */\n public DocItemType createDocItemType()\n {\n DocItemTypeImpl docItemType = new DocItemTypeImpl();\n return docItemType;\n }\n\n /**\n * \n * \n * @generated\n */\n public ModelType createModelType()\n {\n ModelTypeImpl modelType = new ModelTypeImpl();\n return modelType;\n }\n\n /**\n * \n * \n * @generated\n */\n public ListItemType createListItemType()\n {\n ListItemTypeImpl listItemType = new ListItemTypeImpl();\n return listItemType;\n }\n","new_methods":[{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java","implementation":"IntentTypeImpl intentType = new IntentTypeImpl();\n return intentType;","signature":"IntentType createIntentType()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java","implementation":"DecompositionTypeImpl decompositionType = new DecompositionTypeImpl();\n return decompositionType;","signature":"DecompositionType createDecompositionType()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java","implementation":"DocItemTypeImpl docItemType = new DocItemTypeImpl();\n return docItemType;","signature":"DocItemType createDocItemType()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java","implementation":"ModelTypeImpl modelType = new ModelTypeImpl();\n return modelType;","signature":"ModelType createModelType()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java","implementation":"ListItemTypeImpl listItemType = new ListItemTypeImpl();\n return listItemType;","signature":"ListItemType createListItemType()"}],"old_code":"","old_methods":[],"patch":"@@ -67,10 +67,15 @@ public EObject create(EClass eClass)\n case IntentSpecificationPackage.SPECIFICATION: return createSpecification();\n case IntentSpecificationPackage.REFINEMENT: return createRefinement();\n case IntentSpecificationPackage.INTENT: return createIntent();\n+ case IntentSpecificationPackage.INTENT_TYPE: return createIntentType();\n case IntentSpecificationPackage.DECOMPOSITION: return createDecomposition();\n+ case IntentSpecificationPackage.DECOMPOSITION_TYPE: return createDecompositionType();\n case IntentSpecificationPackage.DOCUMENT: return createDocument();\n+ case IntentSpecificationPackage.DOC_ITEM_TYPE: return createDocItemType();\n case IntentSpecificationPackage.DOC_ITEM: return createDocItem();\n+ case IntentSpecificationPackage.MODEL_TYPE: return createModelType();\n case IntentSpecificationPackage.MODEL_ITEM: return createModelItem();\n+ case IntentSpecificationPackage.LIST_ITEM_TYPE: return createListItemType();\n case IntentSpecificationPackage.LIST_ITEM: return createListItem();\n default:\n throw new IllegalArgumentException(\"The class '\" + eClass.getName() + \"' is not a valid classifier\");\n@@ -110,6 +115,17 @@ public Intent createIntent()\n return intent;\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public IntentType createIntentType()\n+ {\n+ IntentTypeImpl intentType = new IntentTypeImpl();\n+ return intentType;\n+ }\n+\n /**\n * \n * \n@@ -121,6 +137,17 @@ public Decomposition createDecomposition()\n return decomposition;\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public DecompositionType createDecompositionType()\n+ {\n+ DecompositionTypeImpl decompositionType = new DecompositionTypeImpl();\n+ return decompositionType;\n+ }\n+\n /**\n * \n * \n@@ -132,6 +159,17 @@ public Document createDocument()\n return document;\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public DocItemType createDocItemType()\n+ {\n+ DocItemTypeImpl docItemType = new DocItemTypeImpl();\n+ return docItemType;\n+ }\n+\n /**\n * \n * \n@@ -143,6 +181,17 @@ public DocItem createDocItem()\n return docItem;\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public ModelType createModelType()\n+ {\n+ ModelTypeImpl modelType = new ModelTypeImpl();\n+ return modelType;\n+ }\n+\n /**\n * \n * \n@@ -154,6 +203,17 @@ public ModelItem createModelItem()\n return modelItem;\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public ListItemType createListItemType()\n+ {\n+ ListItemTypeImpl listItemType = new ListItemTypeImpl();\n+ return listItemType;\n+ }\n+\n /**\n * \n * ","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationFactoryImpl.java","sha":"24275f91258f97f53208287f491554c5ac732981","status":"modified"},{"additions":211,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationPackageImpl.java","changes":252,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationPackageImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":41,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java","new_code":"import net.certware.intent.intentSpecification.DecompositionType;\nimport net.certware.intent.intentSpecification.DocItemType;\nimport net.certware.intent.intentSpecification.IntentType;\nimport net.certware.intent.intentSpecification.ListItemType;\nimport net.certware.intent.intentSpecification.ModelType;\n /**\n * \n * \n * @generated\n */\n private EClass intentTypeEClass = null;\n\n /**\n * \n * \n * @generated\n */\n private EClass decompositionTypeEClass = null;\n\n /**\n * \n * \n * @generated\n */\n private EClass docItemTypeEClass = null;\n\n /**\n * \n * \n * @generated\n */\n private EClass modelTypeEClass = null;\n\n /**\n * \n * \n * @generated\n */\n private EClass listItemTypeEClass = null;\n\n public EAttribute getSpecification_Name()\n public EAttribute getRefinement_Name()\n public EReference getIntent_Type()\n return (EReference)intentEClass.getEStructuralFeatures().get(0);\n public EAttribute getIntent_Name()\n /**\n * \n * \n * @generated\n */\n public EClass getIntentType()\n {\n return intentTypeEClass;\n }\n\n /**\n * \n * \n * @generated\n */\n public EAttribute getIntentType_TypeName()\n {\n return (EAttribute)intentTypeEClass.getEStructuralFeatures().get(0);\n }\n\n public EReference getDecomposition_Type()\n return (EReference)decompositionEClass.getEStructuralFeatures().get(0);\n public EAttribute getDecomposition_Name()\n /**\n * \n * \n * @generated\n */\n public EClass getDecompositionType()\n {\n return decompositionTypeEClass;\n }\n\n /**\n * \n * \n * @generated\n */\n public EAttribute getDecompositionType_TypeName()\n {\n return (EAttribute)decompositionTypeEClass.getEStructuralFeatures().get(0);\n }\n\n /**\n * \n * \n * @generated\n */\n public EClass getDocItemType()\n {\n return docItemTypeEClass;\n }\n\n /**\n * \n * \n * @generated\n */\n public EAttribute getDocItemType_TypeName()\n {\n return (EAttribute)docItemTypeEClass.getEStructuralFeatures().get(0);\n }\n\n public EReference getDocItem_Type()\n return (EReference)docItemEClass.getEStructuralFeatures().get(0);\n public EAttribute getDocItem_Name()\n /**\n * \n * \n * @generated\n */\n public EClass getModelType()\n {\n return modelTypeEClass;\n }\n\n /**\n * \n * \n * @generated\n */\n public EAttribute getModelType_TypeName()\n {\n return (EAttribute)modelTypeEClass.getEStructuralFeatures().get(0);\n }\n\n public EReference getModelItem_Type()\n return (EReference)modelItemEClass.getEStructuralFeatures().get(0);\n public EAttribute getModelItem_Name()\n /**\n * \n * \n * @generated\n */\n public EClass getListItemType()\n {\n return listItemTypeEClass;\n }\n\n /**\n * \n * \n * @generated\n */\n public EAttribute getListItemType_TypeName()\n {\n return (EAttribute)listItemTypeEClass.getEStructuralFeatures().get(0);\n }\n\n public EReference getListItem_Type()\n return (EReference)listItemEClass.getEStructuralFeatures().get(0);\n public EAttribute getListItem_Name()\n createEAttribute(specificationEClass, SPECIFICATION__NAME);\n createEAttribute(refinementEClass, REFINEMENT__NAME);\n createEReference(intentEClass, INTENT__TYPE);\n createEAttribute(intentEClass, INTENT__NAME);\n intentTypeEClass = createEClass(INTENT_TYPE);\n createEAttribute(intentTypeEClass, INTENT_TYPE__TYPE_NAME);\n\n createEReference(decompositionEClass, DECOMPOSITION__TYPE);\n createEAttribute(decompositionEClass, DECOMPOSITION__NAME);\n decompositionTypeEClass = createEClass(DECOMPOSITION_TYPE);\n createEAttribute(decompositionTypeEClass, DECOMPOSITION_TYPE__TYPE_NAME);\n\n docItemTypeEClass = createEClass(DOC_ITEM_TYPE);\n createEAttribute(docItemTypeEClass, DOC_ITEM_TYPE__TYPE_NAME);\n\n createEReference(docItemEClass, DOC_ITEM__TYPE);\n createEAttribute(docItemEClass, DOC_ITEM__NAME);\n modelTypeEClass = createEClass(MODEL_TYPE);\n createEAttribute(modelTypeEClass, MODEL_TYPE__TYPE_NAME);\n\n createEReference(modelItemEClass, MODEL_ITEM__TYPE);\n createEAttribute(modelItemEClass, MODEL_ITEM__NAME);\n listItemTypeEClass = createEClass(LIST_ITEM_TYPE);\n createEAttribute(listItemTypeEClass, LIST_ITEM_TYPE__TYPE_NAME);\n\n createEReference(listItemEClass, LIST_ITEM__TYPE);\n createEAttribute(listItemEClass, LIST_ITEM__NAME);\n initEAttribute(getSpecification_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getRefinement_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getIntent_Type(), this.getIntentType(), null, \"type\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getIntent_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(intentTypeEClass, IntentType.class, \"IntentType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getIntentType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, IntentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEReference(getDecomposition_Type(), this.getDecompositionType(), null, \"type\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDecomposition_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(decompositionTypeEClass, DecompositionType.class, \"DecompositionType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getDecompositionType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, DecompositionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEClass(docItemTypeEClass, DocItemType.class, \"DocItemType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getDocItemType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, DocItemType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEReference(getDocItem_Type(), this.getDocItemType(), null, \"type\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDocItem_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(modelTypeEClass, ModelType.class, \"ModelType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getModelType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, ModelType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEReference(getModelItem_Type(), this.getModelType(), null, \"type\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getModelItem_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEClass(listItemTypeEClass, ListItemType.class, \"ListItemType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEAttribute(getListItemType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, ListItemType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n\n initEReference(getListItem_Type(), this.getListItemType(), null, \"type\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getListItem_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);","new_methods":[{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java","implementation":"return intentTypeEClass;","signature":"EClass getIntentType()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java","implementation":"return (EAttribute)intentTypeEClass.getEStructuralFeatures().get(0);","signature":"EAttribute getIntentType_TypeName()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java","implementation":"return decompositionTypeEClass;","signature":"EClass getDecompositionType()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java","implementation":"return (EAttribute)decompositionTypeEClass.getEStructuralFeatures().get(0);","signature":"EAttribute getDecompositionType_TypeName()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java","implementation":"return docItemTypeEClass;","signature":"EClass getDocItemType()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java","implementation":"return (EAttribute)docItemTypeEClass.getEStructuralFeatures().get(0);","signature":"EAttribute getDocItemType_TypeName()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java","implementation":"return modelTypeEClass;","signature":"EClass getModelType()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java","implementation":"return (EAttribute)modelTypeEClass.getEStructuralFeatures().get(0);","signature":"EAttribute getModelType_TypeName()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java","implementation":"return listItemTypeEClass;","signature":"EClass getListItemType()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java","implementation":"return (EAttribute)listItemTypeEClass.getEStructuralFeatures().get(0);","signature":"EAttribute getListItemType_TypeName()"}],"old_code":" public EAttribute getSpecification_Id()\n public EAttribute getRefinement_Id()\n public EAttribute getIntent_Type()\n return (EAttribute)intentEClass.getEStructuralFeatures().get(0);\n public EAttribute getIntent_Id()\n public EAttribute getDecomposition_Type()\n return (EAttribute)decompositionEClass.getEStructuralFeatures().get(0);\n public EAttribute getDecomposition_Id()\n public EAttribute getDocItem_Type()\n return (EAttribute)docItemEClass.getEStructuralFeatures().get(0);\n public EAttribute getDocItem_Id()\n public EAttribute getModelItem_Type()\n return (EAttribute)modelItemEClass.getEStructuralFeatures().get(0);\n public EAttribute getModelItem_Id()\n public EAttribute getListItem_Type()\n return (EAttribute)listItemEClass.getEStructuralFeatures().get(0);\n public EAttribute getListItem_Id()\n createEAttribute(specificationEClass, SPECIFICATION__ID);\n createEAttribute(refinementEClass, REFINEMENT__ID);\n createEAttribute(intentEClass, INTENT__TYPE);\n createEAttribute(intentEClass, INTENT__ID);\n createEAttribute(decompositionEClass, DECOMPOSITION__TYPE);\n createEAttribute(decompositionEClass, DECOMPOSITION__ID);\n createEAttribute(docItemEClass, DOC_ITEM__TYPE);\n createEAttribute(docItemEClass, DOC_ITEM__ID);\n createEAttribute(modelItemEClass, MODEL_ITEM__TYPE);\n createEAttribute(modelItemEClass, MODEL_ITEM__ID);\n createEAttribute(listItemEClass, LIST_ITEM__TYPE);\n createEAttribute(listItemEClass, LIST_ITEM__ID);\n initEAttribute(getSpecification_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getRefinement_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getIntent_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getIntent_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDecomposition_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDecomposition_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDocItem_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDocItem_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getModelItem_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getModelItem_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getListItem_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getListItem_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);","old_methods":[],"patch":"@@ -3,13 +3,18 @@\n package net.certware.intent.intentSpecification.impl;\n \n import net.certware.intent.intentSpecification.Decomposition;\n+import net.certware.intent.intentSpecification.DecompositionType;\n import net.certware.intent.intentSpecification.DocItem;\n+import net.certware.intent.intentSpecification.DocItemType;\n import net.certware.intent.intentSpecification.Document;\n import net.certware.intent.intentSpecification.Intent;\n import net.certware.intent.intentSpecification.IntentSpecificationFactory;\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n+import net.certware.intent.intentSpecification.IntentType;\n import net.certware.intent.intentSpecification.ListItem;\n+import net.certware.intent.intentSpecification.ListItemType;\n import net.certware.intent.intentSpecification.ModelItem;\n+import net.certware.intent.intentSpecification.ModelType;\n import net.certware.intent.intentSpecification.Refinement;\n import net.certware.intent.intentSpecification.Specification;\n \n@@ -49,34 +54,69 @@ public class IntentSpecificationPackageImpl extends EPackageImpl implements Inte\n */\n private EClass intentEClass = null;\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ private EClass intentTypeEClass = null;\n+\n /**\n * \n * \n * @generated\n */\n private EClass decompositionEClass = null;\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ private EClass decompositionTypeEClass = null;\n+\n /**\n * \n * \n * @generated\n */\n private EClass documentEClass = null;\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ private EClass docItemTypeEClass = null;\n+\n /**\n * \n * \n * @generated\n */\n private EClass docItemEClass = null;\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ private EClass modelTypeEClass = null;\n+\n /**\n * \n * \n * @generated\n */\n private EClass modelItemEClass = null;\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ private EClass listItemTypeEClass = null;\n+\n /**\n * \n * \n@@ -162,7 +202,7 @@ public EClass getSpecification()\n * \n * @generated\n */\n- public EAttribute getSpecification_Id()\n+ public EAttribute getSpecification_Name()\n {\n return (EAttribute)specificationEClass.getEStructuralFeatures().get(0);\n }\n@@ -192,7 +232,7 @@ public EClass getRefinement()\n * \n * @generated\n */\n- public EAttribute getRefinement_Id()\n+ public EAttribute getRefinement_Name()\n {\n return (EAttribute)refinementEClass.getEStructuralFeatures().get(0);\n }\n@@ -232,17 +272,17 @@ public EClass getIntent()\n * \n * @generated\n */\n- public EAttribute getIntent_Type()\n+ public EReference getIntent_Type()\n {\n- return (EAttribute)intentEClass.getEStructuralFeatures().get(0);\n+ return (EReference)intentEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * \n * \n * @generated\n */\n- public EAttribute getIntent_Id()\n+ public EAttribute getIntent_Name()\n {\n return (EAttribute)intentEClass.getEStructuralFeatures().get(1);\n }\n@@ -267,6 +307,26 @@ public EReference getIntent_Decompositions()\n return (EReference)intentEClass.getEStructuralFeatures().get(3);\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public EClass getIntentType()\n+ {\n+ return intentTypeEClass;\n+ }\n+\n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public EAttribute getIntentType_TypeName()\n+ {\n+ return (EAttribute)intentTypeEClass.getEStructuralFeatures().get(0);\n+ }\n+\n /**\n * \n * \n@@ -282,17 +342,17 @@ public EClass getDecomposition()\n * \n * @generated\n */\n- public EAttribute getDecomposition_Type()\n+ public EReference getDecomposition_Type()\n {\n- return (EAttribute)decompositionEClass.getEStructuralFeatures().get(0);\n+ return (EReference)decompositionEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * \n * \n * @generated\n */\n- public EAttribute getDecomposition_Id()\n+ public EAttribute getDecomposition_Name()\n {\n return (EAttribute)decompositionEClass.getEStructuralFeatures().get(1);\n }\n@@ -337,6 +397,26 @@ public EReference getDecomposition_Items()\n return (EReference)decompositionEClass.getEStructuralFeatures().get(5);\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public EClass getDecompositionType()\n+ {\n+ return decompositionTypeEClass;\n+ }\n+\n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public EAttribute getDecompositionType_TypeName()\n+ {\n+ return (EAttribute)decompositionTypeEClass.getEStructuralFeatures().get(0);\n+ }\n+\n /**\n * \n * \n@@ -357,6 +437,26 @@ public EReference getDocument_Entries()\n return (EReference)documentEClass.getEStructuralFeatures().get(0);\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public EClass getDocItemType()\n+ {\n+ return docItemTypeEClass;\n+ }\n+\n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public EAttribute getDocItemType_TypeName()\n+ {\n+ return (EAttribute)docItemTypeEClass.getEStructuralFeatures().get(0);\n+ }\n+\n /**\n * \n * \n@@ -372,17 +472,17 @@ public EClass getDocItem()\n * \n * @generated\n */\n- public EAttribute getDocItem_Type()\n+ public EReference getDocItem_Type()\n {\n- return (EAttribute)docItemEClass.getEStructuralFeatures().get(0);\n+ return (EReference)docItemEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * \n * \n * @generated\n */\n- public EAttribute getDocItem_Id()\n+ public EAttribute getDocItem_Name()\n {\n return (EAttribute)docItemEClass.getEStructuralFeatures().get(1);\n }\n@@ -397,6 +497,26 @@ public EAttribute getDocItem_Ref()\n return (EAttribute)docItemEClass.getEStructuralFeatures().get(2);\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public EClass getModelType()\n+ {\n+ return modelTypeEClass;\n+ }\n+\n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public EAttribute getModelType_TypeName()\n+ {\n+ return (EAttribute)modelTypeEClass.getEStructuralFeatures().get(0);\n+ }\n+\n /**\n * \n * \n@@ -412,17 +532,17 @@ public EClass getModelItem()\n * \n * @generated\n */\n- public EAttribute getModelItem_Type()\n+ public EReference getModelItem_Type()\n {\n- return (EAttribute)modelItemEClass.getEStructuralFeatures().get(0);\n+ return (EReference)modelItemEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * \n * \n * @generated\n */\n- public EAttribute getModelItem_Id()\n+ public EAttribute getModelItem_Name()\n {\n return (EAttribute)modelItemEClass.getEStructuralFeatures().get(1);\n }\n@@ -437,6 +557,26 @@ public EAttribute getModelItem_Desc()\n return (EAttribute)modelItemEClass.getEStructuralFeatures().get(2);\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public EClass getListItemType()\n+ {\n+ return listItemTypeEClass;\n+ }\n+\n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public EAttribute getListItemType_TypeName()\n+ {\n+ return (EAttribute)listItemTypeEClass.getEStructuralFeatures().get(0);\n+ }\n+\n /**\n * \n * \n@@ -452,17 +592,17 @@ public EClass getListItem()\n * \n * @generated\n */\n- public EAttribute getListItem_Type()\n+ public EReference getListItem_Type()\n {\n- return (EAttribute)listItemEClass.getEStructuralFeatures().get(0);\n+ return (EReference)listItemEClass.getEStructuralFeatures().get(0);\n }\n \n /**\n * \n * \n * @generated\n */\n- public EAttribute getListItem_Id()\n+ public EAttribute getListItem_Name()\n {\n return (EAttribute)listItemEClass.getEStructuralFeatures().get(1);\n }\n@@ -538,44 +678,59 @@ public void createPackageContents()\n \n // Create classes and their features\n specificationEClass = createEClass(SPECIFICATION);\n- createEAttribute(specificationEClass, SPECIFICATION__ID);\n+ createEAttribute(specificationEClass, SPECIFICATION__NAME);\n createEReference(specificationEClass, SPECIFICATION__REFINEMENTS);\n \n refinementEClass = createEClass(REFINEMENT);\n- createEAttribute(refinementEClass, REFINEMENT__ID);\n+ createEAttribute(refinementEClass, REFINEMENT__NAME);\n createEAttribute(refinementEClass, REFINEMENT__DESC);\n createEReference(refinementEClass, REFINEMENT__INTENTS);\n \n intentEClass = createEClass(INTENT);\n- createEAttribute(intentEClass, INTENT__TYPE);\n- createEAttribute(intentEClass, INTENT__ID);\n+ createEReference(intentEClass, INTENT__TYPE);\n+ createEAttribute(intentEClass, INTENT__NAME);\n createEAttribute(intentEClass, INTENT__DESC);\n createEReference(intentEClass, INTENT__DECOMPOSITIONS);\n \n+ intentTypeEClass = createEClass(INTENT_TYPE);\n+ createEAttribute(intentTypeEClass, INTENT_TYPE__TYPE_NAME);\n+\n decompositionEClass = createEClass(DECOMPOSITION);\n- createEAttribute(decompositionEClass, DECOMPOSITION__TYPE);\n- createEAttribute(decompositionEClass, DECOMPOSITION__ID);\n+ createEReference(decompositionEClass, DECOMPOSITION__TYPE);\n+ createEAttribute(decompositionEClass, DECOMPOSITION__NAME);\n createEAttribute(decompositionEClass, DECOMPOSITION__DESC);\n createEReference(decompositionEClass, DECOMPOSITION__DOCUMENTS);\n createEReference(decompositionEClass, DECOMPOSITION__MODELS);\n createEReference(decompositionEClass, DECOMPOSITION__ITEMS);\n \n+ decompositionTypeEClass = createEClass(DECOMPOSITION_TYPE);\n+ createEAttribute(decompositionTypeEClass, DECOMPOSITION_TYPE__TYPE_NAME);\n+\n documentEClass = createEClass(DOCUMENT);\n createEReference(documentEClass, DOCUMENT__ENTRIES);\n \n+ docItemTypeEClass = createEClass(DOC_ITEM_TYPE);\n+ createEAttribute(docItemTypeEClass, DOC_ITEM_TYPE__TYPE_NAME);\n+\n docItemEClass = createEClass(DOC_ITEM);\n- createEAttribute(docItemEClass, DOC_ITEM__TYPE);\n- createEAttribute(docItemEClass, DOC_ITEM__ID);\n+ createEReference(docItemEClass, DOC_ITEM__TYPE);\n+ createEAttribute(docItemEClass, DOC_ITEM__NAME);\n createEAttribute(docItemEClass, DOC_ITEM__REF);\n \n+ modelTypeEClass = createEClass(MODEL_TYPE);\n+ createEAttribute(modelTypeEClass, MODEL_TYPE__TYPE_NAME);\n+\n modelItemEClass = createEClass(MODEL_ITEM);\n- createEAttribute(modelItemEClass, MODEL_ITEM__TYPE);\n- createEAttribute(modelItemEClass, MODEL_ITEM__ID);\n+ createEReference(modelItemEClass, MODEL_ITEM__TYPE);\n+ createEAttribute(modelItemEClass, MODEL_ITEM__NAME);\n createEAttribute(modelItemEClass, MODEL_ITEM__DESC);\n \n+ listItemTypeEClass = createEClass(LIST_ITEM_TYPE);\n+ createEAttribute(listItemTypeEClass, LIST_ITEM_TYPE__TYPE_NAME);\n+\n listItemEClass = createEClass(LIST_ITEM);\n- createEAttribute(listItemEClass, LIST_ITEM__TYPE);\n- createEAttribute(listItemEClass, LIST_ITEM__ID);\n+ createEReference(listItemEClass, LIST_ITEM__TYPE);\n+ createEAttribute(listItemEClass, LIST_ITEM__NAME);\n createEAttribute(listItemEClass, LIST_ITEM__DESC);\n createEReference(listItemEClass, LIST_ITEM__DOC_REFERENCES);\n createEReference(listItemEClass, LIST_ITEM__ITEM_REFERENCES);\n@@ -614,44 +769,59 @@ public void initializePackageContents()\n \n // Initialize classes and features; add operations and parameters\n initEClass(specificationEClass, Specification.class, \"Specification\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getSpecification_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getSpecification_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getSpecification_Refinements(), this.getRefinement(), null, \"refinements\", null, 0, -1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n initEClass(refinementEClass, Refinement.class, \"Refinement\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getRefinement_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getRefinement_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getRefinement_Desc(), ecorePackage.getEString(), \"desc\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getRefinement_Intents(), this.getIntent(), null, \"intents\", null, 0, -1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n initEClass(intentEClass, Intent.class, \"Intent\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getIntent_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getIntent_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getIntent_Type(), this.getIntentType(), null, \"type\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getIntent_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getIntent_Desc(), ecorePackage.getEString(), \"desc\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getIntent_Decompositions(), this.getDecomposition(), null, \"decompositions\", null, 0, -1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(intentTypeEClass, IntentType.class, \"IntentType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getIntentType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, IntentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(decompositionEClass, Decomposition.class, \"Decomposition\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getDecomposition_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getDecomposition_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getDecomposition_Type(), this.getDecompositionType(), null, \"type\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getDecomposition_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDecomposition_Desc(), ecorePackage.getEString(), \"desc\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getDecomposition_Documents(), this.getDocument(), null, \"documents\", null, 0, -1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getDecomposition_Models(), this.getModelItem(), null, \"models\", null, 0, -1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getDecomposition_Items(), this.getListItem(), null, \"items\", null, 0, -1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(decompositionTypeEClass, DecompositionType.class, \"DecompositionType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getDecompositionType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, DecompositionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(documentEClass, Document.class, \"Document\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n initEReference(getDocument_Entries(), this.getDocItem(), null, \"entries\", null, 0, -1, Document.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(docItemTypeEClass, DocItemType.class, \"DocItemType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getDocItemType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, DocItemType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(docItemEClass, DocItem.class, \"DocItem\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getDocItem_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getDocItem_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getDocItem_Type(), this.getDocItemType(), null, \"type\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getDocItem_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getDocItem_Ref(), ecorePackage.getEString(), \"ref\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(modelTypeEClass, ModelType.class, \"ModelType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getModelType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, ModelType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(modelItemEClass, ModelItem.class, \"ModelItem\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getModelItem_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getModelItem_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getModelItem_Type(), this.getModelType(), null, \"type\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getModelItem_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getModelItem_Desc(), ecorePackage.getEString(), \"desc\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n \n+ initEClass(listItemTypeEClass, ListItemType.class, \"ListItemType\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n+ initEAttribute(getListItemType_TypeName(), ecorePackage.getEString(), \"typeName\", null, 0, 1, ListItemType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+\n initEClass(listItemEClass, ListItem.class, \"ListItem\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\n- initEAttribute(getListItem_Type(), ecorePackage.getEString(), \"type\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n- initEAttribute(getListItem_Id(), ecorePackage.getEString(), \"id\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEReference(getListItem_Type(), this.getListItemType(), null, \"type\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n+ initEAttribute(getListItem_Name(), ecorePackage.getEString(), \"name\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEAttribute(getListItem_Desc(), ecorePackage.getEString(), \"desc\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getListItem_DocReferences(), this.getDocItem(), null, \"docReferences\", null, 0, -1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\n initEReference(getListItem_ItemReferences(), this.getListItem(), null, \"itemReferences\", null, 0, -1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationPackageImpl.java","sha":"455a952bd8cbfc8bbcdcc1466c675c7e4a0a33c8","status":"modified"},{"additions":76,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FListItemImpl.java","changes":120,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FListItemImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":44,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/ListItemImpl.java","new_code":"import net.certware.intent.intentSpecification.ListItemType;\nimport org.eclipse.emf.common.notify.NotificationChain;\nimport org.eclipse.emf.ecore.InternalEObject;\n *
        • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getName Name}
          • \n * The cached value of the '{@link #getType() Type}' containment reference.\n protected ListItemType type;\n * The default value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public ListItemType getType()\n public NotificationChain basicSetType(ListItemType newType, NotificationChain msgs)\n ListItemType oldType = type;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, oldType, newType);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setType(ListItemType newType)\n if (newType != type)\n {\n NotificationChain msgs = null;\n if (type != null)\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.LIST_ITEM__TYPE, null, msgs);\n if (newType != null)\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.LIST_ITEM__TYPE, null, msgs);\n msgs = basicSetType(newType, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, newType, newType));\n public String getName()\n return name;\n }\n\n /**\n * \n * \n * @generated\n */\n public void setName(String newName)\n {\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__NAME, oldName, name));\n /**\n * \n * \n * @generated\n */\n @Override\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n {\n switch (featureID)\n {\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\n return basicSetType(null, msgs);\n }\n return super.eInverseRemove(otherEnd, featureID, msgs);\n }\n\n case IntentSpecificationPackage.LIST_ITEM__NAME:\n return getName();\n setType((ListItemType)newValue);\n case IntentSpecificationPackage.LIST_ITEM__NAME:\n setName((String)newValue);\n setType((ListItemType)null);\n case IntentSpecificationPackage.LIST_ITEM__NAME:\n setName(NAME_EDEFAULT);\n return type != null;\n case IntentSpecificationPackage.LIST_ITEM__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);","new_methods":[{"arguments":["String newName"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/ListItemImpl.java","implementation":"String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__NAME, oldName, name));\n /**\n * \n * \n * @generated\n */\n @Override\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n {\n switch (featureID)\n {\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\n return basicSetType(null, msgs);","signature":"void setName(String newName)"}],"old_code":" *
        • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getId Id}
          • \n * The default value of the '{@link #getType() Type}' attribute.\n protected static final String TYPE_EDEFAULT = null;\n * The cached value of the '{@link #getType() Type}' attribute.\n * @see #getType()\n protected String type = TYPE_EDEFAULT;\n * The default value of the '{@link #getId() Id}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getId() Id}' attribute.\n * \n * \n * @see #getId()\n * @generated\n * @ordered\n */\n protected String id = ID_EDEFAULT;\n public String getType()\n public void setType(String newType)\n String oldType = type;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, oldType, type));\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__ID, oldId, id));\n case IntentSpecificationPackage.LIST_ITEM__ID:\n return getId();\n setType((String)newValue);\n case IntentSpecificationPackage.LIST_ITEM__ID:\n setId((String)newValue);\n setType(TYPE_EDEFAULT);\n case IntentSpecificationPackage.LIST_ITEM__ID:\n setId(ID_EDEFAULT);\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n case IntentSpecificationPackage.LIST_ITEM__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (type: \");\n result.append(type);\n result.append(\", id: \");\n result.append(id);","old_methods":[],"patch":"@@ -7,13 +7,16 @@\n import net.certware.intent.intentSpecification.DocItem;\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n import net.certware.intent.intentSpecification.ListItem;\n+import net.certware.intent.intentSpecification.ListItemType;\n import net.certware.intent.intentSpecification.ModelItem;\n \n import org.eclipse.emf.common.notify.Notification;\n+import org.eclipse.emf.common.notify.NotificationChain;\n \n import org.eclipse.emf.common.util.EList;\n \n import org.eclipse.emf.ecore.EClass;\n+import org.eclipse.emf.ecore.InternalEObject;\n \n import org.eclipse.emf.ecore.impl.ENotificationImpl;\n import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;\n@@ -28,7 +31,7 @@\n * The following features are implemented:\n *
            \n *
          • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getType Type}
            • \n- *
          • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getId Id}
            • \n+ *
          • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getName Name}
            • \n *
          • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getDesc Desc}
            • \n *
          • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getDocReferences Doc References}
            • \n *
          • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getItemReferences Item References}
            • \n@@ -41,44 +44,34 @@\n public class ListItemImpl extends MinimalEObjectImpl.Container implements ListItem\n {\n /**\n- * The default value of the '{@link #getType() Type}' attribute.\n+ * The cached value of the '{@link #getType() Type}' containment reference.\n * \n * \n * @see #getType()\n * @generated\n * @ordered\n */\n- protected static final String TYPE_EDEFAULT = null;\n+ protected ListItemType type;\n \n /**\n- * The cached value of the '{@link #getType() Type}' attribute.\n+ * The default value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getType()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String type = TYPE_EDEFAULT;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The default value of the '{@link #getId() Id}' attribute.\n+ * The cached value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getId() Id}' attribute.\n- * \n- * \n- * @see #getId()\n- * @generated\n- * @ordered\n- */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The default value of the '{@link #getDesc() Desc}' attribute.\n@@ -156,7 +149,7 @@ protected EClass eStaticClass()\n * \n * @generated\n */\n- public String getType()\n+ public ListItemType getType()\n {\n return type;\n }\n@@ -166,35 +159,60 @@ public String getType()\n * \n * @generated\n */\n- public void setType(String newType)\n+ public NotificationChain basicSetType(ListItemType newType, NotificationChain msgs)\n {\n- String oldType = type;\n+ ListItemType oldType = type;\n type = newType;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, oldType, type));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, oldType, newType);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * \n * \n * @generated\n */\n- public String getId()\n+ public void setType(ListItemType newType)\n {\n- return id;\n+ if (newType != type)\n+ {\n+ NotificationChain msgs = null;\n+ if (type != null)\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.LIST_ITEM__TYPE, null, msgs);\n+ if (newType != null)\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.LIST_ITEM__TYPE, null, msgs);\n+ msgs = basicSetType(newType, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, newType, newType));\n }\n \n /**\n * \n * \n * @generated\n */\n- public void setId(String newId)\n+ public String getName()\n {\n- String oldId = id;\n- id = newId;\n+ return name;\n+ }\n+\n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public void setName(String newName)\n+ {\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__NAME, oldName, name));\n }\n \n /**\n@@ -262,6 +280,22 @@ public EList getModelReferences()\n return modelReferences;\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ @Override\n+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n+ {\n+ switch (featureID)\n+ {\n+ case IntentSpecificationPackage.LIST_ITEM__TYPE:\n+ return basicSetType(null, msgs);\n+ }\n+ return super.eInverseRemove(otherEnd, featureID, msgs);\n+ }\n+\n /**\n * \n * \n@@ -274,8 +308,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\n return getType();\n- case IntentSpecificationPackage.LIST_ITEM__ID:\n- return getId();\n+ case IntentSpecificationPackage.LIST_ITEM__NAME:\n+ return getName();\n case IntentSpecificationPackage.LIST_ITEM__DESC:\n return getDesc();\n case IntentSpecificationPackage.LIST_ITEM__DOC_REFERENCES:\n@@ -300,10 +334,10 @@ public void eSet(int featureID, Object newValue)\n switch (featureID)\n {\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\n- setType((String)newValue);\n+ setType((ListItemType)newValue);\n return;\n- case IntentSpecificationPackage.LIST_ITEM__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.LIST_ITEM__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.LIST_ITEM__DESC:\n setDesc((String)newValue);\n@@ -335,10 +369,10 @@ public void eUnset(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\n- setType(TYPE_EDEFAULT);\n+ setType((ListItemType)null);\n return;\n- case IntentSpecificationPackage.LIST_ITEM__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.LIST_ITEM__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.LIST_ITEM__DESC:\n setDesc(DESC_EDEFAULT);\n@@ -367,9 +401,9 @@ public boolean eIsSet(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n- case IntentSpecificationPackage.LIST_ITEM__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ return type != null;\n+ case IntentSpecificationPackage.LIST_ITEM__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.LIST_ITEM__DESC:\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\n case IntentSpecificationPackage.LIST_ITEM__DOC_REFERENCES:\n@@ -393,10 +427,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (type: \");\n- result.append(type);\n- result.append(\", id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(\", desc: \");\n result.append(desc);\n result.append(')');","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FListItemImpl.java","sha":"b011062cede0f011e0295663d0bfd8364accc9ce","status":"modified"},{"additions":76,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FModelItemImpl.java","changes":120,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FModelItemImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":44,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/ModelItemImpl.java","new_code":"import net.certware.intent.intentSpecification.ModelType;\nimport org.eclipse.emf.common.notify.NotificationChain;\nimport org.eclipse.emf.ecore.InternalEObject;\n *
          • {@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getName Name}
            • \n * The cached value of the '{@link #getType() Type}' containment reference.\n protected ModelType type;\n * The default value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public ModelType getType()\n public NotificationChain basicSetType(ModelType newType, NotificationChain msgs)\n ModelType oldType = type;\n {\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, oldType, newType);\n if (msgs == null) msgs = notification; else msgs.add(notification);\n }\n return msgs;\n public void setType(ModelType newType)\n if (newType != type)\n {\n NotificationChain msgs = null;\n if (type != null)\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.MODEL_ITEM__TYPE, null, msgs);\n if (newType != null)\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.MODEL_ITEM__TYPE, null, msgs);\n msgs = basicSetType(newType, msgs);\n if (msgs != null) msgs.dispatch();\n }\n else if (eNotificationRequired())\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, newType, newType));\n public String getName()\n return name;\n }\n\n /**\n * \n * \n * @generated\n */\n public void setName(String newName)\n {\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__NAME, oldName, name));\n /**\n * \n * \n * @generated\n */\n @Override\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n {\n switch (featureID)\n {\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n return basicSetType(null, msgs);\n }\n return super.eInverseRemove(otherEnd, featureID, msgs);\n }\n\n case IntentSpecificationPackage.MODEL_ITEM__NAME:\n return getName();\n setType((ModelType)newValue);\n case IntentSpecificationPackage.MODEL_ITEM__NAME:\n setName((String)newValue);\n setType((ModelType)null);\n case IntentSpecificationPackage.MODEL_ITEM__NAME:\n setName(NAME_EDEFAULT);\n return type != null;\n case IntentSpecificationPackage.MODEL_ITEM__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);","new_methods":[{"arguments":["String newName"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/ModelItemImpl.java","implementation":"String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__NAME, oldName, name));\n /**\n * \n * \n * @generated\n */\n @Override\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n {\n switch (featureID)\n {\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n return basicSetType(null, msgs);","signature":"void setName(String newName)"}],"old_code":" *
          • {@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getId Id}
            • \n * The default value of the '{@link #getType() Type}' attribute.\n protected static final String TYPE_EDEFAULT = null;\n * The cached value of the '{@link #getType() Type}' attribute.\n * @see #getType()\n protected String type = TYPE_EDEFAULT;\n * The default value of the '{@link #getId() Id}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n\n /**\n * The cached value of the '{@link #getId() Id}' attribute.\n * \n * \n * @see #getId()\n * @generated\n * @ordered\n */\n protected String id = ID_EDEFAULT;\n public String getType()\n public void setType(String newType)\n String oldType = type;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, oldType, type));\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__ID, oldId, id));\n case IntentSpecificationPackage.MODEL_ITEM__ID:\n return getId();\n setType((String)newValue);\n case IntentSpecificationPackage.MODEL_ITEM__ID:\n setId((String)newValue);\n setType(TYPE_EDEFAULT);\n case IntentSpecificationPackage.MODEL_ITEM__ID:\n setId(ID_EDEFAULT);\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n case IntentSpecificationPackage.MODEL_ITEM__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (type: \");\n result.append(type);\n result.append(\", id: \");\n result.append(id);","old_methods":[],"patch":"@@ -4,10 +4,13 @@\n \n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n import net.certware.intent.intentSpecification.ModelItem;\n+import net.certware.intent.intentSpecification.ModelType;\n \n import org.eclipse.emf.common.notify.Notification;\n+import org.eclipse.emf.common.notify.NotificationChain;\n \n import org.eclipse.emf.ecore.EClass;\n+import org.eclipse.emf.ecore.InternalEObject;\n \n import org.eclipse.emf.ecore.impl.ENotificationImpl;\n import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;\n@@ -20,7 +23,7 @@\n * The following features are implemented:\n *
              \n *
            • {@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getType Type}
              • \n- *
            • {@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getId Id}
              • \n+ *
            • {@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getName Name}
              • \n *
            • {@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getDesc Desc}
              • \n *
            \n *

            \n@@ -30,44 +33,34 @@\n public class ModelItemImpl extends MinimalEObjectImpl.Container implements ModelItem\n {\n /**\n- * The default value of the '{@link #getType() Type}' attribute.\n+ * The cached value of the '{@link #getType() Type}' containment reference.\n * \n * \n * @see #getType()\n * @generated\n * @ordered\n */\n- protected static final String TYPE_EDEFAULT = null;\n+ protected ModelType type;\n \n /**\n- * The cached value of the '{@link #getType() Type}' attribute.\n+ * The default value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getType()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String type = TYPE_EDEFAULT;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The default value of the '{@link #getId() Id}' attribute.\n+ * The cached value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n-\n- /**\n- * The cached value of the '{@link #getId() Id}' attribute.\n- * \n- * \n- * @see #getId()\n- * @generated\n- * @ordered\n- */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The default value of the '{@link #getDesc() Desc}' attribute.\n@@ -115,7 +108,7 @@ protected EClass eStaticClass()\n * \n * @generated\n */\n- public String getType()\n+ public ModelType getType()\n {\n return type;\n }\n@@ -125,35 +118,60 @@ public String getType()\n * \n * @generated\n */\n- public void setType(String newType)\n+ public NotificationChain basicSetType(ModelType newType, NotificationChain msgs)\n {\n- String oldType = type;\n+ ModelType oldType = type;\n type = newType;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, oldType, type));\n+ {\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, oldType, newType);\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\n+ }\n+ return msgs;\n }\n \n /**\n * \n * \n * @generated\n */\n- public String getId()\n+ public void setType(ModelType newType)\n {\n- return id;\n+ if (newType != type)\n+ {\n+ NotificationChain msgs = null;\n+ if (type != null)\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.MODEL_ITEM__TYPE, null, msgs);\n+ if (newType != null)\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.MODEL_ITEM__TYPE, null, msgs);\n+ msgs = basicSetType(newType, msgs);\n+ if (msgs != null) msgs.dispatch();\n+ }\n+ else if (eNotificationRequired())\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, newType, newType));\n }\n \n /**\n * \n * \n * @generated\n */\n- public void setId(String newId)\n+ public String getName()\n {\n- String oldId = id;\n- id = newId;\n+ return name;\n+ }\n+\n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ public void setName(String newName)\n+ {\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__NAME, oldName, name));\n }\n \n /**\n@@ -179,6 +197,22 @@ public void setDesc(String newDesc)\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__DESC, oldDesc, desc));\n }\n \n+ /**\n+ * \n+ * \n+ * @generated\n+ */\n+ @Override\n+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\n+ {\n+ switch (featureID)\n+ {\n+ case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n+ return basicSetType(null, msgs);\n+ }\n+ return super.eInverseRemove(otherEnd, featureID, msgs);\n+ }\n+\n /**\n * \n * \n@@ -191,8 +225,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n return getType();\n- case IntentSpecificationPackage.MODEL_ITEM__ID:\n- return getId();\n+ case IntentSpecificationPackage.MODEL_ITEM__NAME:\n+ return getName();\n case IntentSpecificationPackage.MODEL_ITEM__DESC:\n return getDesc();\n }\n@@ -210,10 +244,10 @@ public void eSet(int featureID, Object newValue)\n switch (featureID)\n {\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n- setType((String)newValue);\n+ setType((ModelType)newValue);\n return;\n- case IntentSpecificationPackage.MODEL_ITEM__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.MODEL_ITEM__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.MODEL_ITEM__DESC:\n setDesc((String)newValue);\n@@ -233,10 +267,10 @@ public void eUnset(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n- setType(TYPE_EDEFAULT);\n+ setType((ModelType)null);\n return;\n- case IntentSpecificationPackage.MODEL_ITEM__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.MODEL_ITEM__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.MODEL_ITEM__DESC:\n setDesc(DESC_EDEFAULT);\n@@ -256,9 +290,9 @@ public boolean eIsSet(int featureID)\n switch (featureID)\n {\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\n- case IntentSpecificationPackage.MODEL_ITEM__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ return type != null;\n+ case IntentSpecificationPackage.MODEL_ITEM__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.MODEL_ITEM__DESC:\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\n }\n@@ -276,10 +310,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (type: \");\n- result.append(type);\n- result.append(\", id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(\", desc: \");\n result.append(desc);\n result.append(')');","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FModelItemImpl.java","sha":"c0633e50b5bed3611fcaa98d14cba868062e886c","status":"modified"},{"additions":23,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FRefinementImpl.java","changes":46,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FRefinementImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":23,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/RefinementImpl.java","new_code":" *
          • {@link net.certware.intent.intentSpecification.impl.RefinementImpl#getName Name}
            • \n * The default value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public String getName()\n return name;\n public void setName(String newName)\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.REFINEMENT__NAME, oldName, name));\n case IntentSpecificationPackage.REFINEMENT__NAME:\n return getName();\n case IntentSpecificationPackage.REFINEMENT__NAME:\n setName((String)newValue);\n case IntentSpecificationPackage.REFINEMENT__NAME:\n setName(NAME_EDEFAULT);\n case IntentSpecificationPackage.REFINEMENT__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);","new_methods":[],"old_code":" *
          • {@link net.certware.intent.intentSpecification.impl.RefinementImpl#getId Id}
            • \n * The default value of the '{@link #getId() Id}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n * The cached value of the '{@link #getId() Id}' attribute.\n * @see #getId()\n protected String id = ID_EDEFAULT;\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.REFINEMENT__ID, oldId, id));\n case IntentSpecificationPackage.REFINEMENT__ID:\n return getId();\n case IntentSpecificationPackage.REFINEMENT__ID:\n setId((String)newValue);\n case IntentSpecificationPackage.REFINEMENT__ID:\n setId(ID_EDEFAULT);\n case IntentSpecificationPackage.REFINEMENT__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (id: \");\n result.append(id);","old_methods":[],"patch":"@@ -29,7 +29,7 @@\n *

            \n * The following features are implemented:\n *

              \n- *
            • {@link net.certware.intent.intentSpecification.impl.RefinementImpl#getId Id}
              • \n+ *
            • {@link net.certware.intent.intentSpecification.impl.RefinementImpl#getName Name}
              • \n *
            • {@link net.certware.intent.intentSpecification.impl.RefinementImpl#getDesc Desc}
              • \n *
            • {@link net.certware.intent.intentSpecification.impl.RefinementImpl#getIntents Intents}
              • \n *
            \n@@ -40,24 +40,24 @@\n public class RefinementImpl extends MinimalEObjectImpl.Container implements Refinement\n {\n /**\n- * The default value of the '{@link #getId() Id}' attribute.\n+ * The default value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The cached value of the '{@link #getId() Id}' attribute.\n+ * The cached value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The default value of the '{@link #getDesc() Desc}' attribute.\n@@ -115,22 +115,22 @@ protected EClass eStaticClass()\n * \n * @generated\n */\n- public String getId()\n+ public String getName()\n {\n- return id;\n+ return name;\n }\n \n /**\n * \n * \n * @generated\n */\n- public void setId(String newId)\n+ public void setName(String newName)\n {\n- String oldId = id;\n- id = newId;\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.REFINEMENT__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.REFINEMENT__NAME, oldName, name));\n }\n \n /**\n@@ -196,8 +196,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.REFINEMENT__ID:\n- return getId();\n+ case IntentSpecificationPackage.REFINEMENT__NAME:\n+ return getName();\n case IntentSpecificationPackage.REFINEMENT__DESC:\n return getDesc();\n case IntentSpecificationPackage.REFINEMENT__INTENTS:\n@@ -217,8 +217,8 @@ public void eSet(int featureID, Object newValue)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.REFINEMENT__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.REFINEMENT__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.REFINEMENT__DESC:\n setDesc((String)newValue);\n@@ -241,8 +241,8 @@ public void eUnset(int featureID)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.REFINEMENT__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.REFINEMENT__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.REFINEMENT__DESC:\n setDesc(DESC_EDEFAULT);\n@@ -264,8 +264,8 @@ public boolean eIsSet(int featureID)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.REFINEMENT__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ case IntentSpecificationPackage.REFINEMENT__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.REFINEMENT__DESC:\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\n case IntentSpecificationPackage.REFINEMENT__INTENTS:\n@@ -285,8 +285,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(\", desc: \");\n result.append(desc);\n result.append(')');","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FRefinementImpl.java","sha":"5107d573c7e32b4b2e475b9928f8d96a17a7036b","status":"modified"},{"additions":23,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FSpecificationImpl.java","changes":46,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FSpecificationImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":23,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/SpecificationImpl.java","new_code":" *
          • {@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getName Name}
            • \n * The default value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected static final String NAME_EDEFAULT = null;\n * The cached value of the '{@link #getName() Name}' attribute.\n * @see #getName()\n protected String name = NAME_EDEFAULT;\n public String getName()\n return name;\n public void setName(String newName)\n String oldName = name;\n name = newName;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.SPECIFICATION__NAME, oldName, name));\n case IntentSpecificationPackage.SPECIFICATION__NAME:\n return getName();\n case IntentSpecificationPackage.SPECIFICATION__NAME:\n setName((String)newValue);\n case IntentSpecificationPackage.SPECIFICATION__NAME:\n setName(NAME_EDEFAULT);\n case IntentSpecificationPackage.SPECIFICATION__NAME:\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n result.append(\" (name: \");\n result.append(name);","new_methods":[],"old_code":" *
          • {@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getId Id}
            • \n * The default value of the '{@link #getId() Id}' attribute.\n * @see #getId()\n protected static final String ID_EDEFAULT = null;\n * The cached value of the '{@link #getId() Id}' attribute.\n * @see #getId()\n protected String id = ID_EDEFAULT;\n public String getId()\n return id;\n public void setId(String newId)\n String oldId = id;\n id = newId;\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.SPECIFICATION__ID, oldId, id));\n case IntentSpecificationPackage.SPECIFICATION__ID:\n return getId();\n case IntentSpecificationPackage.SPECIFICATION__ID:\n setId((String)newValue);\n case IntentSpecificationPackage.SPECIFICATION__ID:\n setId(ID_EDEFAULT);\n case IntentSpecificationPackage.SPECIFICATION__ID:\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n result.append(\" (id: \");\n result.append(id);","old_methods":[],"patch":"@@ -29,7 +29,7 @@\n *

            \n * The following features are implemented:\n *

              \n- *
            • {@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getId Id}
              • \n+ *
            • {@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getName Name}
              • \n *
            • {@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getRefinements Refinements}
              • \n *
            \n *

            \n@@ -39,24 +39,24 @@\n public class SpecificationImpl extends MinimalEObjectImpl.Container implements Specification\n {\n /**\n- * The default value of the '{@link #getId() Id}' attribute.\n+ * The default value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected static final String ID_EDEFAULT = null;\n+ protected static final String NAME_EDEFAULT = null;\n \n /**\n- * The cached value of the '{@link #getId() Id}' attribute.\n+ * The cached value of the '{@link #getName() Name}' attribute.\n * \n * \n- * @see #getId()\n+ * @see #getName()\n * @generated\n * @ordered\n */\n- protected String id = ID_EDEFAULT;\n+ protected String name = NAME_EDEFAULT;\n \n /**\n * The cached value of the '{@link #getRefinements() Refinements}' containment reference list.\n@@ -94,22 +94,22 @@ protected EClass eStaticClass()\n * \n * @generated\n */\n- public String getId()\n+ public String getName()\n {\n- return id;\n+ return name;\n }\n \n /**\n * \n * \n * @generated\n */\n- public void setId(String newId)\n+ public void setName(String newName)\n {\n- String oldId = id;\n- id = newId;\n+ String oldName = name;\n+ name = newName;\n if (eNotificationRequired())\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.SPECIFICATION__ID, oldId, id));\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.SPECIFICATION__NAME, oldName, name));\n }\n \n /**\n@@ -152,8 +152,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.SPECIFICATION__ID:\n- return getId();\n+ case IntentSpecificationPackage.SPECIFICATION__NAME:\n+ return getName();\n case IntentSpecificationPackage.SPECIFICATION__REFINEMENTS:\n return getRefinements();\n }\n@@ -171,8 +171,8 @@ public void eSet(int featureID, Object newValue)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.SPECIFICATION__ID:\n- setId((String)newValue);\n+ case IntentSpecificationPackage.SPECIFICATION__NAME:\n+ setName((String)newValue);\n return;\n case IntentSpecificationPackage.SPECIFICATION__REFINEMENTS:\n getRefinements().clear();\n@@ -192,8 +192,8 @@ public void eUnset(int featureID)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.SPECIFICATION__ID:\n- setId(ID_EDEFAULT);\n+ case IntentSpecificationPackage.SPECIFICATION__NAME:\n+ setName(NAME_EDEFAULT);\n return;\n case IntentSpecificationPackage.SPECIFICATION__REFINEMENTS:\n getRefinements().clear();\n@@ -212,8 +212,8 @@ public boolean eIsSet(int featureID)\n {\n switch (featureID)\n {\n- case IntentSpecificationPackage.SPECIFICATION__ID:\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\n+ case IntentSpecificationPackage.SPECIFICATION__NAME:\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\n case IntentSpecificationPackage.SPECIFICATION__REFINEMENTS:\n return refinements != null && !refinements.isEmpty();\n }\n@@ -231,8 +231,8 @@ public String toString()\n if (eIsProxy()) return super.toString();\n \n StringBuffer result = new StringBuffer(super.toString());\n- result.append(\" (id: \");\n- result.append(id);\n+ result.append(\" (name: \");\n+ result.append(name);\n result.append(')');\n return result.toString();\n }","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FSpecificationImpl.java","sha":"c19705d70f6549194180c1051334d1903555d07f","status":"modified"},{"additions":100,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationAdapterFactory.java","changes":100,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationAdapterFactory.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":0,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java","new_code":" public Adapter caseIntentType(IntentType object)\n {\n return createIntentTypeAdapter();\n }\n @Override\n public Adapter caseDecompositionType(DecompositionType object)\n {\n return createDecompositionTypeAdapter();\n }\n @Override\n public Adapter caseDocItemType(DocItemType object)\n {\n return createDocItemTypeAdapter();\n }\n @Override\n public Adapter caseModelType(ModelType object)\n {\n return createModelTypeAdapter();\n }\n @Override\n public Adapter caseListItemType(ListItemType object)\n {\n return createListItemTypeAdapter();\n }\n @Override\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.IntentType Intent Type}'.\n * \n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * \n * @return the new adapter.\n * @see net.certware.intent.intentSpecification.IntentType\n * @generated\n */\n public Adapter createIntentTypeAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DecompositionType Decomposition Type}'.\n * \n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * \n * @return the new adapter.\n * @see net.certware.intent.intentSpecification.DecompositionType\n * @generated\n */\n public Adapter createDecompositionTypeAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DocItemType Doc Item Type}'.\n * \n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * \n * @return the new adapter.\n * @see net.certware.intent.intentSpecification.DocItemType\n * @generated\n */\n public Adapter createDocItemTypeAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ModelType Model Type}'.\n * \n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * \n * @return the new adapter.\n * @see net.certware.intent.intentSpecification.ModelType\n * @generated\n */\n public Adapter createModelTypeAdapter()\n {\n return null;\n }\n\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ListItemType List Item Type}'.\n * \n * This default implementation returns null so that we can easily ignore cases;\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\n * \n * @return the new adapter.\n * @see net.certware.intent.intentSpecification.ListItemType\n * @generated\n */\n public Adapter createListItemTypeAdapter()\n {\n return null;\n }\n","new_methods":[{"arguments":["IntentType object"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java","implementation":"return createIntentTypeAdapter();","signature":"Adapter caseIntentType(IntentType object)"},{"arguments":["DecompositionType object"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java","implementation":"return createDecompositionTypeAdapter();","signature":"Adapter caseDecompositionType(DecompositionType object)"},{"arguments":["DocItemType object"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java","implementation":"return createDocItemTypeAdapter();","signature":"Adapter caseDocItemType(DocItemType object)"},{"arguments":["ModelType object"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java","implementation":"return createModelTypeAdapter();","signature":"Adapter caseModelType(ModelType object)"},{"arguments":["ListItemType object"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java","implementation":"return createListItemTypeAdapter();","signature":"Adapter caseListItemType(ListItemType object)"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java","implementation":"return null;","signature":"Adapter createIntentTypeAdapter()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java","implementation":"return null;","signature":"Adapter createDecompositionTypeAdapter()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java","implementation":"return null;","signature":"Adapter createDocItemTypeAdapter()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java","implementation":"return null;","signature":"Adapter createModelTypeAdapter()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java","implementation":"return null;","signature":"Adapter createListItemTypeAdapter()"}],"old_code":"","old_methods":[],"patch":"@@ -90,26 +90,51 @@ public Adapter caseIntent(Intent object)\n return createIntentAdapter();\n }\n @Override\n+ public Adapter caseIntentType(IntentType object)\n+ {\n+ return createIntentTypeAdapter();\n+ }\n+ @Override\n public Adapter caseDecomposition(Decomposition object)\n {\n return createDecompositionAdapter();\n }\n @Override\n+ public Adapter caseDecompositionType(DecompositionType object)\n+ {\n+ return createDecompositionTypeAdapter();\n+ }\n+ @Override\n public Adapter caseDocument(Document object)\n {\n return createDocumentAdapter();\n }\n @Override\n+ public Adapter caseDocItemType(DocItemType object)\n+ {\n+ return createDocItemTypeAdapter();\n+ }\n+ @Override\n public Adapter caseDocItem(DocItem object)\n {\n return createDocItemAdapter();\n }\n @Override\n+ public Adapter caseModelType(ModelType object)\n+ {\n+ return createModelTypeAdapter();\n+ }\n+ @Override\n public Adapter caseModelItem(ModelItem object)\n {\n return createModelItemAdapter();\n }\n @Override\n+ public Adapter caseListItemType(ListItemType object)\n+ {\n+ return createListItemTypeAdapter();\n+ }\n+ @Override\n public Adapter caseListItem(ListItem object)\n {\n return createListItemAdapter();\n@@ -181,6 +206,21 @@ public Adapter createIntentAdapter()\n return null;\n }\n \n+ /**\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.IntentType Intent Type}'.\n+ * \n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * \n+ * @return the new adapter.\n+ * @see net.certware.intent.intentSpecification.IntentType\n+ * @generated\n+ */\n+ public Adapter createIntentTypeAdapter()\n+ {\n+ return null;\n+ }\n+\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.Decomposition Decomposition}'.\n * \n@@ -196,6 +236,21 @@ public Adapter createDecompositionAdapter()\n return null;\n }\n \n+ /**\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DecompositionType Decomposition Type}'.\n+ * \n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * \n+ * @return the new adapter.\n+ * @see net.certware.intent.intentSpecification.DecompositionType\n+ * @generated\n+ */\n+ public Adapter createDecompositionTypeAdapter()\n+ {\n+ return null;\n+ }\n+\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.Document Document}'.\n * \n@@ -211,6 +266,21 @@ public Adapter createDocumentAdapter()\n return null;\n }\n \n+ /**\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DocItemType Doc Item Type}'.\n+ * \n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * \n+ * @return the new adapter.\n+ * @see net.certware.intent.intentSpecification.DocItemType\n+ * @generated\n+ */\n+ public Adapter createDocItemTypeAdapter()\n+ {\n+ return null;\n+ }\n+\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DocItem Doc Item}'.\n * \n@@ -226,6 +296,21 @@ public Adapter createDocItemAdapter()\n return null;\n }\n \n+ /**\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ModelType Model Type}'.\n+ * \n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * \n+ * @return the new adapter.\n+ * @see net.certware.intent.intentSpecification.ModelType\n+ * @generated\n+ */\n+ public Adapter createModelTypeAdapter()\n+ {\n+ return null;\n+ }\n+\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ModelItem Model Item}'.\n * \n@@ -241,6 +326,21 @@ public Adapter createModelItemAdapter()\n return null;\n }\n \n+ /**\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ListItemType List Item Type}'.\n+ * \n+ * This default implementation returns null so that we can easily ignore cases;\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\n+ * \n+ * @return the new adapter.\n+ * @see net.certware.intent.intentSpecification.ListItemType\n+ * @generated\n+ */\n+ public Adapter createListItemTypeAdapter()\n+ {\n+ return null;\n+ }\n+\n /**\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ListItem List Item}'.\n * ","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationAdapterFactory.java","sha":"51a62ac8fcdbac12985c2b6e26940aac8eab1f9c","status":"modified"},{"additions":115,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationSwitch.java","changes":115,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationSwitch.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":0,"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java","new_code":" case IntentSpecificationPackage.INTENT_TYPE:\n {\n IntentType intentType = (IntentType)theEObject;\n T result = caseIntentType(intentType);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case IntentSpecificationPackage.DECOMPOSITION_TYPE:\n {\n DecompositionType decompositionType = (DecompositionType)theEObject;\n T result = caseDecompositionType(decompositionType);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case IntentSpecificationPackage.DOC_ITEM_TYPE:\n {\n DocItemType docItemType = (DocItemType)theEObject;\n T result = caseDocItemType(docItemType);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case IntentSpecificationPackage.MODEL_TYPE:\n {\n ModelType modelType = (ModelType)theEObject;\n T result = caseModelType(modelType);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n case IntentSpecificationPackage.LIST_ITEM_TYPE:\n {\n ListItemType listItemType = (ListItemType)theEObject;\n T result = caseListItemType(listItemType);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n /**\n * Returns the result of interpreting the object as an instance of 'Intent Type'.\n * \n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * \n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of 'Intent Type'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseIntentType(IntentType object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of 'Decomposition Type'.\n * \n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * \n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of 'Decomposition Type'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseDecompositionType(DecompositionType object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of 'Doc Item Type'.\n * \n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * \n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of 'Doc Item Type'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseDocItemType(DocItemType object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of 'Model Type'.\n * \n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * \n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of 'Model Type'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseModelType(ModelType object)\n {\n return null;\n }\n\n /**\n * Returns the result of interpreting the object as an instance of 'List Item Type'.\n * \n * This implementation returns null;\n * returning a non-null result will terminate the switch.\n * \n * @param object the target of the switch.\n * @return the result of interpreting the object as an instance of 'List Item Type'.\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n * @generated\n */\n public T caseListItemType(ListItemType object)\n {\n return null;\n }\n","new_methods":[{"arguments":["IntentType object"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java","implementation":"return null;","signature":"T caseIntentType(IntentType object)"},{"arguments":["DecompositionType object"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java","implementation":"return null;","signature":"T caseDecompositionType(DecompositionType object)"},{"arguments":["DocItemType object"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java","implementation":"return null;","signature":"T caseDocItemType(DocItemType object)"},{"arguments":["ModelType object"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java","implementation":"return null;","signature":"T caseModelType(ModelType object)"},{"arguments":["ListItemType object"],"filename":"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java","implementation":"return null;","signature":"T caseListItemType(ListItemType object)"}],"old_code":"","old_methods":[],"patch":"@@ -93,34 +93,69 @@ protected T doSwitch(int classifierID, EObject theEObject)\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case IntentSpecificationPackage.INTENT_TYPE:\n+ {\n+ IntentType intentType = (IntentType)theEObject;\n+ T result = caseIntentType(intentType);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n case IntentSpecificationPackage.DECOMPOSITION:\n {\n Decomposition decomposition = (Decomposition)theEObject;\n T result = caseDecomposition(decomposition);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case IntentSpecificationPackage.DECOMPOSITION_TYPE:\n+ {\n+ DecompositionType decompositionType = (DecompositionType)theEObject;\n+ T result = caseDecompositionType(decompositionType);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n case IntentSpecificationPackage.DOCUMENT:\n {\n Document document = (Document)theEObject;\n T result = caseDocument(document);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case IntentSpecificationPackage.DOC_ITEM_TYPE:\n+ {\n+ DocItemType docItemType = (DocItemType)theEObject;\n+ T result = caseDocItemType(docItemType);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n case IntentSpecificationPackage.DOC_ITEM:\n {\n DocItem docItem = (DocItem)theEObject;\n T result = caseDocItem(docItem);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case IntentSpecificationPackage.MODEL_TYPE:\n+ {\n+ ModelType modelType = (ModelType)theEObject;\n+ T result = caseModelType(modelType);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n case IntentSpecificationPackage.MODEL_ITEM:\n {\n ModelItem modelItem = (ModelItem)theEObject;\n T result = caseModelItem(modelItem);\n if (result == null) result = defaultCase(theEObject);\n return result;\n }\n+ case IntentSpecificationPackage.LIST_ITEM_TYPE:\n+ {\n+ ListItemType listItemType = (ListItemType)theEObject;\n+ T result = caseListItemType(listItemType);\n+ if (result == null) result = defaultCase(theEObject);\n+ return result;\n+ }\n case IntentSpecificationPackage.LIST_ITEM:\n {\n ListItem listItem = (ListItem)theEObject;\n@@ -180,6 +215,22 @@ public T caseIntent(Intent object)\n return null;\n }\n \n+ /**\n+ * Returns the result of interpreting the object as an instance of 'Intent Type'.\n+ * \n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * \n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of 'Intent Type'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseIntentType(IntentType object)\n+ {\n+ return null;\n+ }\n+\n /**\n * Returns the result of interpreting the object as an instance of 'Decomposition'.\n * \n@@ -196,6 +247,22 @@ public T caseDecomposition(Decomposition object)\n return null;\n }\n \n+ /**\n+ * Returns the result of interpreting the object as an instance of 'Decomposition Type'.\n+ * \n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * \n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of 'Decomposition Type'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseDecompositionType(DecompositionType object)\n+ {\n+ return null;\n+ }\n+\n /**\n * Returns the result of interpreting the object as an instance of 'Document'.\n * \n@@ -212,6 +279,22 @@ public T caseDocument(Document object)\n return null;\n }\n \n+ /**\n+ * Returns the result of interpreting the object as an instance of 'Doc Item Type'.\n+ * \n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * \n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of 'Doc Item Type'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseDocItemType(DocItemType object)\n+ {\n+ return null;\n+ }\n+\n /**\n * Returns the result of interpreting the object as an instance of 'Doc Item'.\n * \n@@ -228,6 +311,22 @@ public T caseDocItem(DocItem object)\n return null;\n }\n \n+ /**\n+ * Returns the result of interpreting the object as an instance of 'Model Type'.\n+ * \n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * \n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of 'Model Type'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseModelType(ModelType object)\n+ {\n+ return null;\n+ }\n+\n /**\n * Returns the result of interpreting the object as an instance of 'Model Item'.\n * \n@@ -244,6 +343,22 @@ public T caseModelItem(ModelItem object)\n return null;\n }\n \n+ /**\n+ * Returns the result of interpreting the object as an instance of 'List Item Type'.\n+ * \n+ * This implementation returns null;\n+ * returning a non-null result will terminate the switch.\n+ * \n+ * @param object the target of the switch.\n+ * @return the result of interpreting the object as an instance of 'List Item Type'.\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\n+ * @generated\n+ */\n+ public T caseListItemType(ListItemType object)\n+ {\n+ return null;\n+ }\n+\n /**\n * Returns the result of interpreting the object as an instance of 'List Item'.\n * ","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationSwitch.java","sha":"737b7f8b8e698aeb8ad2c8c40d2f06654663c646","status":"modified"},{"additions":338,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecification.g","changes":501,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecification.g?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":163,"filename":"net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g","new_code":"\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \n\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \n\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \nentryRuleIntentType returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getIntentTypeRule()); }\n\t { $current=$iv_ruleIntentType.current; } \nruleIntentType returns [EObject current=null] \n(\n(\n\t\tlv_typeName_0_1=\t'basic' \n newLeafNode(lv_typeName_0_1, grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n\t }\n |\t\tlv_typeName_0_2=\t'purpose' \n newLeafNode(lv_typeName_0_2, grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n\t }\n |\t\tlv_typeName_0_3=\t'principles' \n newLeafNode(lv_typeName_0_3, grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n\t }\n |\t\tlv_typeName_0_4=\t'models' \n newLeafNode(lv_typeName_0_4, grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n\t }\n |\t\tlv_typeName_0_5=\t'design' \n newLeafNode(lv_typeName_0_5, grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_5, null);\n\t }\n |\t\tlv_typeName_0_6=\t'implementation' \n newLeafNode(lv_typeName_0_6, grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_6, null);\n\t }\n |\t\tlv_typeName_0_7=\t'operation' \n newLeafNode(lv_typeName_0_7, grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_7, null);\n\t }\n\n\n)\n)\n;\n\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \nentryRuleDecompositionType returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getDecompositionTypeRule()); }\n\t { $current=$iv_ruleDecompositionType.current; } \nruleDecompositionType returns [EObject current=null] \n(\n(\n\t\tlv_typeName_0_1=\t'environment' \n newLeafNode(lv_typeName_0_1, grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n\t }\n |\t\tlv_typeName_0_2=\t'operator' \n newLeafNode(lv_typeName_0_2, grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n\t }\n |\t\tlv_typeName_0_3=\t'system' \n newLeafNode(lv_typeName_0_3, grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n\t }\n |\t\tlv_typeName_0_4=\t'verification' \n newLeafNode(lv_typeName_0_4, grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n\t }\n\n)\n\n)\n;\nentryRuleDocItemType returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getDocItemTypeRule()); }\n\t { $current=$iv_ruleDocItemType.current; } \nruleDocItemType returns [EObject current=null] \n(\n(\n\t\tlv_typeName_0_1=\t'condition' \n newLeafNode(lv_typeName_0_1, grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n\t }\n |\t\tlv_typeName_0_2=\t'figure' \n newLeafNode(lv_typeName_0_2, grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n\t }\n |\t\tlv_typeName_0_3=\t'break' \n newLeafNode(lv_typeName_0_3, grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n\t }\n |\t\tlv_typeName_0_4=\t'model' \n newLeafNode(lv_typeName_0_4, grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n\t }\n |\t\tlv_typeName_0_5=\t'paragraph' \n newLeafNode(lv_typeName_0_5, grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_5, null);\n\t }\n |\t\tlv_typeName_0_6=\t'section' \n newLeafNode(lv_typeName_0_6, grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_6, null);\n\t }\n |\t\tlv_typeName_0_7=\t'table' \n newLeafNode(lv_typeName_0_7, grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_7, null);\n\t }\n\n\n)\n)\n;\n\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \nentryRuleModelType returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getModelTypeRule()); }\n\t { $current=$iv_ruleModelType.current; } \nruleModelType returns [EObject current=null] \n(\n(\n\t\tlv_typeName_0_1=\t'output' \n newLeafNode(lv_typeName_0_1, grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getModelTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n\t }\n |\t\tlv_typeName_0_2=\t'mode' \n newLeafNode(lv_typeName_0_2, grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getModelTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n\t }\n |\t\tlv_typeName_0_3=\t'state' \n newLeafNode(lv_typeName_0_3, grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getModelTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n\t }\n |\t\tlv_typeName_0_4=\t'macro' \n newLeafNode(lv_typeName_0_4, grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getModelTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n\t }\n |\t\tlv_typeName_0_5=\t'function' \n newLeafNode(lv_typeName_0_5, grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getModelTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_5, null);\n\t }\n |\t\tlv_typeName_0_6=\t'input' \n newLeafNode(lv_typeName_0_6, grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getModelTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_6, null);\n\t }\n\n\n)\n)\n;\n\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \nentryRuleListItemType returns [EObject current=null] \n\t{ newCompositeNode(grammarAccess.getListItemTypeRule()); }\n\t { $current=$iv_ruleListItemType.current; } \nruleListItemType returns [EObject current=null] \n(\n(\n\t\tlv_typeName_0_1=\t'requirement' \n newLeafNode(lv_typeName_0_1, grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n\t }\n |\t\tlv_typeName_0_2=\t'goal' \n newLeafNode(lv_typeName_0_2, grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n\t }\n |\t\tlv_typeName_0_3=\t'hazard' \n newLeafNode(lv_typeName_0_3, grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n\t }\n |\t\tlv_typeName_0_4=\t'constraint' \n newLeafNode(lv_typeName_0_4, grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3());\n \n\t {\n\t if ($current==null) {\n\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n\t }\n \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n\t }\n\n\n)\n)\n;\n\t\tlv_name_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t\t\"name\",\n \t\tlv_name_1_0, \n)+\totherlv_5='}' \n)+\totherlv_8=')' \n)+\totherlv_11=']' ","new_methods":[],"old_code":"\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \n\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \n\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \nentryRuleIntentType returns [String current=null] \n\t{ newCompositeNode(grammarAccess.getIntentTypeRule()); } \n\t { $current=$iv_ruleIntentType.current.getText(); } \nruleIntentType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n\tkw='basic' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); \n |\n\tkw='purpose' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); \n |\n\tkw='principles' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); \n |\n\tkw='models' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); \n |\n\tkw='design' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); \n |\n\tkw='implementation' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); \n |\n\tkw='operation' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); \n ;\n\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \nentryRuleDecompositionType returns [String current=null] \n\t{ newCompositeNode(grammarAccess.getDecompositionTypeRule()); } \n\t { $current=$iv_ruleDecompositionType.current.getText(); } \nruleDecompositionType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n\tkw='environment' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); \n |\n\tkw='operator' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); \n |\n\tkw='system' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); \n |\n\tkw='verification' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); \n ;\nentryRuleDocItemType returns [String current=null] \n\t{ newCompositeNode(grammarAccess.getDocItemTypeRule()); } \n\t { $current=$iv_ruleDocItemType.current.getText(); } \nruleDocItemType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n\tkw='condition' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); \n |\n\tkw='figure' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); \n |\n\tkw='break' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); \n |\n\tkw='model' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); \n |\n\tkw='paragraph' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); \n |\n\tkw='section' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); \n |\n\tkw='table' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); \n ;\n\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \nentryRuleModelType returns [String current=null] \n\t{ newCompositeNode(grammarAccess.getModelTypeRule()); } \n\t { $current=$iv_ruleModelType.current.getText(); } \nruleModelType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n\tkw='output' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getOutputKeyword_0()); \n |\n\tkw='mode' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getModeKeyword_1()); \n |\n\tkw='state' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getStateKeyword_2()); \n |\n\tkw='macro' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getMacroKeyword_3()); \n |\n\tkw='function' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); \n |\n\tkw='input' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getInputKeyword_5()); \n ;\n\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \nentryRuleListItemType returns [String current=null] \n\t{ newCompositeNode(grammarAccess.getListItemTypeRule()); } \n\t { $current=$iv_ruleListItemType.current.getText(); } \nruleListItemType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n\tkw='requirement' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); \n |\n\tkw='goal' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); \n |\n\tkw='hazard' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); \n |\n\tkw='constraint' \n $current.merge(kw);\n newLeafNode(kw, grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); \n ;\n\t\tlv_id_1_0=RULE_ID\n\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); \n \t\t\t\"id\",\n \t\tlv_id_1_0, \n)*\totherlv_5='}' \n)*\totherlv_8=')' \n)*\totherlv_11=']' ","old_methods":[],"patch":"@@ -83,18 +83,18 @@ ruleSpecification returns [EObject current=null]\n }\n (\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getSpecificationRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -144,18 +144,18 @@ ruleRefinement returns [EObject current=null]\n }\n (\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getRefinementRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -237,18 +237,18 @@ ruleIntent returns [EObject current=null]\n )\n )(\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getIntentRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -297,69 +297,111 @@ ruleIntent returns [EObject current=null]\n \n \n // Entry rule entryRuleIntentType\n-entryRuleIntentType returns [String current=null] \n+entryRuleIntentType returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getIntentTypeRule()); } \n+\t{ newCompositeNode(grammarAccess.getIntentTypeRule()); }\n \t iv_ruleIntentType=ruleIntentType \n-\t { $current=$iv_ruleIntentType.current.getText(); } \n+\t { $current=$iv_ruleIntentType.current; } \n \t EOF \n ;\n \n // Rule IntentType\n-ruleIntentType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n+ruleIntentType returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n (\n-\tkw='basic' \n+(\n+(\n+\t\tlv_typeName_0_1=\t'basic' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); \n+ newLeafNode(lv_typeName_0_1, grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n+\t }\n \n- |\n-\tkw='purpose' \n+ |\t\tlv_typeName_0_2=\t'purpose' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); \n+ newLeafNode(lv_typeName_0_2, grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n+\t }\n \n- |\n-\tkw='principles' \n+ |\t\tlv_typeName_0_3=\t'principles' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); \n+ newLeafNode(lv_typeName_0_3, grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n+\t }\n \n- |\n-\tkw='models' \n+ |\t\tlv_typeName_0_4=\t'models' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); \n+ newLeafNode(lv_typeName_0_4, grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n+\t }\n \n- |\n-\tkw='design' \n+ |\t\tlv_typeName_0_5=\t'design' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); \n+ newLeafNode(lv_typeName_0_5, grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_5, null);\n+\t }\n \n- |\n-\tkw='implementation' \n+ |\t\tlv_typeName_0_6=\t'implementation' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); \n+ newLeafNode(lv_typeName_0_6, grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_6, null);\n+\t }\n \n- |\n-\tkw='operation' \n+ |\t\tlv_typeName_0_7=\t'operation' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); \n+ newLeafNode(lv_typeName_0_7, grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getIntentTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_7, null);\n+\t }\n+\n )\n- ;\n+\n+)\n+)\n+;\n \n \n \n@@ -399,18 +441,18 @@ ruleDecomposition returns [EObject current=null]\n )\n )(\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getDecompositionRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -519,48 +561,75 @@ ruleDecomposition returns [EObject current=null]\n \n \n // Entry rule entryRuleDecompositionType\n-entryRuleDecompositionType returns [String current=null] \n+entryRuleDecompositionType returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getDecompositionTypeRule()); } \n+\t{ newCompositeNode(grammarAccess.getDecompositionTypeRule()); }\n \t iv_ruleDecompositionType=ruleDecompositionType \n-\t { $current=$iv_ruleDecompositionType.current.getText(); } \n+\t { $current=$iv_ruleDecompositionType.current; } \n \t EOF \n ;\n \n // Rule DecompositionType\n-ruleDecompositionType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n+ruleDecompositionType returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n (\n-\tkw='environment' \n+(\n+(\n+\t\tlv_typeName_0_1=\t'environment' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); \n+ newLeafNode(lv_typeName_0_1, grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n+\t }\n \n- |\n-\tkw='operator' \n+ |\t\tlv_typeName_0_2=\t'operator' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); \n+ newLeafNode(lv_typeName_0_2, grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n+\t }\n \n- |\n-\tkw='system' \n+ |\t\tlv_typeName_0_3=\t'system' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); \n+ newLeafNode(lv_typeName_0_3, grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n+\t }\n \n- |\n-\tkw='verification' \n+ |\t\tlv_typeName_0_4=\t'verification' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); \n+ newLeafNode(lv_typeName_0_4, grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n+\t }\n+\n+)\n+\n )\n- ;\n+)\n+;\n \n \n \n@@ -614,69 +683,111 @@ ruleDocument returns [EObject current=null]\n \n \n // Entry rule entryRuleDocItemType\n-entryRuleDocItemType returns [String current=null] \n+entryRuleDocItemType returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getDocItemTypeRule()); } \n+\t{ newCompositeNode(grammarAccess.getDocItemTypeRule()); }\n \t iv_ruleDocItemType=ruleDocItemType \n-\t { $current=$iv_ruleDocItemType.current.getText(); } \n+\t { $current=$iv_ruleDocItemType.current; } \n \t EOF \n ;\n \n // Rule DocItemType\n-ruleDocItemType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n+ruleDocItemType returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n (\n-\tkw='condition' \n+(\n+(\n+\t\tlv_typeName_0_1=\t'condition' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); \n+ newLeafNode(lv_typeName_0_1, grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n+\t }\n \n- |\n-\tkw='figure' \n+ |\t\tlv_typeName_0_2=\t'figure' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); \n+ newLeafNode(lv_typeName_0_2, grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n+\t }\n \n- |\n-\tkw='break' \n+ |\t\tlv_typeName_0_3=\t'break' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); \n+ newLeafNode(lv_typeName_0_3, grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n+\t }\n \n- |\n-\tkw='model' \n+ |\t\tlv_typeName_0_4=\t'model' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); \n+ newLeafNode(lv_typeName_0_4, grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n+\t }\n \n- |\n-\tkw='paragraph' \n+ |\t\tlv_typeName_0_5=\t'paragraph' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); \n+ newLeafNode(lv_typeName_0_5, grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_5, null);\n+\t }\n \n- |\n-\tkw='section' \n+ |\t\tlv_typeName_0_6=\t'section' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); \n+ newLeafNode(lv_typeName_0_6, grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_6, null);\n+\t }\n \n- |\n-\tkw='table' \n+ |\t\tlv_typeName_0_7=\t'table' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); \n+ newLeafNode(lv_typeName_0_7, grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_7, null);\n+\t }\n+\n )\n- ;\n+\n+)\n+)\n+;\n \n \n \n@@ -716,18 +827,18 @@ ruleDocItem returns [EObject current=null]\n )\n )(\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getDocItemRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -762,62 +873,99 @@ ruleDocItem returns [EObject current=null]\n \n \n // Entry rule entryRuleModelType\n-entryRuleModelType returns [String current=null] \n+entryRuleModelType returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getModelTypeRule()); } \n+\t{ newCompositeNode(grammarAccess.getModelTypeRule()); }\n \t iv_ruleModelType=ruleModelType \n-\t { $current=$iv_ruleModelType.current.getText(); } \n+\t { $current=$iv_ruleModelType.current; } \n \t EOF \n ;\n \n // Rule ModelType\n-ruleModelType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n+ruleModelType returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n (\n-\tkw='output' \n+(\n+(\n+\t\tlv_typeName_0_1=\t'output' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getOutputKeyword_0()); \n+ newLeafNode(lv_typeName_0_1, grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getModelTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n+\t }\n \n- |\n-\tkw='mode' \n+ |\t\tlv_typeName_0_2=\t'mode' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getModeKeyword_1()); \n+ newLeafNode(lv_typeName_0_2, grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getModelTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n+\t }\n \n- |\n-\tkw='state' \n+ |\t\tlv_typeName_0_3=\t'state' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getStateKeyword_2()); \n+ newLeafNode(lv_typeName_0_3, grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getModelTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n+\t }\n \n- |\n-\tkw='macro' \n+ |\t\tlv_typeName_0_4=\t'macro' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getMacroKeyword_3()); \n+ newLeafNode(lv_typeName_0_4, grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getModelTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n+\t }\n \n- |\n-\tkw='function' \n+ |\t\tlv_typeName_0_5=\t'function' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); \n+ newLeafNode(lv_typeName_0_5, grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getModelTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_5, null);\n+\t }\n \n- |\n-\tkw='input' \n+ |\t\tlv_typeName_0_6=\t'input' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getInputKeyword_5()); \n+ newLeafNode(lv_typeName_0_6, grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getModelTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_6, null);\n+\t }\n+\n )\n- ;\n+\n+)\n+)\n+;\n \n \n \n@@ -857,18 +1005,18 @@ ruleModelItem returns [EObject current=null]\n )\n )(\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getModelItemRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -903,48 +1051,75 @@ ruleModelItem returns [EObject current=null]\n \n \n // Entry rule entryRuleListItemType\n-entryRuleListItemType returns [String current=null] \n+entryRuleListItemType returns [EObject current=null] \n \t:\n-\t{ newCompositeNode(grammarAccess.getListItemTypeRule()); } \n+\t{ newCompositeNode(grammarAccess.getListItemTypeRule()); }\n \t iv_ruleListItemType=ruleListItemType \n-\t { $current=$iv_ruleListItemType.current.getText(); } \n+\t { $current=$iv_ruleListItemType.current; } \n \t EOF \n ;\n \n // Rule ListItemType\n-ruleListItemType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \n+ruleListItemType returns [EObject current=null] \n @init { enterRule(); \n }\n @after { leaveRule(); }:\n (\n-\tkw='requirement' \n+(\n+(\n+\t\tlv_typeName_0_1=\t'requirement' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); \n+ newLeafNode(lv_typeName_0_1, grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_1, null);\n+\t }\n \n- |\n-\tkw='goal' \n+ |\t\tlv_typeName_0_2=\t'goal' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); \n+ newLeafNode(lv_typeName_0_2, grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_2, null);\n+\t }\n \n- |\n-\tkw='hazard' \n+ |\t\tlv_typeName_0_3=\t'hazard' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); \n+ newLeafNode(lv_typeName_0_3, grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_3, null);\n+\t }\n \n- |\n-\tkw='constraint' \n+ |\t\tlv_typeName_0_4=\t'constraint' \n {\n- $current.merge(kw);\n- newLeafNode(kw, grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); \n+ newLeafNode(lv_typeName_0_4, grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3());\n }\n+ \n+\t {\n+\t if ($current==null) {\n+\t $current = createModelElement(grammarAccess.getListItemTypeRule());\n+\t }\n+ \t\tsetWithLastConsumed($current, \"typeName\", lv_typeName_0_4, null);\n+\t }\n+\n )\n- ;\n+\n+)\n+)\n+;\n \n \n \n@@ -984,18 +1159,18 @@ ruleListItem returns [EObject current=null]\n )\n )(\n (\n-\t\tlv_id_1_0=RULE_ID\n+\t\tlv_name_1_0=RULE_ID\n \t\t{\n-\t\t\tnewLeafNode(lv_id_1_0, grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); \n+\t\t\tnewLeafNode(lv_name_1_0, grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); \n \t\t}\n \t\t{\n \t if ($current==null) {\n \t $current = createModelElement(grammarAccess.getListItemRule());\n \t }\n \t\tsetWithLastConsumed(\n \t\t\t$current, \n- \t\t\t\"id\",\n- \t\tlv_id_1_0, \n+ \t\t\t\"name\",\n+ \t\tlv_name_1_0, \n \t\t\"ID\");\n \t }\n \n@@ -1035,7 +1210,7 @@ ruleListItem returns [EObject current=null]\n \t}\n \n )\n-)*\totherlv_5='}' \n+)+\totherlv_5='}' \n {\n \tnewLeafNode(otherlv_5, grammarAccess.getListItemAccess().getRightCurlyBracketKeyword_3_2());\n }\n@@ -1056,7 +1231,7 @@ ruleListItem returns [EObject current=null]\n \t}\n \n )\n-)*\totherlv_8=')' \n+)+\totherlv_8=')' \n {\n \tnewLeafNode(otherlv_8, grammarAccess.getListItemAccess().getRightParenthesisKeyword_4_2());\n }\n@@ -1077,7 +1252,7 @@ ruleListItem returns [EObject current=null]\n \t}\n \n )\n-)*\totherlv_11=']' \n+)+\totherlv_11=']' \n {\n \tnewLeafNode(otherlv_11, grammarAccess.getListItemAccess().getRightSquareBracketKeyword_5_2());\n }","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecification.g","sha":"4fc8eaa413792493d9f6a86fe2901598cd519e9d","status":"modified"},{"additions":37,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java","changes":74,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":37,"filename":"net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecificationLexer.java","new_code":" // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: ( '^' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: '^'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:10: ( ( '0' .. '9' )+ )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:12: ( '0' .. '9' )+\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:12: ( '0' .. '9' )+\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:13: '0' .. '9'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:24: ( options {greedy=false; } : . )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:52: .\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: ( '\\\\r' )? '\\\\n'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: ( '\\\\r' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: '\\\\r'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1282:16: ( . )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1282:18: .","new_methods":[],"old_code":" // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: ( '^' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: '^'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:10: ( ( '0' .. '9' )+ )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:12: ( '0' .. '9' )+\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:12: ( '0' .. '9' )+\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:13: '0' .. '9'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:19: '/*' ( options {greedy=false; } : . )* '*/'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:24: ( options {greedy=false; } : . )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:52: .\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:40: ( ( '\\\\r' )? '\\\\n' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: ( '\\\\r' )? '\\\\n'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: ( '\\\\r' )?\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: '\\\\r'\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1107:16: ( . )\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1107:18: .","old_methods":[],"patch":"@@ -846,10 +846,10 @@ public final void mRULE_ID() throws RecognitionException {\n try {\n int _type = RULE_ID;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n {\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: ( '^' )?\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: ( '^' )?\n int alt1=2;\n int LA1_0 = input.LA(1);\n \n@@ -858,7 +858,7 @@ public final void mRULE_ID() throws RecognitionException {\n }\n switch (alt1) {\n case 1 :\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: '^'\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: '^'\n {\n match('^'); \n \n@@ -876,7 +876,7 @@ public final void mRULE_ID() throws RecognitionException {\n recover(mse);\n throw mse;}\n \n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\n loop2:\n do {\n int alt2=2;\n@@ -925,10 +925,10 @@ public final void mRULE_INT() throws RecognitionException {\n try {\n int _type = RULE_INT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:10: ( ( '0' .. '9' )+ )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:12: ( '0' .. '9' )+\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:10: ( ( '0' .. '9' )+ )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:12: ( '0' .. '9' )+\n {\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:12: ( '0' .. '9' )+\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:12: ( '0' .. '9' )+\n int cnt3=0;\n loop3:\n do {\n@@ -942,7 +942,7 @@ public final void mRULE_INT() throws RecognitionException {\n \n switch (alt3) {\n \tcase 1 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:13: '0' .. '9'\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:13: '0' .. '9'\n \t {\n \t matchRange('0','9'); \n \n@@ -974,10 +974,10 @@ public final void mRULE_STRING() throws RecognitionException {\n try {\n int _type = RULE_STRING;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:13: ( ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' ) )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n {\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:15: ( '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"' | '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\'' )\n int alt6=2;\n int LA6_0 = input.LA(1);\n \n@@ -995,10 +995,10 @@ else if ( (LA6_0=='\\'') ) {\n }\n switch (alt6) {\n case 1 :\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:16: '\\\"' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )* '\\\"'\n {\n match('\\\"'); \n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:20: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\"' ) ) )*\n loop4:\n do {\n int alt4=3;\n@@ -1014,7 +1014,7 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n \n switch (alt4) {\n \tcase 1 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:21: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -1030,7 +1030,7 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:66: ~ ( ( '\\\\\\\\' | '\\\"' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1055,10 +1055,10 @@ else if ( ((LA4_0>='\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\n }\n break;\n case 2 :\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:86: '\\\\'' ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )* '\\\\''\n {\n match('\\''); \n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:91: ( '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' ) | ~ ( ( '\\\\\\\\' | '\\\\'' ) ) )*\n loop5:\n do {\n int alt5=3;\n@@ -1074,7 +1074,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\n \n switch (alt5) {\n \tcase 1 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:92: '\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\"' | '\\\\'' | '\\\\\\\\' )\n \t {\n \t match('\\\\'); \n \t if ( input.LA(1)=='\\\"'||input.LA(1)=='\\''||input.LA(1)=='\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\n@@ -1090,7 +1090,7 @@ else if ( ((LA5_0>='\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\n \t }\n \t break;\n \tcase 2 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:137: ~ ( ( '\\\\\\\\' | '\\\\'' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1133,12 +1133,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_ML_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:19: '/*' ( options {greedy=false; } : . )* '*/'\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:19: '/*' ( options {greedy=false; } : . )* '*/'\n {\n match(\"/*\"); \n \n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:24: ( options {greedy=false; } : . )*\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:24: ( options {greedy=false; } : . )*\n loop7:\n do {\n int alt7=2;\n@@ -1163,7 +1163,7 @@ else if ( ((LA7_0>='\\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\\uFFFF')) ) {\n \n switch (alt7) {\n \tcase 1 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:52: .\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:52: .\n \t {\n \t matchAny(); \n \n@@ -1193,12 +1193,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n try {\n int _type = RULE_SL_COMMENT;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:17: ( '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )? )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:19: '//' (~ ( ( '\\\\n' | '\\\\r' ) ) )* ( ( '\\\\r' )? '\\\\n' )?\n {\n match(\"//\"); \n \n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:24: (~ ( ( '\\\\n' | '\\\\r' ) ) )*\n loop8:\n do {\n int alt8=2;\n@@ -1211,7 +1211,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n \n switch (alt8) {\n \tcase 1 :\n- \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n+ \t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:24: ~ ( ( '\\\\n' | '\\\\r' ) )\n \t {\n \t if ( (input.LA(1)>='\\u0000' && input.LA(1)<='\\t')||(input.LA(1)>='\\u000B' && input.LA(1)<='\\f')||(input.LA(1)>='\\u000E' && input.LA(1)<='\\uFFFF') ) {\n \t input.consume();\n@@ -1231,7 +1231,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n } while (true);\n \n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:40: ( ( '\\\\r' )? '\\\\n' )?\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:40: ( ( '\\\\r' )? '\\\\n' )?\n int alt10=2;\n int LA10_0 = input.LA(1);\n \n@@ -1240,9 +1240,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt10) {\n case 1 :\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: ( '\\\\r' )? '\\\\n'\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: ( '\\\\r' )? '\\\\n'\n {\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: ( '\\\\r' )?\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: ( '\\\\r' )?\n int alt9=2;\n int LA9_0 = input.LA(1);\n \n@@ -1251,7 +1251,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\n }\n switch (alt9) {\n case 1 :\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: '\\\\r'\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: '\\\\r'\n {\n match('\\r'); \n \n@@ -1283,10 +1283,10 @@ public final void mRULE_WS() throws RecognitionException {\n try {\n int _type = RULE_WS;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:9: ( ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+ )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n {\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:11: ( ' ' | '\\\\t' | '\\\\r' | '\\\\n' )+\n int cnt11=0;\n loop11:\n do {\n@@ -1340,8 +1340,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\n try {\n int _type = RULE_ANY_OTHER;\n int _channel = DEFAULT_TOKEN_CHANNEL;\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1107:16: ( . )\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1107:18: .\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1282:16: ( . )\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1282:18: .\n {\n matchAny(); \n ","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java","sha":"18f7294e0031576cfeb922c0d98957cc758ceb78","status":"modified"},{"additions":116,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSemanticSequencer.java","changes":129,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSemanticSequencer.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":13,"filename":"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java","new_code":"import net.certware.intent.intentSpecification.DecompositionType;\nimport net.certware.intent.intentSpecification.DocItemType;\nimport net.certware.intent.intentSpecification.IntentType;\nimport net.certware.intent.intentSpecification.ListItemType;\nimport net.certware.intent.intentSpecification.ModelType;\n\t\t\tcase IntentSpecificationPackage.DECOMPOSITION_TYPE:\n\t\t\t\tif(context == grammarAccess.getDecompositionTypeRule()) {\n\t\t\t\t\tsequence_DecompositionType(context, (DecompositionType) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase IntentSpecificationPackage.DOC_ITEM_TYPE:\n\t\t\t\tif(context == grammarAccess.getDocItemTypeRule()) {\n\t\t\t\t\tsequence_DocItemType(context, (DocItemType) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase IntentSpecificationPackage.INTENT_TYPE:\n\t\t\t\tif(context == grammarAccess.getIntentTypeRule()) {\n\t\t\t\t\tsequence_IntentType(context, (IntentType) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase IntentSpecificationPackage.LIST_ITEM_TYPE:\n\t\t\t\tif(context == grammarAccess.getListItemTypeRule()) {\n\t\t\t\t\tsequence_ListItemType(context, (ListItemType) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t\t\tcase IntentSpecificationPackage.MODEL_TYPE:\n\t\t\t\tif(context == grammarAccess.getModelTypeRule()) {\n\t\t\t\t\tsequence_ModelType(context, (ModelType) semanticObject); \n\t\t\t\t\treturn; \n\t\t\t\t}\n\t\t\t\telse break;\n\t/**\n\t * Constraint:\n\t * (typeName='environment' | typeName='operator' | typeName='system' | typeName='verification')\n\t */\n\tprotected void sequence_DecompositionType(EObject context, DecompositionType semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t * name=ID \n\t * (\n\t * typeName='condition' | \n\t * typeName='figure' | \n\t * typeName='break' | \n\t * typeName='model' | \n\t * typeName='paragraph' | \n\t * typeName='section' | \n\t * typeName='table'\n\t * )\n\t */\n\tprotected void sequence_DocItemType(EObject context, DocItemType semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * (type=DocItemType name=ID ref=STRING)\n\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__NAME) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__NAME));\n\t\tfeeder.accept(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());\n\t * (\n\t * typeName='basic' | \n\t * typeName='purpose' | \n\t * typeName='principles' | \n\t * typeName='models' | \n\t * typeName='design' | \n\t * typeName='implementation' | \n\t * typeName='operation'\n\t * )\n\t */\n\tprotected void sequence_IntentType(EObject context, IntentType semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * (type=IntentType name=ID desc=STRING decompositions+=Decomposition+)\n\t/**\n\t * Constraint:\n\t * (typeName='requirement' | typeName='goal' | typeName='hazard' | typeName='constraint')\n\t */\n\tprotected void sequence_ListItemType(EObject context, ListItemType semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t * name=ID \n\t * (type=ModelType name=ID desc=STRING)\n\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__NAME) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__NAME));\n\t\tfeeder.accept(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());\n\t * (\n\t * typeName='output' | \n\t * typeName='mode' | \n\t * typeName='state' | \n\t * typeName='macro' | \n\t * typeName='function' | \n\t * typeName='input'\n\t * )\n\t */\n\tprotected void sequence_ModelType(EObject context, ModelType semanticObject) {\n\t\tgenericSequencer.createSequence(context, semanticObject);\n\t}\n\t\n\t\n\t/**\n\t * Constraint:\n\t * (name=ID desc=STRING intents+=Intent+)\n\t * (name=ID refinements+=Refinement+)","new_methods":[{"arguments":["EObject context"," DecompositionType semanticObject"],"filename":"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java","implementation":"genericSequencer.createSequence(context, semanticObject);","signature":"void sequence_DecompositionType(EObject context, DecompositionType semanticObject)"},{"arguments":["EObject context"," DocItemType semanticObject"],"filename":"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java","implementation":"genericSequencer.createSequence(context, semanticObject);","signature":"void sequence_DocItemType(EObject context, DocItemType semanticObject)"},{"arguments":["EObject context"," IntentType semanticObject"],"filename":"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java","implementation":"genericSequencer.createSequence(context, semanticObject);","signature":"void sequence_IntentType(EObject context, IntentType semanticObject)"},{"arguments":["EObject context"," ListItemType semanticObject"],"filename":"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java","implementation":"genericSequencer.createSequence(context, semanticObject);","signature":"void sequence_ListItemType(EObject context, ListItemType semanticObject)"},{"arguments":["EObject context"," ModelType semanticObject"],"filename":"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java","implementation":"genericSequencer.createSequence(context, semanticObject);","signature":"void sequence_ModelType(EObject context, ModelType semanticObject)"}],"old_code":"\t * id=ID \n\t * (type=DocItemType id=ID ref=STRING)\n\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__ID) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__ID));\n\t\tfeeder.accept(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());\n\t * (type=IntentType id=ID desc=STRING decompositions+=Decomposition+)\n\t * id=ID \n\t * (type=ModelType id=ID desc=STRING)\n\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__ID) == ValueTransient.YES)\n\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__ID));\n\t\tfeeder.accept(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());\n\t * (id=ID desc=STRING intents+=Intent+)\n\t * (id=ID refinements+=Refinement+)","old_methods":[],"patch":"@@ -3,12 +3,17 @@\n import com.google.inject.Inject;\n import com.google.inject.Provider;\n import net.certware.intent.intentSpecification.Decomposition;\n+import net.certware.intent.intentSpecification.DecompositionType;\n import net.certware.intent.intentSpecification.DocItem;\n+import net.certware.intent.intentSpecification.DocItemType;\n import net.certware.intent.intentSpecification.Document;\n import net.certware.intent.intentSpecification.Intent;\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n+import net.certware.intent.intentSpecification.IntentType;\n import net.certware.intent.intentSpecification.ListItem;\n+import net.certware.intent.intentSpecification.ListItemType;\n import net.certware.intent.intentSpecification.ModelItem;\n+import net.certware.intent.intentSpecification.ModelType;\n import net.certware.intent.intentSpecification.Refinement;\n import net.certware.intent.intentSpecification.Specification;\n import net.certware.intent.services.IntentSpecificationGrammarAccess;\n@@ -38,12 +43,24 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n+\t\t\tcase IntentSpecificationPackage.DECOMPOSITION_TYPE:\n+\t\t\t\tif(context == grammarAccess.getDecompositionTypeRule()) {\n+\t\t\t\t\tsequence_DecompositionType(context, (DecompositionType) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n \t\t\tcase IntentSpecificationPackage.DOC_ITEM:\n \t\t\t\tif(context == grammarAccess.getDocItemRule()) {\n \t\t\t\t\tsequence_DocItem(context, (DocItem) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n+\t\t\tcase IntentSpecificationPackage.DOC_ITEM_TYPE:\n+\t\t\t\tif(context == grammarAccess.getDocItemTypeRule()) {\n+\t\t\t\t\tsequence_DocItemType(context, (DocItemType) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n \t\t\tcase IntentSpecificationPackage.DOCUMENT:\n \t\t\t\tif(context == grammarAccess.getDocumentRule()) {\n \t\t\t\t\tsequence_Document(context, (Document) semanticObject); \n@@ -56,18 +73,36 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n+\t\t\tcase IntentSpecificationPackage.INTENT_TYPE:\n+\t\t\t\tif(context == grammarAccess.getIntentTypeRule()) {\n+\t\t\t\t\tsequence_IntentType(context, (IntentType) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n \t\t\tcase IntentSpecificationPackage.LIST_ITEM:\n \t\t\t\tif(context == grammarAccess.getListItemRule()) {\n \t\t\t\t\tsequence_ListItem(context, (ListItem) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n+\t\t\tcase IntentSpecificationPackage.LIST_ITEM_TYPE:\n+\t\t\t\tif(context == grammarAccess.getListItemTypeRule()) {\n+\t\t\t\t\tsequence_ListItemType(context, (ListItemType) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n \t\t\tcase IntentSpecificationPackage.MODEL_ITEM:\n \t\t\t\tif(context == grammarAccess.getModelItemRule()) {\n \t\t\t\t\tsequence_ModelItem(context, (ModelItem) semanticObject); \n \t\t\t\t\treturn; \n \t\t\t\t}\n \t\t\t\telse break;\n+\t\t\tcase IntentSpecificationPackage.MODEL_TYPE:\n+\t\t\t\tif(context == grammarAccess.getModelTypeRule()) {\n+\t\t\t\t\tsequence_ModelType(context, (ModelType) semanticObject); \n+\t\t\t\t\treturn; \n+\t\t\t\t}\n+\t\t\t\telse break;\n \t\t\tcase IntentSpecificationPackage.REFINEMENT:\n \t\t\t\tif(context == grammarAccess.getRefinementRule()) {\n \t\t\t\t\tsequence_Refinement(context, (Refinement) semanticObject); \n@@ -84,11 +119,20 @@ public void createSequence(EObject context, EObject semanticObject) {\n \t\tif (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));\n \t}\n \t\n+\t/**\n+\t * Constraint:\n+\t * (typeName='environment' | typeName='operator' | typeName='system' | typeName='verification')\n+\t */\n+\tprotected void sequence_DecompositionType(EObject context, DecompositionType semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n \t/**\n \t * Constraint:\n \t * (\n \t * type=DecompositionType \n-\t * id=ID \n+\t * name=ID \n \t * desc=STRING \n \t * documents+=Document* \n \t * models+=ModelItem* \n@@ -102,21 +146,38 @@ protected void sequence_Decomposition(EObject context, Decomposition semanticObj\n \t\n \t/**\n \t * Constraint:\n-\t * (type=DocItemType id=ID ref=STRING)\n+\t * (\n+\t * typeName='condition' | \n+\t * typeName='figure' | \n+\t * typeName='break' | \n+\t * typeName='model' | \n+\t * typeName='paragraph' | \n+\t * typeName='section' | \n+\t * typeName='table'\n+\t * )\n+\t */\n+\tprotected void sequence_DocItemType(EObject context, DocItemType semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * (type=DocItemType name=ID ref=STRING)\n \t */\n \tprotected void sequence_DocItem(EObject context, DocItem semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__TYPE) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__TYPE));\n-\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__ID) == ValueTransient.YES)\n-\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__ID));\n+\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__NAME) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__NAME));\n \t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__REF) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__REF));\n \t\t}\n \t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n \t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n \t\tfeeder.accept(grammarAccess.getDocItemAccess().getTypeDocItemTypeParserRuleCall_0_0(), semanticObject.getType());\n-\t\tfeeder.accept(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());\n+\t\tfeeder.accept(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());\n \t\tfeeder.accept(grammarAccess.getDocItemAccess().getRefSTRINGTerminalRuleCall_2_0(), semanticObject.getRef());\n \t\tfeeder.finish();\n \t}\n@@ -133,18 +194,44 @@ protected void sequence_Document(EObject context, Document semanticObject) {\n \t\n \t/**\n \t * Constraint:\n-\t * (type=IntentType id=ID desc=STRING decompositions+=Decomposition+)\n+\t * (\n+\t * typeName='basic' | \n+\t * typeName='purpose' | \n+\t * typeName='principles' | \n+\t * typeName='models' | \n+\t * typeName='design' | \n+\t * typeName='implementation' | \n+\t * typeName='operation'\n+\t * )\n+\t */\n+\tprotected void sequence_IntentType(EObject context, IntentType semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * (type=IntentType name=ID desc=STRING decompositions+=Decomposition+)\n \t */\n \tprotected void sequence_Intent(EObject context, Intent semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n \t}\n \t\n \t\n+\t/**\n+\t * Constraint:\n+\t * (typeName='requirement' | typeName='goal' | typeName='hazard' | typeName='constraint')\n+\t */\n+\tprotected void sequence_ListItemType(EObject context, ListItemType semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n \t/**\n \t * Constraint:\n \t * (\n \t * type=ListItemType \n-\t * id=ID \n+\t * name=ID \n \t * desc=STRING \n \t * docReferences+=[DocItem|ID]* \n \t * itemReferences+=[ListItem|ID]* \n@@ -158,29 +245,45 @@ protected void sequence_ListItem(EObject context, ListItem semanticObject) {\n \t\n \t/**\n \t * Constraint:\n-\t * (type=ModelType id=ID desc=STRING)\n+\t * (type=ModelType name=ID desc=STRING)\n \t */\n \tprotected void sequence_ModelItem(EObject context, ModelItem semanticObject) {\n \t\tif(errorAcceptor != null) {\n \t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__TYPE) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__TYPE));\n-\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__ID) == ValueTransient.YES)\n-\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__ID));\n+\t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__NAME) == ValueTransient.YES)\n+\t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__NAME));\n \t\t\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__DESC) == ValueTransient.YES)\n \t\t\t\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__DESC));\n \t\t}\n \t\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\n \t\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\n \t\tfeeder.accept(grammarAccess.getModelItemAccess().getTypeModelTypeParserRuleCall_0_0(), semanticObject.getType());\n-\t\tfeeder.accept(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());\n+\t\tfeeder.accept(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());\n \t\tfeeder.accept(grammarAccess.getModelItemAccess().getDescSTRINGTerminalRuleCall_2_0(), semanticObject.getDesc());\n \t\tfeeder.finish();\n \t}\n \t\n \t\n \t/**\n \t * Constraint:\n-\t * (id=ID desc=STRING intents+=Intent+)\n+\t * (\n+\t * typeName='output' | \n+\t * typeName='mode' | \n+\t * typeName='state' | \n+\t * typeName='macro' | \n+\t * typeName='function' | \n+\t * typeName='input'\n+\t * )\n+\t */\n+\tprotected void sequence_ModelType(EObject context, ModelType semanticObject) {\n+\t\tgenericSequencer.createSequence(context, semanticObject);\n+\t}\n+\t\n+\t\n+\t/**\n+\t * Constraint:\n+\t * (name=ID desc=STRING intents+=Intent+)\n \t */\n \tprotected void sequence_Refinement(EObject context, Refinement semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);\n@@ -189,7 +292,7 @@ protected void sequence_Refinement(EObject context, Refinement semanticObject) {\n \t\n \t/**\n \t * Constraint:\n-\t * (id=ID refinements+=Refinement+)\n+\t * (name=ID refinements+=Refinement+)\n \t */\n \tprotected void sequence_Specification(EObject context, Specification semanticObject) {\n \t\tgenericSequencer.createSequence(context, semanticObject);","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSemanticSequencer.java","sha":"2abf9431b52e9a2bef30a8ef084b854fb99c6af9","status":"modified"},{"additions":0,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSyntacticSequencer.java","changes":36,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSyntacticSequencer.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":36,"filename":"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSyntacticSequencer.java","new_code":"","new_methods":[],"old_code":"\tprotected AbstractElementAlias match_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q;\n\tprotected AbstractElementAlias match_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q;\n\tprotected AbstractElementAlias match_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q;\n\t\tmatch_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftCurlyBracketKeyword_3_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightCurlyBracketKeyword_3_2()));\n\t\tmatch_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftParenthesisKeyword_4_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightParenthesisKeyword_4_2()));\n\t\tmatch_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftSquareBracketKeyword_5_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightSquareBracketKeyword_5_2()));\n\t\t\telse if(match_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q.equals(syntax))\n\t\t\t\temit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q.equals(syntax))\n\t\t\t\temit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t\t\telse if(match_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q.equals(syntax))\n\t\t\t\temit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n\t/**\n\t * Syntax:\n\t * ('{' '}')?\n\t */\n\tprotected void emit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(EObject semanticObject, ISynNavigable transition, List nodes) {\n\t\tacceptNodes(transition, nodes);\n\t}\n\t\n\t/**\n\t * Syntax:\n\t * ('(' ')')?\n\t */\n\tprotected void emit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List nodes) {\n\t\tacceptNodes(transition, nodes);\n\t}\n\t\n\t/**\n\t * Syntax:\n\t * ('[' ']')?\n\t */\n\tprotected void emit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(EObject semanticObject, ISynNavigable transition, List nodes) {\n\t\tacceptNodes(transition, nodes);\n\t}\n\t","old_methods":[{"arguments":["EObject semanticObject"," ISynNavigable transition"," List nodes"],"filename":"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSyntacticSequencer.java","implementation":"acceptNodes(transition, nodes);","signature":"void emit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(EObject semanticObject, ISynNavigable transition, List nodes)"},{"arguments":["EObject semanticObject"," ISynNavigable transition"," List nodes"],"filename":"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSyntacticSequencer.java","implementation":"acceptNodes(transition, nodes);","signature":"void emit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List nodes)"},{"arguments":["EObject semanticObject"," ISynNavigable transition"," List nodes"],"filename":"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSyntacticSequencer.java","implementation":"acceptNodes(transition, nodes);","signature":"void emit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(EObject semanticObject, ISynNavigable transition, List nodes)"}],"patch":"@@ -21,19 +21,13 @@ public class IntentSpecificationSyntacticSequencer extends AbstractSyntacticSequ\n \tprotected AbstractElementAlias match_Decomposition___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q;\n \tprotected AbstractElementAlias match_Decomposition___LeftParenthesisKeyword_5_0_RightParenthesisKeyword_5_2__q;\n \tprotected AbstractElementAlias match_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBracketKeyword_4_2__q;\n-\tprotected AbstractElementAlias match_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q;\n-\tprotected AbstractElementAlias match_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q;\n-\tprotected AbstractElementAlias match_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q;\n \t\n \t@Inject\n \tprotected void init(IGrammarAccess access) {\n \t\tgrammarAccess = (IntentSpecificationGrammarAccess) access;\n \t\tmatch_Decomposition___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getLeftCurlyBracketKeyword_3_0()), new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getRightCurlyBracketKeyword_3_2()));\n \t\tmatch_Decomposition___LeftParenthesisKeyword_5_0_RightParenthesisKeyword_5_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getLeftParenthesisKeyword_5_0()), new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getRightParenthesisKeyword_5_2()));\n \t\tmatch_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBracketKeyword_4_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getLeftSquareBracketKeyword_4_0()), new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getRightSquareBracketKeyword_4_2()));\n-\t\tmatch_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftCurlyBracketKeyword_3_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightCurlyBracketKeyword_3_2()));\n-\t\tmatch_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftParenthesisKeyword_4_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightParenthesisKeyword_4_2()));\n-\t\tmatch_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftSquareBracketKeyword_5_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightSquareBracketKeyword_5_2()));\n \t}\n \t\n \t@Override\n@@ -54,12 +48,6 @@ else if(match_Decomposition___LeftParenthesisKeyword_5_0_RightParenthesisKeyword\n \t\t\t\temit_Decomposition___LeftParenthesisKeyword_5_0_RightParenthesisKeyword_5_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n \t\t\telse if(match_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBracketKeyword_4_2__q.equals(syntax))\n \t\t\t\temit_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBracketKeyword_4_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n-\t\t\telse if(match_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q.equals(syntax))\n-\t\t\t\temit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n-\t\t\telse if(match_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q.equals(syntax))\n-\t\t\t\temit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n-\t\t\telse if(match_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q.equals(syntax))\n-\t\t\t\temit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\n \t\t\telse acceptNodes(getLastNavigableState(), syntaxNodes);\n \t\t}\n \t}\n@@ -88,28 +76,4 @@ protected void emit_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBrac\n \t\tacceptNodes(transition, nodes);\n \t}\n \t\n-\t/**\n-\t * Syntax:\n-\t * ('{' '}')?\n-\t */\n-\tprotected void emit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(EObject semanticObject, ISynNavigable transition, List nodes) {\n-\t\tacceptNodes(transition, nodes);\n-\t}\n-\t\n-\t/**\n-\t * Syntax:\n-\t * ('(' ')')?\n-\t */\n-\tprotected void emit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List nodes) {\n-\t\tacceptNodes(transition, nodes);\n-\t}\n-\t\n-\t/**\n-\t * Syntax:\n-\t * ('[' ']')?\n-\t */\n-\tprotected void emit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(EObject semanticObject, ISynNavigable transition, List nodes) {\n-\t\tacceptNodes(transition, nodes);\n-\t}\n-\t\n }","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSyntacticSequencer.java","sha":"796b54e95838c36cdf8372e691e7e66f9d7748a9","status":"modified"},{"additions":161,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fservices%2FIntentSpecificationGrammarAccess.java","changes":392,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fservices%2FIntentSpecificationGrammarAccess.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":231,"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","new_code":"\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\t\"specification\" name=ID refinements+=Refinement+;\n\t\t//\"specification\" name=ID refinements+=Refinement+\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\t\"refinement\" name=ID desc=STRING intents+=Intent+;\n\t\t//\"refinement\" name=ID desc=STRING intents+=Intent+\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\ttype=IntentType name=ID desc=STRING decompositions+=Decomposition+;\n\t\t//type=IntentType name=ID desc=STRING decompositions+=Decomposition+\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n\t\tprivate final Keyword cTypeNameBasicKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cTypeNamePurposeKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n\t\tprivate final Keyword cTypeNamePrinciplesKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n\t\tprivate final Keyword cTypeNameModelsKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n\t\tprivate final Keyword cTypeNameDesignKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\n\t\tprivate final Keyword cTypeNameImplementationKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\n\t\tprivate final Keyword cTypeNameOperationKeyword_0_6 = (Keyword)cTypeNameAlternatives_0.eContents().get(6);\n\t\t//\ttypeName=(\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\");\n\t\t//typeName=(\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\")\n\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n\n\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n\t\tpublic Keyword getTypeNameBasicKeyword_0_0() { return cTypeNameBasicKeyword_0_0; }\n\t\tpublic Keyword getTypeNamePurposeKeyword_0_1() { return cTypeNamePurposeKeyword_0_1; }\n\t\tpublic Keyword getTypeNamePrinciplesKeyword_0_2() { return cTypeNamePrinciplesKeyword_0_2; }\n\t\tpublic Keyword getTypeNameModelsKeyword_0_3() { return cTypeNameModelsKeyword_0_3; }\n\t\tpublic Keyword getTypeNameDesignKeyword_0_4() { return cTypeNameDesignKeyword_0_4; }\n\t\tpublic Keyword getTypeNameImplementationKeyword_0_5() { return cTypeNameImplementationKeyword_0_5; }\n\t\tpublic Keyword getTypeNameOperationKeyword_0_6() { return cTypeNameOperationKeyword_0_6; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\ttype=DecompositionType name=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n\t\t//type=DecompositionType name=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n\t\tprivate final Keyword cTypeNameEnvironmentKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cTypeNameOperatorKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n\t\tprivate final Keyword cTypeNameSystemKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n\t\tprivate final Keyword cTypeNameVerificationKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n\t\t//\ttypeName=(\"environment\" | \"operator\" | \"system\" | \"verification\");\n\t\t//typeName=(\"environment\" | \"operator\" | \"system\" | \"verification\")\n\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n\n\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n\t\tpublic Keyword getTypeNameEnvironmentKeyword_0_0() { return cTypeNameEnvironmentKeyword_0_0; }\n\t\tpublic Keyword getTypeNameOperatorKeyword_0_1() { return cTypeNameOperatorKeyword_0_1; }\n\t\tpublic Keyword getTypeNameSystemKeyword_0_2() { return cTypeNameSystemKeyword_0_2; }\n\t\tpublic Keyword getTypeNameVerificationKeyword_0_3() { return cTypeNameVerificationKeyword_0_3; }\n\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n\t\tprivate final Keyword cTypeNameConditionKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cTypeNameFigureKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n\t\tprivate final Keyword cTypeNameBreakKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n\t\tprivate final Keyword cTypeNameModelKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n\t\tprivate final Keyword cTypeNameParagraphKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\n\t\tprivate final Keyword cTypeNameSectionKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\n\t\tprivate final Keyword cTypeNameTableKeyword_0_6 = (Keyword)cTypeNameAlternatives_0.eContents().get(6);\n\t\t//\ttypeName=(\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\");\n\t\t//typeName=(\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\")\n\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n\n\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n\t\tpublic Keyword getTypeNameConditionKeyword_0_0() { return cTypeNameConditionKeyword_0_0; }\n\t\tpublic Keyword getTypeNameFigureKeyword_0_1() { return cTypeNameFigureKeyword_0_1; }\n\t\tpublic Keyword getTypeNameBreakKeyword_0_2() { return cTypeNameBreakKeyword_0_2; }\n\t\tpublic Keyword getTypeNameModelKeyword_0_3() { return cTypeNameModelKeyword_0_3; }\n\t\tpublic Keyword getTypeNameParagraphKeyword_0_4() { return cTypeNameParagraphKeyword_0_4; }\n\t\tpublic Keyword getTypeNameSectionKeyword_0_5() { return cTypeNameSectionKeyword_0_5; }\n\t\tpublic Keyword getTypeNameTableKeyword_0_6() { return cTypeNameTableKeyword_0_6; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\ttype=DocItemType name=ID ref=STRING \";\";\n\t\t//type=DocItemType name=ID ref=STRING \";\"\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n\t\tprivate final Keyword cTypeNameOutputKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cTypeNameModeKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n\t\tprivate final Keyword cTypeNameStateKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n\t\tprivate final Keyword cTypeNameMacroKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n\t\tprivate final Keyword cTypeNameFunctionKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\n\t\tprivate final Keyword cTypeNameInputKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\n\t\t//\ttypeName=(\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\");\n\t\t//typeName=(\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\")\n\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n\n\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n\t\tpublic Keyword getTypeNameOutputKeyword_0_0() { return cTypeNameOutputKeyword_0_0; }\n\t\tpublic Keyword getTypeNameModeKeyword_0_1() { return cTypeNameModeKeyword_0_1; }\n\t\tpublic Keyword getTypeNameStateKeyword_0_2() { return cTypeNameStateKeyword_0_2; }\n\t\tpublic Keyword getTypeNameMacroKeyword_0_3() { return cTypeNameMacroKeyword_0_3; }\n\t\tpublic Keyword getTypeNameFunctionKeyword_0_4() { return cTypeNameFunctionKeyword_0_4; }\n\t\tpublic Keyword getTypeNameInputKeyword_0_5() { return cTypeNameInputKeyword_0_5; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\ttype=ModelType name=ID desc=STRING \";\";\n\t\t//type=ModelType name=ID desc=STRING \";\"\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n\t\tprivate final Keyword cTypeNameRequirementKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n\t\tprivate final Keyword cTypeNameGoalKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n\t\tprivate final Keyword cTypeNameHazardKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n\t\tprivate final Keyword cTypeNameConstraintKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n\t\t//\ttypeName=(\"requirement\" | \"goal\" | \"hazard\" | \"constraint\");\n\t\t//typeName=(\"requirement\" | \"goal\" | \"hazard\" | \"constraint\")\n\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n\n\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n\t\tpublic Keyword getTypeNameRequirementKeyword_0_0() { return cTypeNameRequirementKeyword_0_0; }\n\t\tpublic Keyword getTypeNameGoalKeyword_0_1() { return cTypeNameGoalKeyword_0_1; }\n\t\tpublic Keyword getTypeNameHazardKeyword_0_2() { return cTypeNameHazardKeyword_0_2; }\n\t\tpublic Keyword getTypeNameConstraintKeyword_0_3() { return cTypeNameConstraintKeyword_0_3; }\n\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n\t\t//\ttype=ListItemType name=ID desc=STRING (\"{\" docReferences+=[DocItem]+ \"}\")? (\"(\" itemReferences+=[ListItem]+ \")\")? (\"[\"\n\t\t//\tmodelReferences+=[ModelItem]+ \"]\")? \";\";\n\t\t//type=ListItemType name=ID desc=STRING (\"{\" docReferences+=[DocItem]+ \"}\")? (\"(\" itemReferences+=[ListItem]+ \")\")? (\"[\"\n\t\t//modelReferences+=[ModelItem]+ \"]\")? \";\"\n\t\t//name=ID\n\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n\t\t//(\"{\" docReferences+=[DocItem]+ \"}\")?\n\t\t//docReferences+=[DocItem]+\n\t\t//(\"(\" itemReferences+=[ListItem]+ \")\")?\n\t\t//itemReferences+=[ListItem]+\n\t\t//(\"[\" modelReferences+=[ModelItem]+ \"]\")?\n\t\t//modelReferences+=[ModelItem]+\n\t//\t\"specification\" name=ID refinements+=Refinement+;\n\t//\t\"refinement\" name=ID desc=STRING intents+=Intent+;\n\t//\ttype=IntentType name=ID desc=STRING decompositions+=Decomposition+;\n\t//\ttypeName=(\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\");\n\t//\ttype=DecompositionType name=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n\t//\ttypeName=(\"environment\" | \"operator\" | \"system\" | \"verification\");\n\t//\ttypeName=(\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\");\n\t//\ttype=DocItemType name=ID ref=STRING \";\";\n\t//\ttypeName=(\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\");\n\t//\ttype=ModelType name=ID desc=STRING \";\";\n\t//\ttypeName=(\"requirement\" | \"goal\" | \"hazard\" | \"constraint\");\n\t//\ttype=ListItemType name=ID desc=STRING (\"{\" docReferences+=[DocItem]+ \"}\")? (\"(\" itemReferences+=[ListItem]+ \")\")? (\"[\"\n\t//\tmodelReferences+=[ModelItem]+ \"]\")? \";\";","new_methods":[{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameAssignment_1;","signature":"Assignment getNameAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameIDTerminalRuleCall_1_0;","signature":"RuleCall getNameIDTerminalRuleCall_1_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameAssignment_1;","signature":"Assignment getNameAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameIDTerminalRuleCall_1_0;","signature":"RuleCall getNameIDTerminalRuleCall_1_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameAssignment_1;","signature":"Assignment getNameAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameIDTerminalRuleCall_1_0;","signature":"RuleCall getNameIDTerminalRuleCall_1_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameAssignment;","signature":"Assignment getTypeNameAssignment()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameAlternatives_0;","signature":"Alternatives getTypeNameAlternatives_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameBasicKeyword_0_0;","signature":"Keyword getTypeNameBasicKeyword_0_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNamePurposeKeyword_0_1;","signature":"Keyword getTypeNamePurposeKeyword_0_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNamePrinciplesKeyword_0_2;","signature":"Keyword getTypeNamePrinciplesKeyword_0_2()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameModelsKeyword_0_3;","signature":"Keyword getTypeNameModelsKeyword_0_3()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameDesignKeyword_0_4;","signature":"Keyword getTypeNameDesignKeyword_0_4()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameImplementationKeyword_0_5;","signature":"Keyword getTypeNameImplementationKeyword_0_5()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameOperationKeyword_0_6;","signature":"Keyword getTypeNameOperationKeyword_0_6()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameAssignment_1;","signature":"Assignment getNameAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameIDTerminalRuleCall_1_0;","signature":"RuleCall getNameIDTerminalRuleCall_1_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameAssignment;","signature":"Assignment getTypeNameAssignment()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameAlternatives_0;","signature":"Alternatives getTypeNameAlternatives_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameEnvironmentKeyword_0_0;","signature":"Keyword getTypeNameEnvironmentKeyword_0_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameOperatorKeyword_0_1;","signature":"Keyword getTypeNameOperatorKeyword_0_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameSystemKeyword_0_2;","signature":"Keyword getTypeNameSystemKeyword_0_2()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameVerificationKeyword_0_3;","signature":"Keyword getTypeNameVerificationKeyword_0_3()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameAssignment;","signature":"Assignment getTypeNameAssignment()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameAlternatives_0;","signature":"Alternatives getTypeNameAlternatives_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameConditionKeyword_0_0;","signature":"Keyword getTypeNameConditionKeyword_0_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameFigureKeyword_0_1;","signature":"Keyword getTypeNameFigureKeyword_0_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameBreakKeyword_0_2;","signature":"Keyword getTypeNameBreakKeyword_0_2()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameModelKeyword_0_3;","signature":"Keyword getTypeNameModelKeyword_0_3()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameParagraphKeyword_0_4;","signature":"Keyword getTypeNameParagraphKeyword_0_4()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameSectionKeyword_0_5;","signature":"Keyword getTypeNameSectionKeyword_0_5()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameTableKeyword_0_6;","signature":"Keyword getTypeNameTableKeyword_0_6()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameAssignment_1;","signature":"Assignment getNameAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameIDTerminalRuleCall_1_0;","signature":"RuleCall getNameIDTerminalRuleCall_1_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameAssignment;","signature":"Assignment getTypeNameAssignment()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameAlternatives_0;","signature":"Alternatives getTypeNameAlternatives_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameOutputKeyword_0_0;","signature":"Keyword getTypeNameOutputKeyword_0_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameModeKeyword_0_1;","signature":"Keyword getTypeNameModeKeyword_0_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameStateKeyword_0_2;","signature":"Keyword getTypeNameStateKeyword_0_2()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameMacroKeyword_0_3;","signature":"Keyword getTypeNameMacroKeyword_0_3()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameFunctionKeyword_0_4;","signature":"Keyword getTypeNameFunctionKeyword_0_4()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameInputKeyword_0_5;","signature":"Keyword getTypeNameInputKeyword_0_5()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameAssignment_1;","signature":"Assignment getNameAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameIDTerminalRuleCall_1_0;","signature":"RuleCall getNameIDTerminalRuleCall_1_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameAssignment;","signature":"Assignment getTypeNameAssignment()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameAlternatives_0;","signature":"Alternatives getTypeNameAlternatives_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameRequirementKeyword_0_0;","signature":"Keyword getTypeNameRequirementKeyword_0_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameGoalKeyword_0_1;","signature":"Keyword getTypeNameGoalKeyword_0_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameHazardKeyword_0_2;","signature":"Keyword getTypeNameHazardKeyword_0_2()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTypeNameConstraintKeyword_0_3;","signature":"Keyword getTypeNameConstraintKeyword_0_3()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameAssignment_1;","signature":"Assignment getNameAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cNameIDTerminalRuleCall_1_0;","signature":"RuleCall getNameIDTerminalRuleCall_1_0()"}],"old_code":"\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t//\t\"specification\" id=ID refinements+=Refinement+;\n\t\t//\"specification\" id=ID refinements+=Refinement+\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t//\t\"refinement\" id=ID desc=STRING intents+=Intent+;\n\t\t//\"refinement\" id=ID desc=STRING intents+=Intent+\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t//\ttype=IntentType id=ID desc=STRING decompositions+=Decomposition+;\n\t\t//type=IntentType id=ID desc=STRING decompositions+=Decomposition+\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n\t\tprivate final Keyword cBasicKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n\t\tprivate final Keyword cPurposeKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n\t\tprivate final Keyword cPrinciplesKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n\t\tprivate final Keyword cModelsKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n\t\tprivate final Keyword cDesignKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n\t\tprivate final Keyword cImplementationKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n\t\tprivate final Keyword cOperationKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\n\t\t//\t\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\";\n\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n\t\tpublic Keyword getBasicKeyword_0() { return cBasicKeyword_0; }\n\t\tpublic Keyword getPurposeKeyword_1() { return cPurposeKeyword_1; }\n\t\tpublic Keyword getPrinciplesKeyword_2() { return cPrinciplesKeyword_2; }\n\t\tpublic Keyword getModelsKeyword_3() { return cModelsKeyword_3; }\n\t\tpublic Keyword getDesignKeyword_4() { return cDesignKeyword_4; }\n\t\tpublic Keyword getImplementationKeyword_5() { return cImplementationKeyword_5; }\n\t\tpublic Keyword getOperationKeyword_6() { return cOperationKeyword_6; }\n\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t//\ttype=DecompositionType id=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n\t\t//type=DecompositionType id=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n\t\tprivate final Keyword cEnvironmentKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n\t\tprivate final Keyword cOperatorKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n\t\tprivate final Keyword cSystemKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n\t\tprivate final Keyword cVerificationKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n\t\t//\t\"environment\" | \"operator\" | \"system\" | \"verification\";\n\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n\t\tpublic Keyword getEnvironmentKeyword_0() { return cEnvironmentKeyword_0; }\n\t\tpublic Keyword getOperatorKeyword_1() { return cOperatorKeyword_1; }\n\t\tpublic Keyword getSystemKeyword_2() { return cSystemKeyword_2; }\n\t\tpublic Keyword getVerificationKeyword_3() { return cVerificationKeyword_3; }\n\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n\t\tprivate final Keyword cConditionKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n\t\tprivate final Keyword cFigureKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n\t\tprivate final Keyword cBreakKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n\t\tprivate final Keyword cModelKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n\t\tprivate final Keyword cParagraphKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n\t\tprivate final Keyword cSectionKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n\t\tprivate final Keyword cTableKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\n\t\t//\t\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\";\n\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n\t\tpublic Keyword getConditionKeyword_0() { return cConditionKeyword_0; }\n\t\tpublic Keyword getFigureKeyword_1() { return cFigureKeyword_1; }\n\t\tpublic Keyword getBreakKeyword_2() { return cBreakKeyword_2; }\n\t\tpublic Keyword getModelKeyword_3() { return cModelKeyword_3; }\n\t\tpublic Keyword getParagraphKeyword_4() { return cParagraphKeyword_4; }\n\t\tpublic Keyword getSectionKeyword_5() { return cSectionKeyword_5; }\n\t\tpublic Keyword getTableKeyword_6() { return cTableKeyword_6; }\n\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t//\ttype=DocItemType id=ID ref=STRING \";\";\n\t\t//type=DocItemType id=ID ref=STRING \";\"\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n\t\tprivate final Keyword cOutputKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n\t\tprivate final Keyword cModeKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n\t\tprivate final Keyword cStateKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n\t\tprivate final Keyword cMacroKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n\t\tprivate final Keyword cFunctionKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n\t\tprivate final Keyword cInputKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n\t\t//\t\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\";\n\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n\t\tpublic Keyword getOutputKeyword_0() { return cOutputKeyword_0; }\n\t\tpublic Keyword getModeKeyword_1() { return cModeKeyword_1; }\n\t\tpublic Keyword getStateKeyword_2() { return cStateKeyword_2; }\n\t\tpublic Keyword getMacroKeyword_3() { return cMacroKeyword_3; }\n\t\tpublic Keyword getFunctionKeyword_4() { return cFunctionKeyword_4; }\n\t\tpublic Keyword getInputKeyword_5() { return cInputKeyword_5; }\n\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t//\ttype=ModelType id=ID desc=STRING \";\";\n\t\t//type=ModelType id=ID desc=STRING \";\"\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n\t\tprivate final Keyword cRequirementKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n\t\tprivate final Keyword cGoalKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n\t\tprivate final Keyword cHazardKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n\t\tprivate final Keyword cConstraintKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n\t\t//\t\"requirement\" | \"goal\" | \"hazard\" | \"constraint\";\n\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n\t\tpublic Keyword getRequirementKeyword_0() { return cRequirementKeyword_0; }\n\t\tpublic Keyword getGoalKeyword_1() { return cGoalKeyword_1; }\n\t\tpublic Keyword getHazardKeyword_2() { return cHazardKeyword_2; }\n\t\tpublic Keyword getConstraintKeyword_3() { return cConstraintKeyword_3; }\n\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n\t\t// * / / * \n\t\t//Level0:\n\t\t//\t{Level0}\n\t\t//\t'{'\n\t\t//\t\t('Program Plan' pmp=Document)?\n\t\t//\t\t('Safety Plan' safetyPlan=Document)?\n\t\t//\t\t('Accident Definition' accidentDefinition=Document)?\n\t\t//\t\t('Safety Policy' safetyPolicy=Document)?\n\t\t//\t'}'\n\t\t//;\n\t\t//\n\t\t//Level1:\n\t\t//\t{Level1}\n\t\t//\t'{'\n\t\t//\t\t('Introduction' introduction=Document)?\n\t\t//\t\t('Historical' historical=Document)?\n\t\t//\t\t('Environment' environment=Document)?\n\t\t//\t\t('Goals' '(' goals+=GoalItem* ')' )?\n\t\t//\t\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\n\t\t//\t\t('System Limitations' limitations=Document)?\n\t\t//\t\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\n\t\t//\t\t('Hazard Analysis' hazardAnalysis=Document)?\n\t\t//\t\t('Hazard List' '(' hazardList+=HazardItem* ')')?\n\t\t//\t\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\n\t\t//\t\t('Verification and Validation' verification=Document)?\n\t\t//\t'}'\n\t\t//;\n\t\t//\n\t\t//\n\t\t//Level2:\n\t\t//\tdesc=STRING\n\t\t//\t'{'\n\t\t//\t'}'\t\n\t\t//;\n\t\t//\n\t\t//Level3:\n\t\t//\tdesc=STRING\n\t\t//\t'{'\n\t\t//\t\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\n\t\t//\t\t('User Model' '(' userModels+=ModelItem* ')' )?\n\t\t//\t\t('Verification and Validation' verification=Document )?\n\t\t//\t'}'\n\t\t//;\n\t\t//\n\t\t//\n\t\t//\ttype=ListItemType id=ID desc=STRING (\"{\" docReferences+=[DocItem]* \"}\")? (\"(\" itemReferences+=[ListItem]* \")\")? (\"[\"\n\t\t//\tmodelReferences+=[ModelItem]* \"]\")? \";\";\n\t\t//type=ListItemType id=ID desc=STRING (\"{\" docReferences+=[DocItem]* \"}\")? (\"(\" itemReferences+=[ListItem]* \")\")? (\"[\"\n\t\t//modelReferences+=[ModelItem]* \"]\")? \";\"\n\t\t//id=ID\n\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n\t\t//(\"{\" docReferences+=[DocItem]* \"}\")?\n\t\t//docReferences+=[DocItem]*\n\t\t//(\"(\" itemReferences+=[ListItem]* \")\")?\n\t\t//itemReferences+=[ListItem]*\n\t\t//(\"[\" modelReferences+=[ModelItem]* \"]\")?\n\t\t//modelReferences+=[ModelItem]*\n\t//\t\"specification\" id=ID refinements+=Refinement+;\n\t//\t\"refinement\" id=ID desc=STRING intents+=Intent+;\n\t//\ttype=IntentType id=ID desc=STRING decompositions+=Decomposition+;\n\t//\t\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\";\n\t//\ttype=DecompositionType id=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n\t//\t\"environment\" | \"operator\" | \"system\" | \"verification\";\n\t//\t\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\";\n\t//\ttype=DocItemType id=ID ref=STRING \";\";\n\t//\t\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\";\n\t//\ttype=ModelType id=ID desc=STRING \";\";\n\t//\t\"requirement\" | \"goal\" | \"hazard\" | \"constraint\";\n\t// * / / * \n\t//Level0:\n\t//\t{Level0}\n\t//\t'{'\n\t//\t\t('Program Plan' pmp=Document)?\n\t//\t\t('Safety Plan' safetyPlan=Document)?\n\t//\t\t('Accident Definition' accidentDefinition=Document)?\n\t//\t\t('Safety Policy' safetyPolicy=Document)?\n\t//\t'}'\n\t//;\n\t//\n\t//Level1:\n\t//\t{Level1}\n\t//\t'{'\n\t//\t\t('Introduction' introduction=Document)?\n\t//\t\t('Historical' historical=Document)?\n\t//\t\t('Environment' environment=Document)?\n\t//\t\t('Goals' '(' goals+=GoalItem* ')' )?\n\t//\t\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\n\t//\t\t('System Limitations' limitations=Document)?\n\t//\t\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\n\t//\t\t('Hazard Analysis' hazardAnalysis=Document)?\n\t//\t\t('Hazard List' '(' hazardList+=HazardItem* ')')?\n\t//\t\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\n\t//\t\t('Verification and Validation' verification=Document)?\n\t//\t'}'\n\t//;\n\t//\n\t//\n\t//Level2:\n\t//\tdesc=STRING\n\t//\t'{'\n\t//\t'}'\t\n\t//;\n\t//\n\t//Level3:\n\t//\tdesc=STRING\n\t//\t'{'\n\t//\t\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\n\t//\t\t('User Model' '(' userModels+=ModelItem* ')' )?\n\t//\t\t('Verification and Validation' verification=Document )?\n\t//\t'}'\n\t//;\n\t//\n\t//\n\t//\ttype=ListItemType id=ID desc=STRING (\"{\" docReferences+=[DocItem]* \"}\")? (\"(\" itemReferences+=[ListItem]* \")\")? (\"[\"\n\t//\tmodelReferences+=[ModelItem]* \"]\")? \";\";","old_methods":[{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdAssignment_1;","signature":"Assignment getIdAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdIDTerminalRuleCall_1_0;","signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdAssignment_1;","signature":"Assignment getIdAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdIDTerminalRuleCall_1_0;","signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdAssignment_1;","signature":"Assignment getIdAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdIDTerminalRuleCall_1_0;","signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cAlternatives;","signature":"Alternatives getAlternatives()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cBasicKeyword_0;","signature":"Keyword getBasicKeyword_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cPurposeKeyword_1;","signature":"Keyword getPurposeKeyword_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cPrinciplesKeyword_2;","signature":"Keyword getPrinciplesKeyword_2()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cModelsKeyword_3;","signature":"Keyword getModelsKeyword_3()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cDesignKeyword_4;","signature":"Keyword getDesignKeyword_4()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cImplementationKeyword_5;","signature":"Keyword getImplementationKeyword_5()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cOperationKeyword_6;","signature":"Keyword getOperationKeyword_6()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdAssignment_1;","signature":"Assignment getIdAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdIDTerminalRuleCall_1_0;","signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cAlternatives;","signature":"Alternatives getAlternatives()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cEnvironmentKeyword_0;","signature":"Keyword getEnvironmentKeyword_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cOperatorKeyword_1;","signature":"Keyword getOperatorKeyword_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cSystemKeyword_2;","signature":"Keyword getSystemKeyword_2()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cVerificationKeyword_3;","signature":"Keyword getVerificationKeyword_3()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cAlternatives;","signature":"Alternatives getAlternatives()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cConditionKeyword_0;","signature":"Keyword getConditionKeyword_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cFigureKeyword_1;","signature":"Keyword getFigureKeyword_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cBreakKeyword_2;","signature":"Keyword getBreakKeyword_2()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cModelKeyword_3;","signature":"Keyword getModelKeyword_3()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cParagraphKeyword_4;","signature":"Keyword getParagraphKeyword_4()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cSectionKeyword_5;","signature":"Keyword getSectionKeyword_5()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cTableKeyword_6;","signature":"Keyword getTableKeyword_6()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdAssignment_1;","signature":"Assignment getIdAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdIDTerminalRuleCall_1_0;","signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cAlternatives;","signature":"Alternatives getAlternatives()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cOutputKeyword_0;","signature":"Keyword getOutputKeyword_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cModeKeyword_1;","signature":"Keyword getModeKeyword_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cStateKeyword_2;","signature":"Keyword getStateKeyword_2()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cMacroKeyword_3;","signature":"Keyword getMacroKeyword_3()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cFunctionKeyword_4;","signature":"Keyword getFunctionKeyword_4()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cInputKeyword_5;","signature":"Keyword getInputKeyword_5()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdAssignment_1;","signature":"Assignment getIdAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdIDTerminalRuleCall_1_0;","signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cAlternatives;","signature":"Alternatives getAlternatives()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cRequirementKeyword_0;","signature":"Keyword getRequirementKeyword_0()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cGoalKeyword_1;","signature":"Keyword getGoalKeyword_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cHazardKeyword_2;","signature":"Keyword getHazardKeyword_2()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cConstraintKeyword_3;","signature":"Keyword getConstraintKeyword_3()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdAssignment_1;","signature":"Assignment getIdAssignment_1()"},{"arguments":[],"filename":"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java","implementation":"return cIdIDTerminalRuleCall_1_0;","signature":"RuleCall getIdIDTerminalRuleCall_1_0()"}],"patch":"@@ -22,28 +22,28 @@ public class SpecificationElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Specification\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cSpecificationKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cRefinementsAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cRefinementsRefinementParserRuleCall_2_0 = (RuleCall)cRefinementsAssignment_2.eContents().get(0);\n \t\t\n \t\t/// *\n \t\t// * An intent specification consists of one or more refinements.\n \t\t// * / Specification:\n-\t\t//\t\"specification\" id=ID refinements+=Refinement+;\n+\t\t//\t\"specification\" name=ID refinements+=Refinement+;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"specification\" id=ID refinements+=Refinement+\n+\t\t//\"specification\" name=ID refinements+=Refinement+\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//\"specification\"\n \t\tpublic Keyword getSpecificationKeyword_0() { return cSpecificationKeyword_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//refinements+=Refinement+\n \t\tpublic Assignment getRefinementsAssignment_2() { return cRefinementsAssignment_2; }\n@@ -56,8 +56,8 @@ public class RefinementElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Refinement\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Keyword cRefinementKeyword_0 = (Keyword)cGroup.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\n \t\tprivate final Assignment cIntentsAssignment_3 = (Assignment)cGroup.eContents().get(3);\n@@ -66,20 +66,20 @@ public class RefinementElements extends AbstractParserRuleElementFinder {\n \t\t/// *\n \t\t// * A refinement has no type and consists of one or more intents.\n \t\t// * / Refinement:\n-\t\t//\t\"refinement\" id=ID desc=STRING intents+=Intent+;\n+\t\t//\t\"refinement\" name=ID desc=STRING intents+=Intent+;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//\"refinement\" id=ID desc=STRING intents+=Intent+\n+\t\t//\"refinement\" name=ID desc=STRING intents+=Intent+\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//\"refinement\"\n \t\tpublic Keyword getRefinementKeyword_0() { return cRefinementKeyword_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//desc=STRING\n \t\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\n@@ -99,8 +99,8 @@ public class IntentElements extends AbstractParserRuleElementFinder {\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\n \t\tprivate final RuleCall cTypeIntentTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\n \t\tprivate final Assignment cDecompositionsAssignment_3 = (Assignment)cGroup.eContents().get(3);\n@@ -109,10 +109,10 @@ public class IntentElements extends AbstractParserRuleElementFinder {\n \t\t/// *\n \t\t// * An intent has a type and consists of one or more decompositions. \n \t\t// * / Intent:\n-\t\t//\ttype=IntentType id=ID desc=STRING decompositions+=Decomposition+;\n+\t\t//\ttype=IntentType name=ID desc=STRING decompositions+=Decomposition+;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//type=IntentType id=ID desc=STRING decompositions+=Decomposition+\n+\t\t//type=IntentType name=ID desc=STRING decompositions+=Decomposition+\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//type=IntentType\n@@ -121,11 +121,11 @@ public class IntentElements extends AbstractParserRuleElementFinder {\n \t\t//IntentType\n \t\tpublic RuleCall getTypeIntentTypeParserRuleCall_0_0() { return cTypeIntentTypeParserRuleCall_0_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//desc=STRING\n \t\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\n@@ -142,55 +142,59 @@ public class IntentElements extends AbstractParserRuleElementFinder {\n \n \tpublic class IntentTypeElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"IntentType\");\n-\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n-\t\tprivate final Keyword cBasicKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n-\t\tprivate final Keyword cPurposeKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n-\t\tprivate final Keyword cPrinciplesKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n-\t\tprivate final Keyword cModelsKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n-\t\tprivate final Keyword cDesignKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n-\t\tprivate final Keyword cImplementationKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n-\t\tprivate final Keyword cOperationKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\n+\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n+\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameBasicKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cTypeNamePurposeKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n+\t\tprivate final Keyword cTypeNamePrinciplesKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n+\t\tprivate final Keyword cTypeNameModelsKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n+\t\tprivate final Keyword cTypeNameDesignKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\n+\t\tprivate final Keyword cTypeNameImplementationKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\n+\t\tprivate final Keyword cTypeNameOperationKeyword_0_6 = (Keyword)cTypeNameAlternatives_0.eContents().get(6);\n \t\t\n \t\t/// *\n \t\t// * Intent types refer to the different levels of the canonical model.\n \t\t// * The grammar does not enforce their universal containment in a specification.\n \t\t// * A proper intention specification should contain an intent of each type in each refinement.\n \t\t// * / IntentType:\n-\t\t//\t\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\";\n+\t\t//\ttypeName=(\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\");\n \t\tpublic ParserRule getRule() { return rule; }\n \n+\t\t//typeName=(\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\")\n+\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n+\n \t\t//\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\"\n-\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n+\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n \n \t\t//\"basic\"\n-\t\tpublic Keyword getBasicKeyword_0() { return cBasicKeyword_0; }\n+\t\tpublic Keyword getTypeNameBasicKeyword_0_0() { return cTypeNameBasicKeyword_0_0; }\n \n \t\t//\"purpose\"\n-\t\tpublic Keyword getPurposeKeyword_1() { return cPurposeKeyword_1; }\n+\t\tpublic Keyword getTypeNamePurposeKeyword_0_1() { return cTypeNamePurposeKeyword_0_1; }\n \n \t\t//\"principles\"\n-\t\tpublic Keyword getPrinciplesKeyword_2() { return cPrinciplesKeyword_2; }\n+\t\tpublic Keyword getTypeNamePrinciplesKeyword_0_2() { return cTypeNamePrinciplesKeyword_0_2; }\n \n \t\t//\"models\"\n-\t\tpublic Keyword getModelsKeyword_3() { return cModelsKeyword_3; }\n+\t\tpublic Keyword getTypeNameModelsKeyword_0_3() { return cTypeNameModelsKeyword_0_3; }\n \n \t\t//\"design\"\n-\t\tpublic Keyword getDesignKeyword_4() { return cDesignKeyword_4; }\n+\t\tpublic Keyword getTypeNameDesignKeyword_0_4() { return cTypeNameDesignKeyword_0_4; }\n \n \t\t//\"implementation\"\n-\t\tpublic Keyword getImplementationKeyword_5() { return cImplementationKeyword_5; }\n+\t\tpublic Keyword getTypeNameImplementationKeyword_0_5() { return cTypeNameImplementationKeyword_0_5; }\n \n \t\t//\"operation\"\n-\t\tpublic Keyword getOperationKeyword_6() { return cOperationKeyword_6; }\n+\t\tpublic Keyword getTypeNameOperationKeyword_0_6() { return cTypeNameOperationKeyword_0_6; }\n \t}\n \n \tpublic class DecompositionElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"Decomposition\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\n \t\tprivate final RuleCall cTypeDecompositionTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\n \t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n@@ -212,11 +216,11 @@ public class DecompositionElements extends AbstractParserRuleElementFinder {\n \t\t/// *\n \t\t// * A decomposition has a type and consists of one or more models, documents, or items.\n \t\t// * / Decomposition:\n-\t\t//\ttype=DecompositionType id=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n+\t\t//\ttype=DecompositionType name=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n \t\t//\titems+=ListItem* \")\")?;\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//type=DecompositionType id=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n+\t\t//type=DecompositionType name=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n \t\t//items+=ListItem* \")\")?\n \t\tpublic Group getGroup() { return cGroup; }\n \n@@ -226,11 +230,11 @@ public class DecompositionElements extends AbstractParserRuleElementFinder {\n \t\t//DecompositionType\n \t\tpublic RuleCall getTypeDecompositionTypeParserRuleCall_0_0() { return cTypeDecompositionTypeParserRuleCall_0_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//desc=STRING\n \t\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\n@@ -286,30 +290,34 @@ public class DecompositionElements extends AbstractParserRuleElementFinder {\n \n \tpublic class DecompositionTypeElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"DecompositionType\");\n-\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n-\t\tprivate final Keyword cEnvironmentKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n-\t\tprivate final Keyword cOperatorKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n-\t\tprivate final Keyword cSystemKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n-\t\tprivate final Keyword cVerificationKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n+\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n+\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameEnvironmentKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameOperatorKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n+\t\tprivate final Keyword cTypeNameSystemKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n+\t\tprivate final Keyword cTypeNameVerificationKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n \t\t\n \t\t//DecompositionType:\n-\t\t//\t\"environment\" | \"operator\" | \"system\" | \"verification\";\n+\t\t//\ttypeName=(\"environment\" | \"operator\" | \"system\" | \"verification\");\n \t\tpublic ParserRule getRule() { return rule; }\n \n+\t\t//typeName=(\"environment\" | \"operator\" | \"system\" | \"verification\")\n+\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n+\n \t\t//\"environment\" | \"operator\" | \"system\" | \"verification\"\n-\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n+\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n \n \t\t//\"environment\"\n-\t\tpublic Keyword getEnvironmentKeyword_0() { return cEnvironmentKeyword_0; }\n+\t\tpublic Keyword getTypeNameEnvironmentKeyword_0_0() { return cTypeNameEnvironmentKeyword_0_0; }\n \n \t\t//\"operator\"\n-\t\tpublic Keyword getOperatorKeyword_1() { return cOperatorKeyword_1; }\n+\t\tpublic Keyword getTypeNameOperatorKeyword_0_1() { return cTypeNameOperatorKeyword_0_1; }\n \n \t\t//\"system\"\n-\t\tpublic Keyword getSystemKeyword_2() { return cSystemKeyword_2; }\n+\t\tpublic Keyword getTypeNameSystemKeyword_0_2() { return cTypeNameSystemKeyword_0_2; }\n \n \t\t//\"verification\"\n-\t\tpublic Keyword getVerificationKeyword_3() { return cVerificationKeyword_3; }\n+\t\tpublic Keyword getTypeNameVerificationKeyword_0_3() { return cTypeNameVerificationKeyword_0_3; }\n \t}\n \n \tpublic class DocumentElements extends AbstractParserRuleElementFinder {\n@@ -342,60 +350,64 @@ public class DocumentElements extends AbstractParserRuleElementFinder {\n \n \tpublic class DocItemTypeElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"DocItemType\");\n-\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n-\t\tprivate final Keyword cConditionKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n-\t\tprivate final Keyword cFigureKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n-\t\tprivate final Keyword cBreakKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n-\t\tprivate final Keyword cModelKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n-\t\tprivate final Keyword cParagraphKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n-\t\tprivate final Keyword cSectionKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n-\t\tprivate final Keyword cTableKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\n+\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n+\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameConditionKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameFigureKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n+\t\tprivate final Keyword cTypeNameBreakKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n+\t\tprivate final Keyword cTypeNameModelKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n+\t\tprivate final Keyword cTypeNameParagraphKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\n+\t\tprivate final Keyword cTypeNameSectionKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\n+\t\tprivate final Keyword cTypeNameTableKeyword_0_6 = (Keyword)cTypeNameAlternatives_0.eContents().get(6);\n \t\t\n \t\t//DocItemType:\n-\t\t//\t\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\";\n+\t\t//\ttypeName=(\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\");\n \t\tpublic ParserRule getRule() { return rule; }\n \n+\t\t//typeName=(\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\")\n+\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n+\n \t\t//\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\"\n-\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n+\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n \n \t\t//\"condition\"\n-\t\tpublic Keyword getConditionKeyword_0() { return cConditionKeyword_0; }\n+\t\tpublic Keyword getTypeNameConditionKeyword_0_0() { return cTypeNameConditionKeyword_0_0; }\n \n \t\t//\"figure\"\n-\t\tpublic Keyword getFigureKeyword_1() { return cFigureKeyword_1; }\n+\t\tpublic Keyword getTypeNameFigureKeyword_0_1() { return cTypeNameFigureKeyword_0_1; }\n \n \t\t//\"break\"\n-\t\tpublic Keyword getBreakKeyword_2() { return cBreakKeyword_2; }\n+\t\tpublic Keyword getTypeNameBreakKeyword_0_2() { return cTypeNameBreakKeyword_0_2; }\n \n \t\t//\"model\"\n-\t\tpublic Keyword getModelKeyword_3() { return cModelKeyword_3; }\n+\t\tpublic Keyword getTypeNameModelKeyword_0_3() { return cTypeNameModelKeyword_0_3; }\n \n \t\t//\"paragraph\"\n-\t\tpublic Keyword getParagraphKeyword_4() { return cParagraphKeyword_4; }\n+\t\tpublic Keyword getTypeNameParagraphKeyword_0_4() { return cTypeNameParagraphKeyword_0_4; }\n \n \t\t//\"section\"\n-\t\tpublic Keyword getSectionKeyword_5() { return cSectionKeyword_5; }\n+\t\tpublic Keyword getTypeNameSectionKeyword_0_5() { return cTypeNameSectionKeyword_0_5; }\n \n \t\t//\"table\"\n-\t\tpublic Keyword getTableKeyword_6() { return cTableKeyword_6; }\n+\t\tpublic Keyword getTypeNameTableKeyword_0_6() { return cTypeNameTableKeyword_0_6; }\n \t}\n \n \tpublic class DocItemElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"DocItem\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\n \t\tprivate final RuleCall cTypeDocItemTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cRefAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cRefSTRINGTerminalRuleCall_2_0 = (RuleCall)cRefAssignment_2.eContents().get(0);\n \t\tprivate final Keyword cSemicolonKeyword_3 = (Keyword)cGroup.eContents().get(3);\n \t\t\n \t\t//DocItem:\n-\t\t//\ttype=DocItemType id=ID ref=STRING \";\";\n+\t\t//\ttype=DocItemType name=ID ref=STRING \";\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//type=DocItemType id=ID ref=STRING \";\"\n+\t\t//type=DocItemType name=ID ref=STRING \";\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//type=DocItemType\n@@ -404,11 +416,11 @@ public class DocItemElements extends AbstractParserRuleElementFinder {\n \t\t//DocItemType\n \t\tpublic RuleCall getTypeDocItemTypeParserRuleCall_0_0() { return cTypeDocItemTypeParserRuleCall_0_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//ref=STRING\n \t\tpublic Assignment getRefAssignment_2() { return cRefAssignment_2; }\n@@ -422,56 +434,60 @@ public class DocItemElements extends AbstractParserRuleElementFinder {\n \n \tpublic class ModelTypeElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ModelType\");\n-\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n-\t\tprivate final Keyword cOutputKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n-\t\tprivate final Keyword cModeKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n-\t\tprivate final Keyword cStateKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n-\t\tprivate final Keyword cMacroKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n-\t\tprivate final Keyword cFunctionKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\n-\t\tprivate final Keyword cInputKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\n+\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n+\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameOutputKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameModeKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n+\t\tprivate final Keyword cTypeNameStateKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n+\t\tprivate final Keyword cTypeNameMacroKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n+\t\tprivate final Keyword cTypeNameFunctionKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\n+\t\tprivate final Keyword cTypeNameInputKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\n \t\t\n \t\t//ModelType:\n-\t\t//\t\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\";\n+\t\t//\ttypeName=(\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\");\n \t\tpublic ParserRule getRule() { return rule; }\n \n+\t\t//typeName=(\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\")\n+\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n+\n \t\t//\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\"\n-\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n+\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n \n \t\t//\"output\"\n-\t\tpublic Keyword getOutputKeyword_0() { return cOutputKeyword_0; }\n+\t\tpublic Keyword getTypeNameOutputKeyword_0_0() { return cTypeNameOutputKeyword_0_0; }\n \n \t\t//\"mode\"\n-\t\tpublic Keyword getModeKeyword_1() { return cModeKeyword_1; }\n+\t\tpublic Keyword getTypeNameModeKeyword_0_1() { return cTypeNameModeKeyword_0_1; }\n \n \t\t//\"state\"\n-\t\tpublic Keyword getStateKeyword_2() { return cStateKeyword_2; }\n+\t\tpublic Keyword getTypeNameStateKeyword_0_2() { return cTypeNameStateKeyword_0_2; }\n \n \t\t//\"macro\"\n-\t\tpublic Keyword getMacroKeyword_3() { return cMacroKeyword_3; }\n+\t\tpublic Keyword getTypeNameMacroKeyword_0_3() { return cTypeNameMacroKeyword_0_3; }\n \n \t\t//\"function\"\n-\t\tpublic Keyword getFunctionKeyword_4() { return cFunctionKeyword_4; }\n+\t\tpublic Keyword getTypeNameFunctionKeyword_0_4() { return cTypeNameFunctionKeyword_0_4; }\n \n \t\t//\"input\"\n-\t\tpublic Keyword getInputKeyword_5() { return cInputKeyword_5; }\n+\t\tpublic Keyword getTypeNameInputKeyword_0_5() { return cTypeNameInputKeyword_0_5; }\n \t}\n \n \tpublic class ModelItemElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ModelItem\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\n \t\tprivate final RuleCall cTypeModelTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\n \t\tprivate final Keyword cSemicolonKeyword_3 = (Keyword)cGroup.eContents().get(3);\n \t\t\n \t\t//ModelItem:\n-\t\t//\ttype=ModelType id=ID desc=STRING \";\";\n+\t\t//\ttype=ModelType name=ID desc=STRING \";\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//type=ModelType id=ID desc=STRING \";\"\n+\t\t//type=ModelType name=ID desc=STRING \";\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//type=ModelType\n@@ -480,11 +496,11 @@ public class ModelItemElements extends AbstractParserRuleElementFinder {\n \t\t//ModelType\n \t\tpublic RuleCall getTypeModelTypeParserRuleCall_0_0() { return cTypeModelTypeParserRuleCall_0_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//desc=STRING\n \t\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\n@@ -498,39 +514,43 @@ public class ModelItemElements extends AbstractParserRuleElementFinder {\n \n \tpublic class ListItemTypeElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ListItemType\");\n-\t\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\n-\t\tprivate final Keyword cRequirementKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\n-\t\tprivate final Keyword cGoalKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\n-\t\tprivate final Keyword cHazardKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\n-\t\tprivate final Keyword cConstraintKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\n+\t\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\n+\t\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameRequirementKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\n+\t\tprivate final Keyword cTypeNameGoalKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\n+\t\tprivate final Keyword cTypeNameHazardKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\n+\t\tprivate final Keyword cTypeNameConstraintKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\n \t\t\n \t\t//ListItemType:\n-\t\t//\t\"requirement\" | \"goal\" | \"hazard\" | \"constraint\";\n+\t\t//\ttypeName=(\"requirement\" | \"goal\" | \"hazard\" | \"constraint\");\n \t\tpublic ParserRule getRule() { return rule; }\n \n+\t\t//typeName=(\"requirement\" | \"goal\" | \"hazard\" | \"constraint\")\n+\t\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\n+\n \t\t//\"requirement\" | \"goal\" | \"hazard\" | \"constraint\"\n-\t\tpublic Alternatives getAlternatives() { return cAlternatives; }\n+\t\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\n \n \t\t//\"requirement\"\n-\t\tpublic Keyword getRequirementKeyword_0() { return cRequirementKeyword_0; }\n+\t\tpublic Keyword getTypeNameRequirementKeyword_0_0() { return cTypeNameRequirementKeyword_0_0; }\n \n \t\t//\"goal\"\n-\t\tpublic Keyword getGoalKeyword_1() { return cGoalKeyword_1; }\n+\t\tpublic Keyword getTypeNameGoalKeyword_0_1() { return cTypeNameGoalKeyword_0_1; }\n \n \t\t//\"hazard\"\n-\t\tpublic Keyword getHazardKeyword_2() { return cHazardKeyword_2; }\n+\t\tpublic Keyword getTypeNameHazardKeyword_0_2() { return cTypeNameHazardKeyword_0_2; }\n \n \t\t//\"constraint\"\n-\t\tpublic Keyword getConstraintKeyword_3() { return cConstraintKeyword_3; }\n+\t\tpublic Keyword getTypeNameConstraintKeyword_0_3() { return cTypeNameConstraintKeyword_0_3; }\n \t}\n \n \tpublic class ListItemElements extends AbstractParserRuleElementFinder {\n \t\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \"ListItem\");\n \t\tprivate final Group cGroup = (Group)rule.eContents().get(1);\n \t\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\n \t\tprivate final RuleCall cTypeListItemTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\n-\t\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\n-\t\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\n+\t\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\n+\t\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\n \t\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\n \t\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\n \t\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\n@@ -555,58 +575,13 @@ public class ListItemElements extends AbstractParserRuleElementFinder {\n \t\t\n \t\t/// *\n \t\t// * A list item has a type, description and lists of references.\n-\t\t// * / / * \n-\t\t//Level0:\n-\t\t//\t{Level0}\n-\t\t//\t'{'\n-\t\t//\t\t('Program Plan' pmp=Document)?\n-\t\t//\t\t('Safety Plan' safetyPlan=Document)?\n-\t\t//\t\t('Accident Definition' accidentDefinition=Document)?\n-\t\t//\t\t('Safety Policy' safetyPolicy=Document)?\n-\t\t//\t'}'\n-\t\t//;\n-\t\t//\n-\t\t//Level1:\n-\t\t//\t{Level1}\n-\t\t//\t'{'\n-\t\t//\t\t('Introduction' introduction=Document)?\n-\t\t//\t\t('Historical' historical=Document)?\n-\t\t//\t\t('Environment' environment=Document)?\n-\t\t//\t\t('Goals' '(' goals+=GoalItem* ')' )?\n-\t\t//\t\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\n-\t\t//\t\t('System Limitations' limitations=Document)?\n-\t\t//\t\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\n-\t\t//\t\t('Hazard Analysis' hazardAnalysis=Document)?\n-\t\t//\t\t('Hazard List' '(' hazardList+=HazardItem* ')')?\n-\t\t//\t\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\n-\t\t//\t\t('Verification and Validation' verification=Document)?\n-\t\t//\t'}'\n-\t\t//;\n-\t\t//\n-\t\t//\n-\t\t//Level2:\n-\t\t//\tdesc=STRING\n-\t\t//\t'{'\n-\t\t//\t'}'\t\n-\t\t//;\n-\t\t//\n-\t\t//Level3:\n-\t\t//\tdesc=STRING\n-\t\t//\t'{'\n-\t\t//\t\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\n-\t\t//\t\t('User Model' '(' userModels+=ModelItem* ')' )?\n-\t\t//\t\t('Verification and Validation' verification=Document )?\n-\t\t//\t'}'\n-\t\t//;\n-\t\t//\n-\t\t//\n \t\t// * / ListItem:\n-\t\t//\ttype=ListItemType id=ID desc=STRING (\"{\" docReferences+=[DocItem]* \"}\")? (\"(\" itemReferences+=[ListItem]* \")\")? (\"[\"\n-\t\t//\tmodelReferences+=[ModelItem]* \"]\")? \";\";\n+\t\t//\ttype=ListItemType name=ID desc=STRING (\"{\" docReferences+=[DocItem]+ \"}\")? (\"(\" itemReferences+=[ListItem]+ \")\")? (\"[\"\n+\t\t//\tmodelReferences+=[ModelItem]+ \"]\")? \";\";\n \t\tpublic ParserRule getRule() { return rule; }\n \n-\t\t//type=ListItemType id=ID desc=STRING (\"{\" docReferences+=[DocItem]* \"}\")? (\"(\" itemReferences+=[ListItem]* \")\")? (\"[\"\n-\t\t//modelReferences+=[ModelItem]* \"]\")? \";\"\n+\t\t//type=ListItemType name=ID desc=STRING (\"{\" docReferences+=[DocItem]+ \"}\")? (\"(\" itemReferences+=[ListItem]+ \")\")? (\"[\"\n+\t\t//modelReferences+=[ModelItem]+ \"]\")? \";\"\n \t\tpublic Group getGroup() { return cGroup; }\n \n \t\t//type=ListItemType\n@@ -615,25 +590,25 @@ public class ListItemElements extends AbstractParserRuleElementFinder {\n \t\t//ListItemType\n \t\tpublic RuleCall getTypeListItemTypeParserRuleCall_0_0() { return cTypeListItemTypeParserRuleCall_0_0; }\n \n-\t\t//id=ID\n-\t\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\n+\t\t//name=ID\n+\t\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\n \n \t\t//ID\n-\t\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\n+\t\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\n \n \t\t//desc=STRING\n \t\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\n \n \t\t//STRING\n \t\tpublic RuleCall getDescSTRINGTerminalRuleCall_2_0() { return cDescSTRINGTerminalRuleCall_2_0; }\n \n-\t\t//(\"{\" docReferences+=[DocItem]* \"}\")?\n+\t\t//(\"{\" docReferences+=[DocItem]+ \"}\")?\n \t\tpublic Group getGroup_3() { return cGroup_3; }\n \n \t\t//\"{\"\n \t\tpublic Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; }\n \n-\t\t//docReferences+=[DocItem]*\n+\t\t//docReferences+=[DocItem]+\n \t\tpublic Assignment getDocReferencesAssignment_3_1() { return cDocReferencesAssignment_3_1; }\n \n \t\t//[DocItem]\n@@ -645,13 +620,13 @@ public class ListItemElements extends AbstractParserRuleElementFinder {\n \t\t//\"}\"\n \t\tpublic Keyword getRightCurlyBracketKeyword_3_2() { return cRightCurlyBracketKeyword_3_2; }\n \n-\t\t//(\"(\" itemReferences+=[ListItem]* \")\")?\n+\t\t//(\"(\" itemReferences+=[ListItem]+ \")\")?\n \t\tpublic Group getGroup_4() { return cGroup_4; }\n \n \t\t//\"(\"\n \t\tpublic Keyword getLeftParenthesisKeyword_4_0() { return cLeftParenthesisKeyword_4_0; }\n \n-\t\t//itemReferences+=[ListItem]*\n+\t\t//itemReferences+=[ListItem]+\n \t\tpublic Assignment getItemReferencesAssignment_4_1() { return cItemReferencesAssignment_4_1; }\n \n \t\t//[ListItem]\n@@ -663,13 +638,13 @@ public class ListItemElements extends AbstractParserRuleElementFinder {\n \t\t//\")\"\n \t\tpublic Keyword getRightParenthesisKeyword_4_2() { return cRightParenthesisKeyword_4_2; }\n \n-\t\t//(\"[\" modelReferences+=[ModelItem]* \"]\")?\n+\t\t//(\"[\" modelReferences+=[ModelItem]+ \"]\")?\n \t\tpublic Group getGroup_5() { return cGroup_5; }\n \n \t\t//\"[\"\n \t\tpublic Keyword getLeftSquareBracketKeyword_5_0() { return cLeftSquareBracketKeyword_5_0; }\n \n-\t\t//modelReferences+=[ModelItem]*\n+\t\t//modelReferences+=[ModelItem]+\n \t\tpublic Assignment getModelReferencesAssignment_5_1() { return cModelReferencesAssignment_5_1; }\n \n \t\t//[ModelItem]\n@@ -741,7 +716,7 @@ public TerminalsGrammarAccess getTerminalsGrammarAccess() {\n \t/// *\n \t// * An intent specification consists of one or more refinements.\n \t// * / Specification:\n-\t//\t\"specification\" id=ID refinements+=Refinement+;\n+\t//\t\"specification\" name=ID refinements+=Refinement+;\n \tpublic SpecificationElements getSpecificationAccess() {\n \t\treturn (pSpecification != null) ? pSpecification : (pSpecification = new SpecificationElements());\n \t}\n@@ -753,7 +728,7 @@ public ParserRule getSpecificationRule() {\n \t/// *\n \t// * A refinement has no type and consists of one or more intents.\n \t// * / Refinement:\n-\t//\t\"refinement\" id=ID desc=STRING intents+=Intent+;\n+\t//\t\"refinement\" name=ID desc=STRING intents+=Intent+;\n \tpublic RefinementElements getRefinementAccess() {\n \t\treturn (pRefinement != null) ? pRefinement : (pRefinement = new RefinementElements());\n \t}\n@@ -765,7 +740,7 @@ public ParserRule getRefinementRule() {\n \t/// *\n \t// * An intent has a type and consists of one or more decompositions. \n \t// * / Intent:\n-\t//\ttype=IntentType id=ID desc=STRING decompositions+=Decomposition+;\n+\t//\ttype=IntentType name=ID desc=STRING decompositions+=Decomposition+;\n \tpublic IntentElements getIntentAccess() {\n \t\treturn (pIntent != null) ? pIntent : (pIntent = new IntentElements());\n \t}\n@@ -779,7 +754,7 @@ public ParserRule getIntentRule() {\n \t// * The grammar does not enforce their universal containment in a specification.\n \t// * A proper intention specification should contain an intent of each type in each refinement.\n \t// * / IntentType:\n-\t//\t\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\";\n+\t//\ttypeName=(\"basic\" | \"purpose\" | \"principles\" | \"models\" | \"design\" | \"implementation\" | \"operation\");\n \tpublic IntentTypeElements getIntentTypeAccess() {\n \t\treturn (pIntentType != null) ? pIntentType : (pIntentType = new IntentTypeElements());\n \t}\n@@ -791,7 +766,7 @@ public ParserRule getIntentTypeRule() {\n \t/// *\n \t// * A decomposition has a type and consists of one or more models, documents, or items.\n \t// * / Decomposition:\n-\t//\ttype=DecompositionType id=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n+\t//\ttype=DecompositionType name=ID desc=STRING (\"{\" documents+=Document* \"}\")? (\"[\" models+=ModelItem* \"]\")? (\"(\"\n \t//\titems+=ListItem* \")\")?;\n \tpublic DecompositionElements getDecompositionAccess() {\n \t\treturn (pDecomposition != null) ? pDecomposition : (pDecomposition = new DecompositionElements());\n@@ -802,7 +777,7 @@ public ParserRule getDecompositionRule() {\n \t}\n \n \t//DecompositionType:\n-\t//\t\"environment\" | \"operator\" | \"system\" | \"verification\";\n+\t//\ttypeName=(\"environment\" | \"operator\" | \"system\" | \"verification\");\n \tpublic DecompositionTypeElements getDecompositionTypeAccess() {\n \t\treturn (pDecompositionType != null) ? pDecompositionType : (pDecompositionType = new DecompositionTypeElements());\n \t}\n@@ -822,7 +797,7 @@ public ParserRule getDocumentRule() {\n \t}\n \n \t//DocItemType:\n-\t//\t\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\";\n+\t//\ttypeName=(\"condition\" | \"figure\" | \"break\" | \"model\" | \"paragraph\" | \"section\" | \"table\");\n \tpublic DocItemTypeElements getDocItemTypeAccess() {\n \t\treturn (pDocItemType != null) ? pDocItemType : (pDocItemType = new DocItemTypeElements());\n \t}\n@@ -832,7 +807,7 @@ public ParserRule getDocItemTypeRule() {\n \t}\n \n \t//DocItem:\n-\t//\ttype=DocItemType id=ID ref=STRING \";\";\n+\t//\ttype=DocItemType name=ID ref=STRING \";\";\n \tpublic DocItemElements getDocItemAccess() {\n \t\treturn (pDocItem != null) ? pDocItem : (pDocItem = new DocItemElements());\n \t}\n@@ -842,7 +817,7 @@ public ParserRule getDocItemRule() {\n \t}\n \n \t//ModelType:\n-\t//\t\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\";\n+\t//\ttypeName=(\"output\" | \"mode\" | \"state\" | \"macro\" | \"function\" | \"input\");\n \tpublic ModelTypeElements getModelTypeAccess() {\n \t\treturn (pModelType != null) ? pModelType : (pModelType = new ModelTypeElements());\n \t}\n@@ -852,7 +827,7 @@ public ParserRule getModelTypeRule() {\n \t}\n \n \t//ModelItem:\n-\t//\ttype=ModelType id=ID desc=STRING \";\";\n+\t//\ttype=ModelType name=ID desc=STRING \";\";\n \tpublic ModelItemElements getModelItemAccess() {\n \t\treturn (pModelItem != null) ? pModelItem : (pModelItem = new ModelItemElements());\n \t}\n@@ -862,7 +837,7 @@ public ParserRule getModelItemRule() {\n \t}\n \n \t//ListItemType:\n-\t//\t\"requirement\" | \"goal\" | \"hazard\" | \"constraint\";\n+\t//\ttypeName=(\"requirement\" | \"goal\" | \"hazard\" | \"constraint\");\n \tpublic ListItemTypeElements getListItemTypeAccess() {\n \t\treturn (pListItemType != null) ? pListItemType : (pListItemType = new ListItemTypeElements());\n \t}\n@@ -873,54 +848,9 @@ public ParserRule getListItemTypeRule() {\n \n \t/// *\n \t// * A list item has a type, description and lists of references.\n-\t// * / / * \n-\t//Level0:\n-\t//\t{Level0}\n-\t//\t'{'\n-\t//\t\t('Program Plan' pmp=Document)?\n-\t//\t\t('Safety Plan' safetyPlan=Document)?\n-\t//\t\t('Accident Definition' accidentDefinition=Document)?\n-\t//\t\t('Safety Policy' safetyPolicy=Document)?\n-\t//\t'}'\n-\t//;\n-\t//\n-\t//Level1:\n-\t//\t{Level1}\n-\t//\t'{'\n-\t//\t\t('Introduction' introduction=Document)?\n-\t//\t\t('Historical' historical=Document)?\n-\t//\t\t('Environment' environment=Document)?\n-\t//\t\t('Goals' '(' goals+=GoalItem* ')' )?\n-\t//\t\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\n-\t//\t\t('System Limitations' limitations=Document)?\n-\t//\t\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\n-\t//\t\t('Hazard Analysis' hazardAnalysis=Document)?\n-\t//\t\t('Hazard List' '(' hazardList+=HazardItem* ')')?\n-\t//\t\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\n-\t//\t\t('Verification and Validation' verification=Document)?\n-\t//\t'}'\n-\t//;\n-\t//\n-\t//\n-\t//Level2:\n-\t//\tdesc=STRING\n-\t//\t'{'\n-\t//\t'}'\t\n-\t//;\n-\t//\n-\t//Level3:\n-\t//\tdesc=STRING\n-\t//\t'{'\n-\t//\t\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\n-\t//\t\t('User Model' '(' userModels+=ModelItem* ')' )?\n-\t//\t\t('Verification and Validation' verification=Document )?\n-\t//\t'}'\n-\t//;\n-\t//\n-\t//\n \t// * / ListItem:\n-\t//\ttype=ListItemType id=ID desc=STRING (\"{\" docReferences+=[DocItem]* \"}\")? (\"(\" itemReferences+=[ListItem]* \")\")? (\"[\"\n-\t//\tmodelReferences+=[ModelItem]* \"]\")? \";\";\n+\t//\ttype=ListItemType name=ID desc=STRING (\"{\" docReferences+=[DocItem]+ \"}\")? (\"(\" itemReferences+=[ListItem]+ \")\")? (\"[\"\n+\t//\tmodelReferences+=[ModelItem]+ \"]\")? \";\";\n \tpublic ListItemElements getListItemAccess() {\n \t\treturn (pListItem != null) ? pListItem : (pListItem = new ListItemElements());\n \t}","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fservices%2FIntentSpecificationGrammarAccess.java","sha":"492d3f0c6e243a4a171562251d67918938a267e8","status":"modified"},{"additions":2,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FAbstractIntentSpecificationValidator.java","changes":2,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FAbstractIntentSpecificationValidator.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":0,"filename":"net.certware.intent/src-gen/net/certware/intent/validation/AbstractIntentSpecificationValidator.java","new_code":"import org.eclipse.xtext.validation.ComposedChecks;\n@ComposedChecks(validators= {org.eclipse.xtext.validation.NamesAreUniqueValidator.class})","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -6,7 +6,9 @@\n import java.util.ArrayList;\n import java.util.List;\n import org.eclipse.emf.ecore.EPackage;\n+import org.eclipse.xtext.validation.ComposedChecks;\n \n+@ComposedChecks(validators= {org.eclipse.xtext.validation.NamesAreUniqueValidator.class})\n public class AbstractIntentSpecificationValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {\n \n \t@Override","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FAbstractIntentSpecificationValidator.java","sha":"a9fbf6bc5f88b6795db0461bab75320ce7150d8a","status":"modified"},{"additions":1,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FGenerateIntentSpecification.mwe2","changes":2,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FGenerateIntentSpecification.mwe2?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":1,"filename":"net.certware.intent/src/net/certware/intent/GenerateIntentSpecification.mwe2","new_code":"\t\t\t\tcomposedCheck = \"org.eclipse.xtext.validation.NamesAreUniqueValidator\"","new_methods":[],"old_code":" \t\t// composedCheck = \"org.eclipse.xtext.validation.NamesAreUniqueValidator\"","old_methods":[],"patch":"@@ -72,7 +72,7 @@ Workflow {\n \t\t// Xtend-based API for validation\n \t\tfragment = validation.ValidatorFragment auto-inject {\n \t\t// composedCheck = \"org.eclipse.xtext.validation.ImportUriValidator\"\n- \t\t// composedCheck = \"org.eclipse.xtext.validation.NamesAreUniqueValidator\"\n+\t\t\t\tcomposedCheck = \"org.eclipse.xtext.validation.NamesAreUniqueValidator\"\n \t\t}\n \n \t\t// old scoping and exporting API","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FGenerateIntentSpecification.mwe2","sha":"4f8023b917cb702ee5648856888b6b276f59f3a9","status":"modified"},{"additions":12,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.xtext","changes":72,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.xtext?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":60,"filename":"net.certware.intent/src/net/certware/intent/IntentSpecification.xtext","new_code":"\tname=ID\n\tname=ID\n\tname=ID\n\ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\n\tname=ID\n\ttypeName=('environment' | 'operator' | 'system' | 'verification')\n\ttypeName=('condition' | 'figure' | 'break' | 'model' | 'paragraph' | 'section' | 'table')\n\tname=ID\n\ttypeName=('output' | 'mode' | 'state' | 'macro' | 'function' | 'input')\t\n\tname=ID\n\ttypeName=('requirement' | 'goal' | 'hazard' | 'constraint')\t\n\tname=ID","new_methods":[],"old_code":"\tid=ID\n\tid=ID\n\tid=ID\n\t'basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation'\n\tid=ID\n\t'environment' | 'operator' | 'system' | 'verification'\n\t'condition' | 'figure' | 'break' | 'model' | 'paragraph' | 'section' | 'table'\n\tid=ID\n\t'output' | 'mode' | 'state' | 'macro' | 'function' | 'input'\t\n\tid=ID\n\t'requirement' | 'goal' | 'hazard' | 'constraint'\t\n\tid=ID\n\n\n/* \nLevel0:\n\t{Level0}\n\t'{'\n\t\t('Program Plan' pmp=Document)?\n\t\t('Safety Plan' safetyPlan=Document)?\n\t\t('Accident Definition' accidentDefinition=Document)?\n\t\t('Safety Policy' safetyPolicy=Document)?\n\t'}'\n;\n\nLevel1:\n\t{Level1}\n\t'{'\n\t\t('Introduction' introduction=Document)?\n\t\t('Historical' historical=Document)?\n\t\t('Environment' environment=Document)?\n\t\t('Goals' '(' goals+=GoalItem* ')' )?\n\t\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\n\t\t('System Limitations' limitations=Document)?\n\t\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\n\t\t('Hazard Analysis' hazardAnalysis=Document)?\n\t\t('Hazard List' '(' hazardList+=HazardItem* ')')?\n\t\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\n\t\t('Verification and Validation' verification=Document)?\n\t'}'\n;\n\n\nLevel2:\n\tdesc=STRING\n\t'{'\n\t'}'\t\n;\n\nLevel3:\n\tdesc=STRING\n\t'{'\n\t\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\n\t\t('User Model' '(' userModels+=ModelItem* ')' )?\n\t\t('Verification and Validation' verification=Document )?\n\t'}'\n;\n\n\n*/","old_methods":[],"patch":"@@ -12,7 +12,7 @@ generate intentSpecification \"http://www.certware.net/intent/IntentSpecification\n */\n Specification:\n \t'specification'\n-\tid=ID\n+\tname=ID\n \trefinements+=Refinement+\n ;\n \n@@ -21,7 +21,7 @@ Specification:\n */\n Refinement:\n \t'refinement'\n-\tid=ID\n+\tname=ID\n \tdesc=STRING\n \tintents+=Intent+\t\n ;\t\n@@ -31,7 +31,7 @@ Refinement:\n */\n Intent:\n \ttype=IntentType\n-\tid=ID\n+\tname=ID\n \tdesc=STRING\n \tdecompositions+=Decomposition+\t\n ;\n@@ -42,113 +42,65 @@ Intent:\n * A proper intention specification should contain an intent of each type in each refinement.\n */\n IntentType:\n-\t'basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation'\n+\ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\n ;\n \n /*\n * A decomposition has a type and consists of one or more models, documents, or items.\n */\n Decomposition:\n \ttype=DecompositionType\n-\tid=ID\n+\tname=ID\n \tdesc=STRING\n \t('{' documents+=Document* '}')?\n \t('[' models+=ModelItem* ']')?\n \t('(' items+=ListItem* ')')?\n ;\n \n DecompositionType:\n-\t'environment' | 'operator' | 'system' | 'verification'\n+\ttypeName=('environment' | 'operator' | 'system' | 'verification')\n ;\n \n Document:\n \t'{' entries += DocItem+ '}'\n ;\n \n DocItemType:\n-\t'condition' | 'figure' | 'break' | 'model' | 'paragraph' | 'section' | 'table'\n+\ttypeName=('condition' | 'figure' | 'break' | 'model' | 'paragraph' | 'section' | 'table')\n ;\n \n DocItem :\n \ttype=DocItemType\n-\tid=ID\n+\tname=ID\n \tref=STRING\n \t';'\n ;\n \n ModelType:\n-\t'output' | 'mode' | 'state' | 'macro' | 'function' | 'input'\t\n+\ttypeName=('output' | 'mode' | 'state' | 'macro' | 'function' | 'input')\t\n ;\n \n ModelItem:\n \ttype=ModelType\n-\tid=ID\n+\tname=ID\n \tdesc=STRING\n \t';'\n ;\n \n ListItemType:\n-\t'requirement' | 'goal' | 'hazard' | 'constraint'\t\n+\ttypeName=('requirement' | 'goal' | 'hazard' | 'constraint')\t\n ;\n \n /*\n * A list item has a type, description and lists of references.\n */\n ListItem:\n \ttype=ListItemType\n-\tid=ID\n+\tname=ID\n \tdesc=STRING\n \t('{' docReferences+=[DocItem]+ '}' )?\n \t('(' itemReferences+=[ListItem]+ ')' )?\n \t('[' modelReferences+=[ModelItem]+ ']' )?\n \t';'\n ;\n \n-\n-\n-/* \n-Level0:\n-\t{Level0}\n-\t'{'\n-\t\t('Program Plan' pmp=Document)?\n-\t\t('Safety Plan' safetyPlan=Document)?\n-\t\t('Accident Definition' accidentDefinition=Document)?\n-\t\t('Safety Policy' safetyPolicy=Document)?\n-\t'}'\n-;\n-\n-Level1:\n-\t{Level1}\n-\t'{'\n-\t\t('Introduction' introduction=Document)?\n-\t\t('Historical' historical=Document)?\n-\t\t('Environment' environment=Document)?\n-\t\t('Goals' '(' goals+=GoalItem* ')' )?\n-\t\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\n-\t\t('System Limitations' limitations=Document)?\n-\t\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\n-\t\t('Hazard Analysis' hazardAnalysis=Document)?\n-\t\t('Hazard List' '(' hazardList+=HazardItem* ')')?\n-\t\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\n-\t\t('Verification and Validation' verification=Document)?\n-\t'}'\n-;\n-\n-\n-Level2:\n-\tdesc=STRING\n-\t'{'\n-\t'}'\t\n-;\n-\n-Level3:\n-\tdesc=STRING\n-\t'{'\n-\t\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\n-\t\t('User Model' '(' userModels+=ModelItem* ')' )?\n-\t\t('Verification and Validation' verification=Document )?\n-\t'}'\n-;\n-\n-\n-*/\n\\ No newline at end of file","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.xtext","sha":"328aadf18fab8c0509bd3935eeef66ac75dcf46f","status":"modified"},{"additions":137,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.xtend","changes":148,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.xtend?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":11,"filename":"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend","new_code":"\nimport net.certware.intent.intentSpecification.Intent\nimport net.certware.intent.intentSpecification.IntentSpecificationPackage\nimport net.certware.intent.intentSpecification.Refinement\nimport org.eclipse.xtext.validation.Check\nimport net.certware.intent.intentSpecification.Decomposition\nimport net.certware.intent.intentSpecification.ListItem\nimport net.certware.intent.intentSpecification.ModelItem\n\tpublic static val UNIQUE_INTENTS_REFINEMENT = \"net.certware.intent.UniqueIntentsRefinement\";\n\tpublic static val UNIQUE_DECOMPOSITION_INTENT = \"net.certware.intent.UniqueDecompositionIntent\";\n\tpublic static val UNIQUE_LIST_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueListItemDecomposition\";\n\tpublic static val UNIQUE_MODEL_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueModelItemDecomposition\";\n\tpublic static val UNIQUE_LIST_ITEM_LIST_ITEM = \"net.certware.intent.UniqueListItemListItem\";\n\tpublic static val UNIQUE_MODEL_ITEM_LIST_ITEM = \"net.certware.intent.UniqueModelItemListItem\";\n\t\n @Check\n def checkUniqueIntentsInRefinement(Refinement refinement) {\n \t// for each intent type ensure it appears only once in a refinement\n \tval visitedIntentTypeNames = newHashSet()\n \t\n \tvar intents = refinement.intents\n \tvar i = intents.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as Intent\n \t\tvar typeName = d.getType().getTypeName()\n \t\tif ( visitedIntentTypeNames.contains(typeName)) {\n \t\t\twarning(\"duplicate intent type '\"+typeName+\"' in refinement\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.refinement_Intents,\n \t\t\t\tUNIQUE_INTENTS_REFINEMENT,\n \t\t\t\td.name\n \t\t\t)\n \t\t}\n\t\t\tvisitedIntentTypeNames.add(typeName)\n \t}\n }\n \n @Check\n def checkUniqueDecompositionInIntent(Intent intent) {\n \t// for each decomposition type ensure it appears only once in an intent\n \tval visitedDecompositionTypeNames = newHashSet()\n \t\n \tvar decompositions = intent.getDecompositions()\n \tvar i = decompositions.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as Decomposition\n \t\tvar typeName = d.getType().getTypeName()\n \t\tif ( visitedDecompositionTypeNames.contains(typeName)) {\n \t\t\twarning(\"duplicate decomposition type '\"+typeName+\"' in intent\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.intent_Decompositions,\n \t\t\t\tUNIQUE_DECOMPOSITION_INTENT,\n \t\t\t\td.name\n \t\t\t)\n \t\t}\n\t\t\tvisitedDecompositionTypeNames.add(typeName)\n \t}\n }\n \n @Check\n def checkUniqueListItemInDecomposition(Decomposition decomposition) {\n \t// for each list item it appears only once in a decomposition list\n \tval visitedListItems = newHashSet()\n \t\n \tvar items = decomposition.items\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next\n \t\tif ( visitedListItems.contains(d)) {\n \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in list\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.decomposition_Items,\n \t\t\t\tUNIQUE_LIST_ITEM_DECOMPOSITION,\n \t\t\t\td.name\n \t\t\t)\n \t\t}\n\t\t\tvisitedListItems.add(d)\n \t}\n }\n \n @Check\n def checkUniqueModelItemInDecomposition(Decomposition decomposition) {\n \t// for each model item it appears only once in a decomposition list\n \tval visitedModelItems = newHashSet()\n \t\n \tvar items = decomposition.models\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as ModelItem\n \t\tif ( visitedModelItems.contains(d)) {\n \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in models\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.decomposition_Models,\n \t\t\t\tUNIQUE_MODEL_ITEM_DECOMPOSITION,\n \t\t\t\td.name\n \t\t\t)\n \t\t}\n\t\t\tvisitedModelItems.add(d)\n \t}\n }\n \n @Check\n def checkUniqueListItemInListItem(ListItem item) {\n \t// for each list item it appears only once in an item list\n \tval visitedListItems = newHashSet()\n \tvisitedListItems.add(item) // add self, preclude from referencing in item list\n \t\n \tvar items = item.itemReferences\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as ListItem\n \t\tif ( visitedListItems.contains(d)) {\n \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in items\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.listItem_ItemReferences,\n \t\t\t\tUNIQUE_LIST_ITEM_LIST_ITEM,\n\t\t\t\t\td.name \t\t\t\t \n \t\t\t)\n \t\t}\n\t\t\tvisitedListItems.add(d)\n \t}\n }\n \n @Check\n def checkUniqueModelItemInListItem(ListItem item) {\n \t// for each model item it appears only once in an model list\n \tval visitedModelItems = newHashSet()\n \t\n \tvar items = item.modelReferences\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as ModelItem\n \t\tif ( visitedModelItems.contains(d)) {\n \t\t\twarning(\"duplicate model reference '\"+d.name+\"' in models\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.listItem_ModelReferences,\n \t\t\t\tUNIQUE_MODEL_ITEM_LIST_ITEM,\n \t\t\t\td.name\n \t\t\t)\n \t\t}\n\t\t\tvisitedModelItems.add(d)\n \t}\n }","new_methods":[{"arguments":["Refinement refinement"],"filename":"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend","implementation":"// for each intent type ensure it appears only once in a refinement\n \tval visitedIntentTypeNames = newHashSet()\n \t\n \tvar intents = refinement.intents\n \tvar i = intents.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as Intent\n \t\tvar typeName = d.getType().getTypeName()\n \t\tif ( visitedIntentTypeNames.contains(typeName)) {\n \t\t\twarning(\"duplicate intent type '\"+typeName+\"' in refinement\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.refinement_Intents,\n \t\t\t\tUNIQUE_INTENTS_REFINEMENT,\n \t\t\t\td.name\n \t\t\t)","signature":"def checkUniqueIntentsInRefinement(Refinement refinement)"},{"arguments":["Intent intent"],"filename":"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend","implementation":"// for each decomposition type ensure it appears only once in an intent\n \tval visitedDecompositionTypeNames = newHashSet()\n \t\n \tvar decompositions = intent.getDecompositions()\n \tvar i = decompositions.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as Decomposition\n \t\tvar typeName = d.getType().getTypeName()\n \t\tif ( visitedDecompositionTypeNames.contains(typeName)) {\n \t\t\twarning(\"duplicate decomposition type '\"+typeName+\"' in intent\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.intent_Decompositions,\n \t\t\t\tUNIQUE_DECOMPOSITION_INTENT,\n \t\t\t\td.name\n \t\t\t)","signature":"def checkUniqueDecompositionInIntent(Intent intent)"},{"arguments":["Decomposition decomposition"],"filename":"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend","implementation":"// for each list item it appears only once in a decomposition list\n \tval visitedListItems = newHashSet()\n \t\n \tvar items = decomposition.items\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next\n \t\tif ( visitedListItems.contains(d)) {\n \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in list\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.decomposition_Items,\n \t\t\t\tUNIQUE_LIST_ITEM_DECOMPOSITION,\n \t\t\t\td.name\n \t\t\t)","signature":"def checkUniqueListItemInDecomposition(Decomposition decomposition)"},{"arguments":["Decomposition decomposition"],"filename":"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend","implementation":"// for each model item it appears only once in a decomposition list\n \tval visitedModelItems = newHashSet()\n \t\n \tvar items = decomposition.models\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as ModelItem\n \t\tif ( visitedModelItems.contains(d)) {\n \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in models\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.decomposition_Models,\n \t\t\t\tUNIQUE_MODEL_ITEM_DECOMPOSITION,\n \t\t\t\td.name\n \t\t\t)","signature":"def checkUniqueModelItemInDecomposition(Decomposition decomposition)"},{"arguments":["ListItem item"],"filename":"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend","implementation":"// for each list item it appears only once in an item list\n \tval visitedListItems = newHashSet()\n \tvisitedListItems.add(item) // add self, preclude from referencing in item list\n \t\n \tvar items = item.itemReferences\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as ListItem\n \t\tif ( visitedListItems.contains(d)) {\n \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in items\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.listItem_ItemReferences,\n \t\t\t\tUNIQUE_LIST_ITEM_LIST_ITEM,\n\t\t\t\t\td.name \t\t\t\t \n \t\t\t)","signature":"def checkUniqueListItemInListItem(ListItem item)"},{"arguments":["ListItem item"],"filename":"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend","implementation":"// for each model item it appears only once in an model list\n \tval visitedModelItems = newHashSet()\n \t\n \tvar items = item.modelReferences\n \tvar i = items.listIterator\n \twhile ( i.hasNext ) {\n \t\tvar d = i.next as ModelItem\n \t\tif ( visitedModelItems.contains(d)) {\n \t\t\twarning(\"duplicate model reference '\"+d.name+\"' in models\",\n \t\t\t\tIntentSpecificationPackage::eINSTANCE.listItem_ModelReferences,\n \t\t\t\tUNIQUE_MODEL_ITEM_LIST_ITEM,\n \t\t\t\td.name\n \t\t\t)","signature":"def checkUniqueModelItemInListItem(ListItem item)"}],"old_code":"//import org.eclipse.xtext.validation.Check\n// public static val INVALID_NAME = 'invalidName'\n//\n//\t@Check\n//\tdef checkGreetingStartsWithCapital(Greeting greeting) {\n//\t\tif (!Character.isUpperCase(greeting.name.charAt(0))) {\n//\t\t\twarning('Name should start with a capital', \n//\t\t\t\t\tMyDslPackage.Literals.GREETING__NAME,\n//\t\t\t\t\tINVALID_NAME)\n//\t\t}\n//\t}","old_methods":[{"arguments":["Greeting greeting"],"filename":"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend","implementation":"//\t\tif (!Character.isUpperCase(greeting.name.charAt(0))) {\n//\t\t\twarning('Name should start with a capital', \n//\t\t\t\t\tMyDslPackage.Literals.GREETING__NAME,\n//\t\t\t\t\tINVALID_NAME)\n//","signature":"def checkGreetingStartsWithCapital(Greeting greeting)"}],"patch":"@@ -2,7 +2,14 @@\n * generated by Xtext\n */\n package net.certware.intent.validation\n-//import org.eclipse.xtext.validation.Check\n+\n+import net.certware.intent.intentSpecification.Intent\n+import net.certware.intent.intentSpecification.IntentSpecificationPackage\n+import net.certware.intent.intentSpecification.Refinement\n+import org.eclipse.xtext.validation.Check\n+import net.certware.intent.intentSpecification.Decomposition\n+import net.certware.intent.intentSpecification.ListItem\n+import net.certware.intent.intentSpecification.ModelItem\n \n /**\n * Custom validation rules. \n@@ -11,14 +18,133 @@ package net.certware.intent.validation\n */\n class IntentSpecificationValidator extends AbstractIntentSpecificationValidator {\n \n-// public static val INVALID_NAME = 'invalidName'\n-//\n-//\t@Check\n-//\tdef checkGreetingStartsWithCapital(Greeting greeting) {\n-//\t\tif (!Character.isUpperCase(greeting.name.charAt(0))) {\n-//\t\t\twarning('Name should start with a capital', \n-//\t\t\t\t\tMyDslPackage.Literals.GREETING__NAME,\n-//\t\t\t\t\tINVALID_NAME)\n-//\t\t}\n-//\t}\n+\tpublic static val UNIQUE_INTENTS_REFINEMENT = \"net.certware.intent.UniqueIntentsRefinement\";\n+\tpublic static val UNIQUE_DECOMPOSITION_INTENT = \"net.certware.intent.UniqueDecompositionIntent\";\n+\tpublic static val UNIQUE_LIST_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueListItemDecomposition\";\n+\tpublic static val UNIQUE_MODEL_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueModelItemDecomposition\";\n+\tpublic static val UNIQUE_LIST_ITEM_LIST_ITEM = \"net.certware.intent.UniqueListItemListItem\";\n+\tpublic static val UNIQUE_MODEL_ITEM_LIST_ITEM = \"net.certware.intent.UniqueModelItemListItem\";\n+\t\n+ @Check\n+ def checkUniqueIntentsInRefinement(Refinement refinement) {\n+ \t// for each intent type ensure it appears only once in a refinement\n+ \tval visitedIntentTypeNames = newHashSet()\n+ \t\n+ \tvar intents = refinement.intents\n+ \tvar i = intents.listIterator\n+ \twhile ( i.hasNext ) {\n+ \t\tvar d = i.next as Intent\n+ \t\tvar typeName = d.getType().getTypeName()\n+ \t\tif ( visitedIntentTypeNames.contains(typeName)) {\n+ \t\t\twarning(\"duplicate intent type '\"+typeName+\"' in refinement\",\n+ \t\t\t\tIntentSpecificationPackage::eINSTANCE.refinement_Intents,\n+ \t\t\t\tUNIQUE_INTENTS_REFINEMENT,\n+ \t\t\t\td.name\n+ \t\t\t)\n+ \t\t}\n+\t\t\tvisitedIntentTypeNames.add(typeName)\n+ \t}\n+ }\n+ \n+ @Check\n+ def checkUniqueDecompositionInIntent(Intent intent) {\n+ \t// for each decomposition type ensure it appears only once in an intent\n+ \tval visitedDecompositionTypeNames = newHashSet()\n+ \t\n+ \tvar decompositions = intent.getDecompositions()\n+ \tvar i = decompositions.listIterator\n+ \twhile ( i.hasNext ) {\n+ \t\tvar d = i.next as Decomposition\n+ \t\tvar typeName = d.getType().getTypeName()\n+ \t\tif ( visitedDecompositionTypeNames.contains(typeName)) {\n+ \t\t\twarning(\"duplicate decomposition type '\"+typeName+\"' in intent\",\n+ \t\t\t\tIntentSpecificationPackage::eINSTANCE.intent_Decompositions,\n+ \t\t\t\tUNIQUE_DECOMPOSITION_INTENT,\n+ \t\t\t\td.name\n+ \t\t\t)\n+ \t\t}\n+\t\t\tvisitedDecompositionTypeNames.add(typeName)\n+ \t}\n+ }\n+ \n+ @Check\n+ def checkUniqueListItemInDecomposition(Decomposition decomposition) {\n+ \t// for each list item it appears only once in a decomposition list\n+ \tval visitedListItems = newHashSet()\n+ \t\n+ \tvar items = decomposition.items\n+ \tvar i = items.listIterator\n+ \twhile ( i.hasNext ) {\n+ \t\tvar d = i.next\n+ \t\tif ( visitedListItems.contains(d)) {\n+ \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in list\",\n+ \t\t\t\tIntentSpecificationPackage::eINSTANCE.decomposition_Items,\n+ \t\t\t\tUNIQUE_LIST_ITEM_DECOMPOSITION,\n+ \t\t\t\td.name\n+ \t\t\t)\n+ \t\t}\n+\t\t\tvisitedListItems.add(d)\n+ \t}\n+ }\n+ \n+ @Check\n+ def checkUniqueModelItemInDecomposition(Decomposition decomposition) {\n+ \t// for each model item it appears only once in a decomposition list\n+ \tval visitedModelItems = newHashSet()\n+ \t\n+ \tvar items = decomposition.models\n+ \tvar i = items.listIterator\n+ \twhile ( i.hasNext ) {\n+ \t\tvar d = i.next as ModelItem\n+ \t\tif ( visitedModelItems.contains(d)) {\n+ \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in models\",\n+ \t\t\t\tIntentSpecificationPackage::eINSTANCE.decomposition_Models,\n+ \t\t\t\tUNIQUE_MODEL_ITEM_DECOMPOSITION,\n+ \t\t\t\td.name\n+ \t\t\t)\n+ \t\t}\n+\t\t\tvisitedModelItems.add(d)\n+ \t}\n+ }\n+ \n+ @Check\n+ def checkUniqueListItemInListItem(ListItem item) {\n+ \t// for each list item it appears only once in an item list\n+ \tval visitedListItems = newHashSet()\n+ \tvisitedListItems.add(item) // add self, preclude from referencing in item list\n+ \t\n+ \tvar items = item.itemReferences\n+ \tvar i = items.listIterator\n+ \twhile ( i.hasNext ) {\n+ \t\tvar d = i.next as ListItem\n+ \t\tif ( visitedListItems.contains(d)) {\n+ \t\t\twarning(\"duplicate item reference '\"+d.name+\"' in items\",\n+ \t\t\t\tIntentSpecificationPackage::eINSTANCE.listItem_ItemReferences,\n+ \t\t\t\tUNIQUE_LIST_ITEM_LIST_ITEM,\n+\t\t\t\t\td.name \t\t\t\t \n+ \t\t\t)\n+ \t\t}\n+\t\t\tvisitedListItems.add(d)\n+ \t}\n+ }\n+ \n+ @Check\n+ def checkUniqueModelItemInListItem(ListItem item) {\n+ \t// for each model item it appears only once in an model list\n+ \tval visitedModelItems = newHashSet()\n+ \t\n+ \tvar items = item.modelReferences\n+ \tvar i = items.listIterator\n+ \twhile ( i.hasNext ) {\n+ \t\tvar d = i.next as ModelItem\n+ \t\tif ( visitedModelItems.contains(d)) {\n+ \t\t\twarning(\"duplicate model reference '\"+d.name+\"' in models\",\n+ \t\t\t\tIntentSpecificationPackage::eINSTANCE.listItem_ModelReferences,\n+ \t\t\t\tUNIQUE_MODEL_ITEM_LIST_ITEM,\n+ \t\t\t\td.name\n+ \t\t\t)\n+ \t\t}\n+\t\t\tvisitedModelItems.add(d)\n+ \t}\n+ }\n }","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.xtend","sha":"2948f9fdbdfa797be196d1a50778131fbdd19d07","status":"modified"},{"additions":195,"blob_url":"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.java","changes":195,"contents_url":"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9","deletions":0,"filename":"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java","new_code":"import java.util.HashSet;\nimport java.util.ListIterator;\nimport net.certware.intent.intentSpecification.Decomposition;\nimport net.certware.intent.intentSpecification.DecompositionType;\nimport net.certware.intent.intentSpecification.Intent;\nimport net.certware.intent.intentSpecification.IntentSpecificationPackage;\nimport net.certware.intent.intentSpecification.IntentType;\nimport net.certware.intent.intentSpecification.ListItem;\nimport net.certware.intent.intentSpecification.ModelItem;\nimport net.certware.intent.intentSpecification.Refinement;\nimport org.eclipse.emf.common.util.EList;\nimport org.eclipse.emf.ecore.EReference;\nimport org.eclipse.xtext.validation.Check;\nimport org.eclipse.xtext.xbase.lib.CollectionLiterals;\n public final static String UNIQUE_INTENTS_REFINEMENT = \"net.certware.intent.UniqueIntentsRefinement\";\n \n public final static String UNIQUE_DECOMPOSITION_INTENT = \"net.certware.intent.UniqueDecompositionIntent\";\n \n public final static String UNIQUE_LIST_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueListItemDecomposition\";\n \n public final static String UNIQUE_MODEL_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueModelItemDecomposition\";\n \n public final static String UNIQUE_LIST_ITEM_LIST_ITEM = \"net.certware.intent.UniqueListItemListItem\";\n \n public final static String UNIQUE_MODEL_ITEM_LIST_ITEM = \"net.certware.intent.UniqueModelItemListItem\";\n \n @Check\n public void checkUniqueIntentsInRefinement(final Refinement refinement) {\n final HashSet visitedIntentTypeNames = CollectionLiterals.newHashSet();\n EList intents = refinement.getIntents();\n ListIterator i = intents.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Intent _next = i.next();\n Intent d = ((Intent) _next);\n IntentType _type = d.getType();\n String typeName = _type.getTypeName();\n boolean _contains = visitedIntentTypeNames.contains(typeName);\n if (_contains) {\n String _plus = (\"duplicate intent type \\'\" + typeName);\n String _plus_1 = (_plus + \"\\' in refinement\");\n EReference _refinement_Intents = IntentSpecificationPackage.eINSTANCE.getRefinement_Intents();\n String _name = d.getName();\n this.warning(_plus_1, _refinement_Intents, \n IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT, _name);\n }\n visitedIntentTypeNames.add(typeName);\n }\n boolean _hasNext_1 = i.hasNext();\n _while = _hasNext_1;\n }\n }\n \n @Check\n public void checkUniqueDecompositionInIntent(final Intent intent) {\n final HashSet visitedDecompositionTypeNames = CollectionLiterals.newHashSet();\n EList decompositions = intent.getDecompositions();\n ListIterator i = decompositions.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Decomposition _next = i.next();\n Decomposition d = ((Decomposition) _next);\n DecompositionType _type = d.getType();\n String typeName = _type.getTypeName();\n boolean _contains = visitedDecompositionTypeNames.contains(typeName);\n if (_contains) {\n String _plus = (\"duplicate decomposition type \\'\" + typeName);\n String _plus_1 = (_plus + \"\\' in intent\");\n EReference _intent_Decompositions = IntentSpecificationPackage.eINSTANCE.getIntent_Decompositions();\n String _name = d.getName();\n this.warning(_plus_1, _intent_Decompositions, \n IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT, _name);\n }\n visitedDecompositionTypeNames.add(typeName);\n }\n boolean _hasNext_1 = i.hasNext();\n _while = _hasNext_1;\n }\n }\n \n @Check\n public void checkUniqueListItemInDecomposition(final Decomposition decomposition) {\n final HashSet visitedListItems = CollectionLiterals.newHashSet();\n EList items = decomposition.getItems();\n ListIterator i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ListItem d = i.next();\n boolean _contains = visitedListItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate item reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in list\");\n EReference _decomposition_Items = IntentSpecificationPackage.eINSTANCE.getDecomposition_Items();\n String _name_1 = d.getName();\n this.warning(_plus_1, _decomposition_Items, \n IntentSpecificationValidator.UNIQUE_LIST_ITEM_DECOMPOSITION, _name_1);\n }\n visitedListItems.add(d);\n }\n boolean _hasNext_1 = i.hasNext();\n _while = _hasNext_1;\n }\n }\n \n @Check\n public void checkUniqueModelItemInDecomposition(final Decomposition decomposition) {\n final HashSet visitedModelItems = CollectionLiterals.newHashSet();\n EList items = decomposition.getModels();\n ListIterator i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ModelItem _next = i.next();\n ModelItem d = ((ModelItem) _next);\n boolean _contains = visitedModelItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate item reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in models\");\n EReference _decomposition_Models = IntentSpecificationPackage.eINSTANCE.getDecomposition_Models();\n String _name_1 = d.getName();\n this.warning(_plus_1, _decomposition_Models, \n IntentSpecificationValidator.UNIQUE_MODEL_ITEM_DECOMPOSITION, _name_1);\n }\n visitedModelItems.add(d);\n }\n boolean _hasNext_1 = i.hasNext();\n _while = _hasNext_1;\n }\n }\n \n @Check\n public void checkUniqueListItemInListItem(final ListItem item) {\n final HashSet visitedListItems = CollectionLiterals.newHashSet();\n visitedListItems.add(item);\n EList items = item.getItemReferences();\n ListIterator i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ListItem _next = i.next();\n ListItem d = ((ListItem) _next);\n boolean _contains = visitedListItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate item reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in items\");\n EReference _listItem_ItemReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ItemReferences();\n String _name_1 = d.getName();\n this.warning(_plus_1, _listItem_ItemReferences, \n IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM, _name_1);\n }\n visitedListItems.add(d);\n }\n boolean _hasNext_1 = i.hasNext();\n _while = _hasNext_1;\n }\n }\n \n @Check\n public void checkUniqueModelItemInListItem(final ListItem item) {\n final HashSet visitedModelItems = CollectionLiterals.newHashSet();\n EList items = item.getModelReferences();\n ListIterator i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ModelItem _next = i.next();\n ModelItem d = ((ModelItem) _next);\n boolean _contains = visitedModelItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate model reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in models\");\n EReference _listItem_ModelReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ModelReferences();\n String _name_1 = d.getName();\n this.warning(_plus_1, _listItem_ModelReferences, \n IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM, _name_1);\n }\n visitedModelItems.add(d);\n }\n boolean _hasNext_1 = i.hasNext();\n _while = _hasNext_1;\n }\n }","new_methods":[{"arguments":["final Refinement refinement"],"filename":"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java","implementation":"final HashSet visitedIntentTypeNames = CollectionLiterals.newHashSet();\n EList intents = refinement.getIntents();\n ListIterator i = intents.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Intent _next = i.next();\n Intent d = ((Intent) _next);\n IntentType _type = d.getType();\n String typeName = _type.getTypeName();\n boolean _contains = visitedIntentTypeNames.contains(typeName);\n if (_contains) {\n String _plus = (\"duplicate intent type \\'\" + typeName);\n String _plus_1 = (_plus + \"\\' in refinement\");\n EReference _refinement_Intents = IntentSpecificationPackage.eINSTANCE.getRefinement_Intents();\n String _name = d.getName();\n this.warning(_plus_1, _refinement_Intents, \n IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT, _name);","signature":"void checkUniqueIntentsInRefinement(final Refinement refinement)"},{"arguments":["final Intent intent"],"filename":"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java","implementation":"final HashSet visitedDecompositionTypeNames = CollectionLiterals.newHashSet();\n EList decompositions = intent.getDecompositions();\n ListIterator i = decompositions.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n Decomposition _next = i.next();\n Decomposition d = ((Decomposition) _next);\n DecompositionType _type = d.getType();\n String typeName = _type.getTypeName();\n boolean _contains = visitedDecompositionTypeNames.contains(typeName);\n if (_contains) {\n String _plus = (\"duplicate decomposition type \\'\" + typeName);\n String _plus_1 = (_plus + \"\\' in intent\");\n EReference _intent_Decompositions = IntentSpecificationPackage.eINSTANCE.getIntent_Decompositions();\n String _name = d.getName();\n this.warning(_plus_1, _intent_Decompositions, \n IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT, _name);","signature":"void checkUniqueDecompositionInIntent(final Intent intent)"},{"arguments":["final Decomposition decomposition"],"filename":"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java","implementation":"final HashSet visitedListItems = CollectionLiterals.newHashSet();\n EList items = decomposition.getItems();\n ListIterator i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ListItem d = i.next();\n boolean _contains = visitedListItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate item reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in list\");\n EReference _decomposition_Items = IntentSpecificationPackage.eINSTANCE.getDecomposition_Items();\n String _name_1 = d.getName();\n this.warning(_plus_1, _decomposition_Items, \n IntentSpecificationValidator.UNIQUE_LIST_ITEM_DECOMPOSITION, _name_1);","signature":"void checkUniqueListItemInDecomposition(final Decomposition decomposition)"},{"arguments":["final Decomposition decomposition"],"filename":"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java","implementation":"final HashSet visitedModelItems = CollectionLiterals.newHashSet();\n EList items = decomposition.getModels();\n ListIterator i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ModelItem _next = i.next();\n ModelItem d = ((ModelItem) _next);\n boolean _contains = visitedModelItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate item reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in models\");\n EReference _decomposition_Models = IntentSpecificationPackage.eINSTANCE.getDecomposition_Models();\n String _name_1 = d.getName();\n this.warning(_plus_1, _decomposition_Models, \n IntentSpecificationValidator.UNIQUE_MODEL_ITEM_DECOMPOSITION, _name_1);","signature":"void checkUniqueModelItemInDecomposition(final Decomposition decomposition)"},{"arguments":["final ListItem item"],"filename":"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java","implementation":"final HashSet visitedListItems = CollectionLiterals.newHashSet();\n visitedListItems.add(item);\n EList items = item.getItemReferences();\n ListIterator i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ListItem _next = i.next();\n ListItem d = ((ListItem) _next);\n boolean _contains = visitedListItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate item reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in items\");\n EReference _listItem_ItemReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ItemReferences();\n String _name_1 = d.getName();\n this.warning(_plus_1, _listItem_ItemReferences, \n IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM, _name_1);","signature":"void checkUniqueListItemInListItem(final ListItem item)"},{"arguments":["final ListItem item"],"filename":"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java","implementation":"final HashSet visitedModelItems = CollectionLiterals.newHashSet();\n EList items = item.getModelReferences();\n ListIterator i = items.listIterator();\n boolean _hasNext = i.hasNext();\n boolean _while = _hasNext;\n while (_while) {\n {\n ModelItem _next = i.next();\n ModelItem d = ((ModelItem) _next);\n boolean _contains = visitedModelItems.contains(d);\n if (_contains) {\n String _name = d.getName();\n String _plus = (\"duplicate model reference \\'\" + _name);\n String _plus_1 = (_plus + \"\\' in models\");\n EReference _listItem_ModelReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ModelReferences();\n String _name_1 = d.getName();\n this.warning(_plus_1, _listItem_ModelReferences, \n IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM, _name_1);","signature":"void checkUniqueModelItemInListItem(final ListItem item)"}],"old_code":"","old_methods":[],"patch":"@@ -3,7 +3,21 @@\n */\n package net.certware.intent.validation;\n \n+import java.util.HashSet;\n+import java.util.ListIterator;\n+import net.certware.intent.intentSpecification.Decomposition;\n+import net.certware.intent.intentSpecification.DecompositionType;\n+import net.certware.intent.intentSpecification.Intent;\n+import net.certware.intent.intentSpecification.IntentSpecificationPackage;\n+import net.certware.intent.intentSpecification.IntentType;\n+import net.certware.intent.intentSpecification.ListItem;\n+import net.certware.intent.intentSpecification.ModelItem;\n+import net.certware.intent.intentSpecification.Refinement;\n import net.certware.intent.validation.AbstractIntentSpecificationValidator;\n+import org.eclipse.emf.common.util.EList;\n+import org.eclipse.emf.ecore.EReference;\n+import org.eclipse.xtext.validation.Check;\n+import org.eclipse.xtext.xbase.lib.CollectionLiterals;\n \n /**\n * Custom validation rules.\n@@ -12,4 +26,185 @@\n */\n @SuppressWarnings(\"all\")\n public class IntentSpecificationValidator extends AbstractIntentSpecificationValidator {\n+ public final static String UNIQUE_INTENTS_REFINEMENT = \"net.certware.intent.UniqueIntentsRefinement\";\n+ \n+ public final static String UNIQUE_DECOMPOSITION_INTENT = \"net.certware.intent.UniqueDecompositionIntent\";\n+ \n+ public final static String UNIQUE_LIST_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueListItemDecomposition\";\n+ \n+ public final static String UNIQUE_MODEL_ITEM_DECOMPOSITION = \"net.certware.intent.UniqueModelItemDecomposition\";\n+ \n+ public final static String UNIQUE_LIST_ITEM_LIST_ITEM = \"net.certware.intent.UniqueListItemListItem\";\n+ \n+ public final static String UNIQUE_MODEL_ITEM_LIST_ITEM = \"net.certware.intent.UniqueModelItemListItem\";\n+ \n+ @Check\n+ public void checkUniqueIntentsInRefinement(final Refinement refinement) {\n+ final HashSet visitedIntentTypeNames = CollectionLiterals.newHashSet();\n+ EList intents = refinement.getIntents();\n+ ListIterator i = intents.listIterator();\n+ boolean _hasNext = i.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ Intent _next = i.next();\n+ Intent d = ((Intent) _next);\n+ IntentType _type = d.getType();\n+ String typeName = _type.getTypeName();\n+ boolean _contains = visitedIntentTypeNames.contains(typeName);\n+ if (_contains) {\n+ String _plus = (\"duplicate intent type \\'\" + typeName);\n+ String _plus_1 = (_plus + \"\\' in refinement\");\n+ EReference _refinement_Intents = IntentSpecificationPackage.eINSTANCE.getRefinement_Intents();\n+ String _name = d.getName();\n+ this.warning(_plus_1, _refinement_Intents, \n+ IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT, _name);\n+ }\n+ visitedIntentTypeNames.add(typeName);\n+ }\n+ boolean _hasNext_1 = i.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ }\n+ \n+ @Check\n+ public void checkUniqueDecompositionInIntent(final Intent intent) {\n+ final HashSet visitedDecompositionTypeNames = CollectionLiterals.newHashSet();\n+ EList decompositions = intent.getDecompositions();\n+ ListIterator i = decompositions.listIterator();\n+ boolean _hasNext = i.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ Decomposition _next = i.next();\n+ Decomposition d = ((Decomposition) _next);\n+ DecompositionType _type = d.getType();\n+ String typeName = _type.getTypeName();\n+ boolean _contains = visitedDecompositionTypeNames.contains(typeName);\n+ if (_contains) {\n+ String _plus = (\"duplicate decomposition type \\'\" + typeName);\n+ String _plus_1 = (_plus + \"\\' in intent\");\n+ EReference _intent_Decompositions = IntentSpecificationPackage.eINSTANCE.getIntent_Decompositions();\n+ String _name = d.getName();\n+ this.warning(_plus_1, _intent_Decompositions, \n+ IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT, _name);\n+ }\n+ visitedDecompositionTypeNames.add(typeName);\n+ }\n+ boolean _hasNext_1 = i.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ }\n+ \n+ @Check\n+ public void checkUniqueListItemInDecomposition(final Decomposition decomposition) {\n+ final HashSet visitedListItems = CollectionLiterals.newHashSet();\n+ EList items = decomposition.getItems();\n+ ListIterator i = items.listIterator();\n+ boolean _hasNext = i.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ ListItem d = i.next();\n+ boolean _contains = visitedListItems.contains(d);\n+ if (_contains) {\n+ String _name = d.getName();\n+ String _plus = (\"duplicate item reference \\'\" + _name);\n+ String _plus_1 = (_plus + \"\\' in list\");\n+ EReference _decomposition_Items = IntentSpecificationPackage.eINSTANCE.getDecomposition_Items();\n+ String _name_1 = d.getName();\n+ this.warning(_plus_1, _decomposition_Items, \n+ IntentSpecificationValidator.UNIQUE_LIST_ITEM_DECOMPOSITION, _name_1);\n+ }\n+ visitedListItems.add(d);\n+ }\n+ boolean _hasNext_1 = i.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ }\n+ \n+ @Check\n+ public void checkUniqueModelItemInDecomposition(final Decomposition decomposition) {\n+ final HashSet visitedModelItems = CollectionLiterals.newHashSet();\n+ EList items = decomposition.getModels();\n+ ListIterator i = items.listIterator();\n+ boolean _hasNext = i.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ ModelItem _next = i.next();\n+ ModelItem d = ((ModelItem) _next);\n+ boolean _contains = visitedModelItems.contains(d);\n+ if (_contains) {\n+ String _name = d.getName();\n+ String _plus = (\"duplicate item reference \\'\" + _name);\n+ String _plus_1 = (_plus + \"\\' in models\");\n+ EReference _decomposition_Models = IntentSpecificationPackage.eINSTANCE.getDecomposition_Models();\n+ String _name_1 = d.getName();\n+ this.warning(_plus_1, _decomposition_Models, \n+ IntentSpecificationValidator.UNIQUE_MODEL_ITEM_DECOMPOSITION, _name_1);\n+ }\n+ visitedModelItems.add(d);\n+ }\n+ boolean _hasNext_1 = i.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ }\n+ \n+ @Check\n+ public void checkUniqueListItemInListItem(final ListItem item) {\n+ final HashSet visitedListItems = CollectionLiterals.newHashSet();\n+ visitedListItems.add(item);\n+ EList items = item.getItemReferences();\n+ ListIterator i = items.listIterator();\n+ boolean _hasNext = i.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ ListItem _next = i.next();\n+ ListItem d = ((ListItem) _next);\n+ boolean _contains = visitedListItems.contains(d);\n+ if (_contains) {\n+ String _name = d.getName();\n+ String _plus = (\"duplicate item reference \\'\" + _name);\n+ String _plus_1 = (_plus + \"\\' in items\");\n+ EReference _listItem_ItemReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ItemReferences();\n+ String _name_1 = d.getName();\n+ this.warning(_plus_1, _listItem_ItemReferences, \n+ IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM, _name_1);\n+ }\n+ visitedListItems.add(d);\n+ }\n+ boolean _hasNext_1 = i.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ }\n+ \n+ @Check\n+ public void checkUniqueModelItemInListItem(final ListItem item) {\n+ final HashSet visitedModelItems = CollectionLiterals.newHashSet();\n+ EList items = item.getModelReferences();\n+ ListIterator i = items.listIterator();\n+ boolean _hasNext = i.hasNext();\n+ boolean _while = _hasNext;\n+ while (_while) {\n+ {\n+ ModelItem _next = i.next();\n+ ModelItem d = ((ModelItem) _next);\n+ boolean _contains = visitedModelItems.contains(d);\n+ if (_contains) {\n+ String _name = d.getName();\n+ String _plus = (\"duplicate model reference \\'\" + _name);\n+ String _plus_1 = (_plus + \"\\' in models\");\n+ EReference _listItem_ModelReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ModelReferences();\n+ String _name_1 = d.getName();\n+ this.warning(_plus_1, _listItem_ModelReferences, \n+ IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM, _name_1);\n+ }\n+ visitedModelItems.add(d);\n+ }\n+ boolean _hasNext_1 = i.hasNext();\n+ _while = _hasNext_1;\n+ }\n+ }\n }","raw_url":"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.java","sha":"7af1db4fbd8a74caeb5142984fb685a77b01a4fa","status":"modified"}],"string":"[\n {\n \"additions\": 8,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fplugin.xml\",\n \"changes\": 16,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fplugin.xml?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 8,\n \"filename\": \"net.certware.intent.ui/plugin.xml\",\n \"new_code\": \" name=\\\"Intent Specification Editor\\\">\\n name=\\\"Intent Specification\\\">\\n name=\\\"Intent Specification\\\">\\n label=\\\"Intent Specification\\\"/>\\n\\t name=\\\"Intent Specification Problem\\\"\\n\\t name=\\\"Intent Specification Problem\\\"\\n\\t name=\\\"Intent Specification Problem\\\"\\n extensions=\\\"intent\\\" label=\\\"Intent Specification Compare\\\">\",\n \"new_methods\": [],\n \"old_code\": \" name=\\\"IntentSpecification Editor\\\">\\n name=\\\"IntentSpecification\\\">\\n name=\\\"IntentSpecification\\\">\\n label=\\\"IntentSpecification\\\"/>\\n\\t name=\\\"IntentSpecification Problem\\\"\\n\\t name=\\\"IntentSpecification Problem\\\"\\n\\t name=\\\"IntentSpecification Problem\\\"\\n extensions=\\\"intent\\\" label=\\\"IntentSpecification Compare\\\">\",\n \"old_methods\": [],\n \"patch\": \"@@ -12,7 +12,7 @@\\n extensions=\\\"intent\\\"\\n icon=\\\"icons/obj16/intent.gif\\\"\\n id=\\\"net.certware.intent.IntentSpecification\\\"\\n- name=\\\"IntentSpecification Editor\\\">\\n+ name=\\\"Intent Specification Editor\\\">\\n \\n \\n \\n+ name=\\\"Intent Specification\\\">\\n \\n \\n \\n+ name=\\\"Intent Specification\\\">\\n \\n \\n \\t \\n@@ -120,7 +120,7 @@\\n point=\\\"org.eclipse.ui.keywords\\\">\\n \\n+ label=\\\"Intent Specification\\\"/>\\n \\n \\n@@ -235,21 +235,21 @@\\n \\t\\n \\t\\n \\t \\n \\t \\n \\t\\n \\t\\n \\t \\n \\t \\n \\t\\n \\t\\n \\t \\n \\t \\n@@ -406,7 +406,7 @@\\n \\n \\n+ extensions=\\\"intent\\\" label=\\\"Intent Specification Compare\\\">\\n \\n \\n \",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fplugin.xml\",\n \"sha\": \"52d4008c146ac7ae28f9ac61d210b6334ac321db\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 45,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2FAbstractIntentSpecificationProposalProvider.java\",\n \"changes\": 52,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2FAbstractIntentSpecificationProposalProvider.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 7,\n \"filename\": \"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java\",\n \"new_code\": \"\\tpublic void completeSpecification_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeRefinement_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeIntent_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeIntentType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t}\\n\\tpublic void completeDecomposition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeDecompositionType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t}\\n\\tpublic void completeDocItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t}\\n\\tpublic void completeDocItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeModelType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t}\\n\\tpublic void completeModelItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeListItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t}\\n\\tpublic void completeListItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"EObject model\",\n \" Assignment assignment\",\n \" ContentAssistContext context\",\n \" ICompletionProposalAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java\",\n \"implementation\": \"public void completeRefinement_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeIntent_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeIntentType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\",\n \"signature\": \"void completeSpecification_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)\"\n },\n {\n \"arguments\": [\n \"EObject model\",\n \" Assignment assignment\",\n \" ContentAssistContext context\",\n \" ICompletionProposalAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java\",\n \"implementation\": \"public void completeDecompositionType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\",\n \"signature\": \"void completeDecomposition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)\"\n },\n {\n \"arguments\": [\n \"EObject model\",\n \" Assignment assignment\",\n \" ContentAssistContext context\",\n \" ICompletionProposalAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java\",\n \"implementation\": \"// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\",\n \"signature\": \"void completeDocItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)\"\n },\n {\n \"arguments\": [\n \"EObject model\",\n \" Assignment assignment\",\n \" ContentAssistContext context\",\n \" ICompletionProposalAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java\",\n \"implementation\": \"public void completeModelType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\",\n \"signature\": \"void completeDocItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)\"\n },\n {\n \"arguments\": [\n \"EObject model\",\n \" Assignment assignment\",\n \" ContentAssistContext context\",\n \" ICompletionProposalAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/AbstractIntentSpecificationProposalProvider.java\",\n \"implementation\": \"public void completeListItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\\n\\t\\t// subclasses may override\",\n \"signature\": \"void completeModelItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor)\"\n }\n ],\n \"old_code\": \"\\tpublic void completeSpecification_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeRefinement_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeIntent_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeDecomposition_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeDocItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeModelItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n\\tpublic void completeListItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -16,13 +16,13 @@\\n @SuppressWarnings(\\\"all\\\")\\n public class AbstractIntentSpecificationProposalProvider extends org.eclipse.xtext.common.ui.contentassist.TerminalsProposalProvider {\\n \\t\\t\\n-\\tpublic void completeSpecification_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n+\\tpublic void completeSpecification_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n \\tpublic void completeSpecification_Refinements(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n-\\tpublic void completeRefinement_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n+\\tpublic void completeRefinement_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n \\tpublic void completeRefinement_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n@@ -34,7 +34,7 @@ public void completeRefinement_Intents(EObject model, Assignment assignment, Con\\n \\tpublic void completeIntent_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n-\\tpublic void completeIntent_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n+\\tpublic void completeIntent_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n \\tpublic void completeIntent_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n@@ -43,10 +43,19 @@ public void completeIntent_Desc(EObject model, Assignment assignment, ContentAss\\n \\tpublic void completeIntent_Decompositions(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n+\\tpublic void completeIntentType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t}\\n \\tpublic void completeDecomposition_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n-\\tpublic void completeDecomposition_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n+\\tpublic void completeDecomposition_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n \\tpublic void completeDecomposition_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n@@ -61,31 +70,60 @@ public void completeDecomposition_Models(EObject model, Assignment assignment, C\\n \\tpublic void completeDecomposition_Items(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n+\\tpublic void completeDecompositionType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t}\\n \\tpublic void completeDocument_Entries(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n+\\tpublic void completeDocItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t}\\n \\tpublic void completeDocItem_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n-\\tpublic void completeDocItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n+\\tpublic void completeDocItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n \\tpublic void completeDocItem_Ref(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n+\\tpublic void completeModelType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t}\\n \\tpublic void completeModelItem_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n-\\tpublic void completeModelItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n+\\tpublic void completeModelItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n \\tpublic void completeModelItem_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n+\\tpublic void completeListItemType_TypeName(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t\\t// subclasses may override\\n+\\t}\\n \\tpublic void completeListItem_Type(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n-\\tpublic void completeListItem_Id(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n+\\tpublic void completeListItem_Name(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\\n \\t\\tcompleteRuleCall(((RuleCall)assignment.getTerminal()), context, acceptor);\\n \\t}\\n \\tpublic void completeListItem_Desc(EObject model, Assignment assignment, ContentAssistContext context, ICompletionProposalAcceptor acceptor) {\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2FAbstractIntentSpecificationProposalProvider.java\",\n \"sha\": \"945949ad08b9388eee93eff0ed125c80b438cf72\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 17,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2FIntentSpecificationParser.java\",\n \"changes\": 29,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2FIntentSpecificationParser.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 12,\n \"filename\": \"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/IntentSpecificationParser.java\",\n \"new_code\": \"\\t\\t\\t\\t\\tput(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0(), \\\"rule__IntentType__TypeNameAlternatives_0\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0(), \\\"rule__DecompositionType__TypeNameAlternatives_0\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0(), \\\"rule__DocItemType__TypeNameAlternatives_0\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0(), \\\"rule__ModelType__TypeNameAlternatives_0\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0(), \\\"rule__ListItemType__TypeNameAlternatives_0\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getSpecificationAccess().getNameAssignment_1(), \\\"rule__Specification__NameAssignment_1\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getRefinementAccess().getNameAssignment_1(), \\\"rule__Refinement__NameAssignment_1\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getIntentAccess().getNameAssignment_1(), \\\"rule__Intent__NameAssignment_1\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getIntentTypeAccess().getTypeNameAssignment(), \\\"rule__IntentType__TypeNameAssignment\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getDecompositionAccess().getNameAssignment_1(), \\\"rule__Decomposition__NameAssignment_1\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment(), \\\"rule__DecompositionType__TypeNameAssignment\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment(), \\\"rule__DocItemType__TypeNameAssignment\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getDocItemAccess().getNameAssignment_1(), \\\"rule__DocItem__NameAssignment_1\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getModelTypeAccess().getTypeNameAssignment(), \\\"rule__ModelType__TypeNameAssignment\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getModelItemAccess().getNameAssignment_1(), \\\"rule__ModelItem__NameAssignment_1\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getListItemTypeAccess().getTypeNameAssignment(), \\\"rule__ListItemType__TypeNameAssignment\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getListItemAccess().getNameAssignment_1(), \\\"rule__ListItem__NameAssignment_1\\\");\",\n \"new_methods\": [],\n \"old_code\": \"\\t\\t\\t\\t\\tput(grammarAccess.getIntentTypeAccess().getAlternatives(), \\\"rule__IntentType__Alternatives\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getDecompositionTypeAccess().getAlternatives(), \\\"rule__DecompositionType__Alternatives\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getDocItemTypeAccess().getAlternatives(), \\\"rule__DocItemType__Alternatives\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getModelTypeAccess().getAlternatives(), \\\"rule__ModelType__Alternatives\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getListItemTypeAccess().getAlternatives(), \\\"rule__ListItemType__Alternatives\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getSpecificationAccess().getIdAssignment_1(), \\\"rule__Specification__IdAssignment_1\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getRefinementAccess().getIdAssignment_1(), \\\"rule__Refinement__IdAssignment_1\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getIntentAccess().getIdAssignment_1(), \\\"rule__Intent__IdAssignment_1\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getDecompositionAccess().getIdAssignment_1(), \\\"rule__Decomposition__IdAssignment_1\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getDocItemAccess().getIdAssignment_1(), \\\"rule__DocItem__IdAssignment_1\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getModelItemAccess().getIdAssignment_1(), \\\"rule__ModelItem__IdAssignment_1\\\");\\n\\t\\t\\t\\t\\tput(grammarAccess.getListItemAccess().getIdAssignment_1(), \\\"rule__ListItem__IdAssignment_1\\\");\",\n \"old_methods\": [],\n \"patch\": \"@@ -37,11 +37,11 @@ protected String getRuleName(AbstractElement element) {\\n \\t\\t\\tnameMappings = new HashMap() {\\n \\t\\t\\t\\tprivate static final long serialVersionUID = 1L;\\n \\t\\t\\t\\t{\\n-\\t\\t\\t\\t\\tput(grammarAccess.getIntentTypeAccess().getAlternatives(), \\\"rule__IntentType__Alternatives\\\");\\n-\\t\\t\\t\\t\\tput(grammarAccess.getDecompositionTypeAccess().getAlternatives(), \\\"rule__DecompositionType__Alternatives\\\");\\n-\\t\\t\\t\\t\\tput(grammarAccess.getDocItemTypeAccess().getAlternatives(), \\\"rule__DocItemType__Alternatives\\\");\\n-\\t\\t\\t\\t\\tput(grammarAccess.getModelTypeAccess().getAlternatives(), \\\"rule__ModelType__Alternatives\\\");\\n-\\t\\t\\t\\t\\tput(grammarAccess.getListItemTypeAccess().getAlternatives(), \\\"rule__ListItemType__Alternatives\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0(), \\\"rule__IntentType__TypeNameAlternatives_0\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0(), \\\"rule__DecompositionType__TypeNameAlternatives_0\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0(), \\\"rule__DocItemType__TypeNameAlternatives_0\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0(), \\\"rule__ModelType__TypeNameAlternatives_0\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0(), \\\"rule__ListItemType__TypeNameAlternatives_0\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getSpecificationAccess().getGroup(), \\\"rule__Specification__Group__0\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getRefinementAccess().getGroup(), \\\"rule__Refinement__Group__0\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getIntentAccess().getGroup(), \\\"rule__Intent__Group__0\\\");\\n@@ -56,30 +56,35 @@ protected String getRuleName(AbstractElement element) {\\n \\t\\t\\t\\t\\tput(grammarAccess.getListItemAccess().getGroup_3(), \\\"rule__ListItem__Group_3__0\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getListItemAccess().getGroup_4(), \\\"rule__ListItem__Group_4__0\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getListItemAccess().getGroup_5(), \\\"rule__ListItem__Group_5__0\\\");\\n-\\t\\t\\t\\t\\tput(grammarAccess.getSpecificationAccess().getIdAssignment_1(), \\\"rule__Specification__IdAssignment_1\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getSpecificationAccess().getNameAssignment_1(), \\\"rule__Specification__NameAssignment_1\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getSpecificationAccess().getRefinementsAssignment_2(), \\\"rule__Specification__RefinementsAssignment_2\\\");\\n-\\t\\t\\t\\t\\tput(grammarAccess.getRefinementAccess().getIdAssignment_1(), \\\"rule__Refinement__IdAssignment_1\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getRefinementAccess().getNameAssignment_1(), \\\"rule__Refinement__NameAssignment_1\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getRefinementAccess().getDescAssignment_2(), \\\"rule__Refinement__DescAssignment_2\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getRefinementAccess().getIntentsAssignment_3(), \\\"rule__Refinement__IntentsAssignment_3\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getIntentAccess().getTypeAssignment_0(), \\\"rule__Intent__TypeAssignment_0\\\");\\n-\\t\\t\\t\\t\\tput(grammarAccess.getIntentAccess().getIdAssignment_1(), \\\"rule__Intent__IdAssignment_1\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getIntentAccess().getNameAssignment_1(), \\\"rule__Intent__NameAssignment_1\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getIntentAccess().getDescAssignment_2(), \\\"rule__Intent__DescAssignment_2\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getIntentAccess().getDecompositionsAssignment_3(), \\\"rule__Intent__DecompositionsAssignment_3\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getIntentTypeAccess().getTypeNameAssignment(), \\\"rule__IntentType__TypeNameAssignment\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getDecompositionAccess().getTypeAssignment_0(), \\\"rule__Decomposition__TypeAssignment_0\\\");\\n-\\t\\t\\t\\t\\tput(grammarAccess.getDecompositionAccess().getIdAssignment_1(), \\\"rule__Decomposition__IdAssignment_1\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getDecompositionAccess().getNameAssignment_1(), \\\"rule__Decomposition__NameAssignment_1\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getDecompositionAccess().getDescAssignment_2(), \\\"rule__Decomposition__DescAssignment_2\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getDecompositionAccess().getDocumentsAssignment_3_1(), \\\"rule__Decomposition__DocumentsAssignment_3_1\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getDecompositionAccess().getModelsAssignment_4_1(), \\\"rule__Decomposition__ModelsAssignment_4_1\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getDecompositionAccess().getItemsAssignment_5_1(), \\\"rule__Decomposition__ItemsAssignment_5_1\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment(), \\\"rule__DecompositionType__TypeNameAssignment\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getDocumentAccess().getEntriesAssignment_1(), \\\"rule__Document__EntriesAssignment_1\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment(), \\\"rule__DocItemType__TypeNameAssignment\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getDocItemAccess().getTypeAssignment_0(), \\\"rule__DocItem__TypeAssignment_0\\\");\\n-\\t\\t\\t\\t\\tput(grammarAccess.getDocItemAccess().getIdAssignment_1(), \\\"rule__DocItem__IdAssignment_1\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getDocItemAccess().getNameAssignment_1(), \\\"rule__DocItem__NameAssignment_1\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getDocItemAccess().getRefAssignment_2(), \\\"rule__DocItem__RefAssignment_2\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getModelTypeAccess().getTypeNameAssignment(), \\\"rule__ModelType__TypeNameAssignment\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getModelItemAccess().getTypeAssignment_0(), \\\"rule__ModelItem__TypeAssignment_0\\\");\\n-\\t\\t\\t\\t\\tput(grammarAccess.getModelItemAccess().getIdAssignment_1(), \\\"rule__ModelItem__IdAssignment_1\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getModelItemAccess().getNameAssignment_1(), \\\"rule__ModelItem__NameAssignment_1\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getModelItemAccess().getDescAssignment_2(), \\\"rule__ModelItem__DescAssignment_2\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getListItemTypeAccess().getTypeNameAssignment(), \\\"rule__ListItemType__TypeNameAssignment\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getListItemAccess().getTypeAssignment_0(), \\\"rule__ListItem__TypeAssignment_0\\\");\\n-\\t\\t\\t\\t\\tput(grammarAccess.getListItemAccess().getIdAssignment_1(), \\\"rule__ListItem__IdAssignment_1\\\");\\n+\\t\\t\\t\\t\\tput(grammarAccess.getListItemAccess().getNameAssignment_1(), \\\"rule__ListItem__NameAssignment_1\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getListItemAccess().getDescAssignment_2(), \\\"rule__ListItem__DescAssignment_2\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1(), \\\"rule__ListItem__DocReferencesAssignment_3_1\\\");\\n \\t\\t\\t\\t\\tput(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1(), \\\"rule__ListItem__ItemReferencesAssignment_4_1\\\");\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2FIntentSpecificationParser.java\",\n \"sha\": \"5c5686f85064519494d96b38b242142fa1059954\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 219,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecification.g\",\n \"changes\": 337,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecification.g?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 118,\n \"filename\": \"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g\",\n \"new_code\": \"{ before(grammarAccess.getIntentTypeAccess().getTypeNameAssignment()); }\\n(rule__IntentType__TypeNameAssignment)\\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameAssignment()); }\\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment()); }\\n(rule__DecompositionType__TypeNameAssignment)\\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment()); }\\n(rule__DocItemType__TypeNameAssignment)\\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment()); }\\n{ before(grammarAccess.getModelTypeAccess().getTypeNameAssignment()); }\\n(rule__ModelType__TypeNameAssignment)\\n{ after(grammarAccess.getModelTypeAccess().getTypeNameAssignment()); }\\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameAssignment()); }\\n(rule__ListItemType__TypeNameAssignment)\\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameAssignment()); }\\nrule__IntentType__TypeNameAlternatives_0\\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0()); }\\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0()); }\\n{ before(grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1()); }\\n{ after(grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1()); }\\n{ before(grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2()); }\\n{ after(grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2()); }\\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3()); }\\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3()); }\\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4()); }\\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4()); }\\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5()); }\\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5()); }\\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6()); }\\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6()); }\\nrule__DecompositionType__TypeNameAlternatives_0\\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0()); }\\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0()); }\\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1()); }\\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1()); }\\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2()); }\\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2()); }\\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3()); }\\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3()); }\\nrule__DocItemType__TypeNameAlternatives_0\\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6()); }\\nrule__ModelType__TypeNameAlternatives_0\\n{ before(grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0()); }\\n{ after(grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0()); }\\n{ before(grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1()); }\\n{ after(grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1()); }\\n{ before(grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2()); }\\n{ after(grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2()); }\\n{ before(grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3()); }\\n{ after(grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3()); }\\n{ before(grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4()); }\\n{ after(grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4()); }\\n{ before(grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5()); }\\n{ after(grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5()); }\\nrule__ListItemType__TypeNameAlternatives_0\\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0()); }\\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0()); }\\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1()); }\\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1()); }\\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2()); }\\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2()); }\\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3()); }\\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3()); }\\n{ before(grammarAccess.getSpecificationAccess().getNameAssignment_1()); }\\n(rule__Specification__NameAssignment_1)\\n{ after(grammarAccess.getSpecificationAccess().getNameAssignment_1()); }\\n{ before(grammarAccess.getRefinementAccess().getNameAssignment_1()); }\\n(rule__Refinement__NameAssignment_1)\\n{ after(grammarAccess.getRefinementAccess().getNameAssignment_1()); }\\n{ before(grammarAccess.getIntentAccess().getNameAssignment_1()); }\\n(rule__Intent__NameAssignment_1)\\n{ after(grammarAccess.getIntentAccess().getNameAssignment_1()); }\\n{ before(grammarAccess.getDecompositionAccess().getNameAssignment_1()); }\\n(rule__Decomposition__NameAssignment_1)\\n{ after(grammarAccess.getDecompositionAccess().getNameAssignment_1()); }\\n{ before(grammarAccess.getDocItemAccess().getNameAssignment_1()); }\\n(rule__DocItem__NameAssignment_1)\\n{ after(grammarAccess.getDocItemAccess().getNameAssignment_1()); }\\n{ before(grammarAccess.getModelItemAccess().getNameAssignment_1()); }\\n(rule__ModelItem__NameAssignment_1)\\n{ after(grammarAccess.getModelItemAccess().getNameAssignment_1()); }\\n{ before(grammarAccess.getListItemAccess().getNameAssignment_1()); }\\n(rule__ListItem__NameAssignment_1)\\n{ after(grammarAccess.getListItemAccess().getNameAssignment_1()); }\\n(\\n{ before(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\\n(rule__ListItem__DocReferencesAssignment_3_1)\\n{ after(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\\n)\\n(\\n)\\n(\\n{ before(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\\n(rule__ListItem__ItemReferencesAssignment_4_1)\\n{ after(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\\n)\\n(\\n)\\n(\\n{ before(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\\n(rule__ListItem__ModelReferencesAssignment_5_1)\\n{ after(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\\n)\\n(\\n)\\nrule__Specification__NameAssignment_1\\n{ before(grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); }\\nrule__Refinement__NameAssignment_1\\n{ before(grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); }\\nrule__Intent__NameAssignment_1\\n{ before(grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); }\\nrule__IntentType__TypeNameAssignment\\n @init {\\n\\t\\tint stackSize = keepStackSize();\\n }\\n:\\n(\\n{ before(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0()); }\\n(rule__IntentType__TypeNameAlternatives_0)\\n{ after(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0()); }\\n)\\n\\n;\\nfinally {\\n\\trestoreStackSize(stackSize);\\n}\\n\\nrule__Decomposition__NameAssignment_1\\n{ before(grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); }\\nrule__DecompositionType__TypeNameAssignment\\n @init {\\n\\t\\tint stackSize = keepStackSize();\\n }\\n:\\n(\\n{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0()); }\\n(rule__DecompositionType__TypeNameAlternatives_0)\\n{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0()); }\\n)\\n\\n;\\nfinally {\\n\\trestoreStackSize(stackSize);\\n}\\n\\nrule__DocItemType__TypeNameAssignment\\n @init {\\n\\t\\tint stackSize = keepStackSize();\\n }\\n:\\n(\\n{ before(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0()); }\\n(rule__DocItemType__TypeNameAlternatives_0)\\n{ after(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0()); }\\n)\\n\\n;\\nfinally {\\n\\trestoreStackSize(stackSize);\\n}\\n\\nrule__DocItem__NameAssignment_1\\n{ before(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); }\\nrule__ModelType__TypeNameAssignment\\n @init {\\n\\t\\tint stackSize = keepStackSize();\\n }\\n:\\n(\\n{ before(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0()); }\\n(rule__ModelType__TypeNameAlternatives_0)\\n{ after(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0()); }\\n)\\n\\n;\\nfinally {\\n\\trestoreStackSize(stackSize);\\n}\\n\\nrule__ModelItem__NameAssignment_1\\n{ before(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); }\\nrule__ListItemType__TypeNameAssignment\\n @init {\\n\\t\\tint stackSize = keepStackSize();\\n }\\n:\\n(\\n{ before(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0()); }\\n(rule__ListItemType__TypeNameAlternatives_0)\\n{ after(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0()); }\\n)\\n\\n;\\nfinally {\\n\\trestoreStackSize(stackSize);\\n}\\n\\nrule__ListItem__NameAssignment_1\\n{ before(grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); }\",\n \"new_methods\": [],\n \"old_code\": \"{ before(grammarAccess.getIntentTypeAccess().getAlternatives()); }\\n(rule__IntentType__Alternatives)\\n{ after(grammarAccess.getIntentTypeAccess().getAlternatives()); }\\n{ before(grammarAccess.getDecompositionTypeAccess().getAlternatives()); }\\n(rule__DecompositionType__Alternatives)\\n{ after(grammarAccess.getDecompositionTypeAccess().getAlternatives()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getAlternatives()); }\\n(rule__DocItemType__Alternatives)\\n{ after(grammarAccess.getDocItemTypeAccess().getAlternatives()); }\\n{ before(grammarAccess.getModelTypeAccess().getAlternatives()); }\\n(rule__ModelType__Alternatives)\\n{ after(grammarAccess.getModelTypeAccess().getAlternatives()); }\\n{ before(grammarAccess.getListItemTypeAccess().getAlternatives()); }\\n(rule__ListItemType__Alternatives)\\n{ after(grammarAccess.getListItemTypeAccess().getAlternatives()); }\\nrule__IntentType__Alternatives\\n{ before(grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); }\\n{ after(grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); }\\n{ before(grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); }\\n{ after(grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); }\\n{ before(grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); }\\n{ after(grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); }\\n{ before(grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); }\\n{ after(grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); }\\n{ before(grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); }\\n{ after(grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); }\\n{ before(grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); }\\n{ after(grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); }\\n{ before(grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); }\\n{ after(grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); }\\nrule__DecompositionType__Alternatives\\n{ before(grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); }\\n{ after(grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); }\\n{ before(grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); }\\n{ after(grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); }\\n{ before(grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); }\\n{ after(grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); }\\n{ before(grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); }\\n{ after(grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); }\\nrule__DocItemType__Alternatives\\n{ before(grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); }\\n{ before(grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); }\\n{ after(grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); }\\nrule__ModelType__Alternatives\\n{ before(grammarAccess.getModelTypeAccess().getOutputKeyword_0()); }\\n{ after(grammarAccess.getModelTypeAccess().getOutputKeyword_0()); }\\n{ before(grammarAccess.getModelTypeAccess().getModeKeyword_1()); }\\n{ after(grammarAccess.getModelTypeAccess().getModeKeyword_1()); }\\n{ before(grammarAccess.getModelTypeAccess().getStateKeyword_2()); }\\n{ after(grammarAccess.getModelTypeAccess().getStateKeyword_2()); }\\n{ before(grammarAccess.getModelTypeAccess().getMacroKeyword_3()); }\\n{ after(grammarAccess.getModelTypeAccess().getMacroKeyword_3()); }\\n{ before(grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); }\\n{ after(grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); }\\n{ before(grammarAccess.getModelTypeAccess().getInputKeyword_5()); }\\n{ after(grammarAccess.getModelTypeAccess().getInputKeyword_5()); }\\nrule__ListItemType__Alternatives\\n{ before(grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); }\\n{ after(grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); }\\n{ before(grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); }\\n{ after(grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); }\\n{ before(grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); }\\n{ after(grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); }\\n{ before(grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); }\\n{ after(grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); }\\n{ before(grammarAccess.getSpecificationAccess().getIdAssignment_1()); }\\n(rule__Specification__IdAssignment_1)\\n{ after(grammarAccess.getSpecificationAccess().getIdAssignment_1()); }\\n{ before(grammarAccess.getRefinementAccess().getIdAssignment_1()); }\\n(rule__Refinement__IdAssignment_1)\\n{ after(grammarAccess.getRefinementAccess().getIdAssignment_1()); }\\n{ before(grammarAccess.getIntentAccess().getIdAssignment_1()); }\\n(rule__Intent__IdAssignment_1)\\n{ after(grammarAccess.getIntentAccess().getIdAssignment_1()); }\\n{ before(grammarAccess.getDecompositionAccess().getIdAssignment_1()); }\\n(rule__Decomposition__IdAssignment_1)\\n{ after(grammarAccess.getDecompositionAccess().getIdAssignment_1()); }\\n{ before(grammarAccess.getDocItemAccess().getIdAssignment_1()); }\\n(rule__DocItem__IdAssignment_1)\\n{ after(grammarAccess.getDocItemAccess().getIdAssignment_1()); }\\n{ before(grammarAccess.getModelItemAccess().getIdAssignment_1()); }\\n(rule__ModelItem__IdAssignment_1)\\n{ after(grammarAccess.getModelItemAccess().getIdAssignment_1()); }\\n{ before(grammarAccess.getListItemAccess().getIdAssignment_1()); }\\n(rule__ListItem__IdAssignment_1)\\n{ after(grammarAccess.getListItemAccess().getIdAssignment_1()); }\\nrule__Specification__IdAssignment_1\\n{ before(grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); }\\nrule__Refinement__IdAssignment_1\\n{ before(grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); }\\nrule__Intent__IdAssignment_1\\n{ before(grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); }\\nrule__Decomposition__IdAssignment_1\\n{ before(grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); }\\nrule__DocItem__IdAssignment_1\\n{ before(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); }\\nrule__ModelItem__IdAssignment_1\\n{ before(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); }\\nrule__ListItem__IdAssignment_1\\n{ before(grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); }\\n\\tRULE_ID{ after(grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); }\",\n \"old_methods\": [],\n \"patch\": \"@@ -156,9 +156,9 @@ ruleIntentType\\n }\\n \\t:\\n (\\n-{ before(grammarAccess.getIntentTypeAccess().getAlternatives()); }\\n-(rule__IntentType__Alternatives)\\n-{ after(grammarAccess.getIntentTypeAccess().getAlternatives()); }\\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameAssignment()); }\\n+(rule__IntentType__TypeNameAssignment)\\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameAssignment()); }\\n )\\n \\n ;\\n@@ -212,9 +212,9 @@ ruleDecompositionType\\n }\\n \\t:\\n (\\n-{ before(grammarAccess.getDecompositionTypeAccess().getAlternatives()); }\\n-(rule__DecompositionType__Alternatives)\\n-{ after(grammarAccess.getDecompositionTypeAccess().getAlternatives()); }\\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment()); }\\n+(rule__DecompositionType__TypeNameAssignment)\\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameAssignment()); }\\n )\\n \\n ;\\n@@ -268,9 +268,9 @@ ruleDocItemType\\n }\\n \\t:\\n (\\n-{ before(grammarAccess.getDocItemTypeAccess().getAlternatives()); }\\n-(rule__DocItemType__Alternatives)\\n-{ after(grammarAccess.getDocItemTypeAccess().getAlternatives()); }\\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment()); }\\n+(rule__DocItemType__TypeNameAssignment)\\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameAssignment()); }\\n )\\n \\n ;\\n@@ -324,9 +324,9 @@ ruleModelType\\n }\\n \\t:\\n (\\n-{ before(grammarAccess.getModelTypeAccess().getAlternatives()); }\\n-(rule__ModelType__Alternatives)\\n-{ after(grammarAccess.getModelTypeAccess().getAlternatives()); }\\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameAssignment()); }\\n+(rule__ModelType__TypeNameAssignment)\\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameAssignment()); }\\n )\\n \\n ;\\n@@ -380,9 +380,9 @@ ruleListItemType\\n }\\n \\t:\\n (\\n-{ before(grammarAccess.getListItemTypeAccess().getAlternatives()); }\\n-(rule__ListItemType__Alternatives)\\n-{ after(grammarAccess.getListItemTypeAccess().getAlternatives()); }\\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameAssignment()); }\\n+(rule__ListItemType__TypeNameAssignment)\\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameAssignment()); }\\n )\\n \\n ;\\n@@ -421,273 +421,273 @@ finally {\\n \\n \\n \\n-rule__IntentType__Alternatives\\n+rule__IntentType__TypeNameAlternatives_0\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n }\\n :\\n (\\n-{ before(grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); }\\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0()); }\\n \\n \\t'basic' \\n \\n-{ after(grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); }\\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); }\\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1()); }\\n \\n \\t'purpose' \\n \\n-{ after(grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); }\\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); }\\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2()); }\\n \\n \\t'principles' \\n \\n-{ after(grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); }\\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); }\\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3()); }\\n \\n \\t'models' \\n \\n-{ after(grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); }\\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); }\\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4()); }\\n \\n \\t'design' \\n \\n-{ after(grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); }\\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); }\\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5()); }\\n \\n \\t'implementation' \\n \\n-{ after(grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); }\\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); }\\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6()); }\\n \\n \\t'operation' \\n \\n-{ after(grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); }\\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6()); }\\n )\\n \\n ;\\n finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n-rule__DecompositionType__Alternatives\\n+rule__DecompositionType__TypeNameAlternatives_0\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n }\\n :\\n (\\n-{ before(grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); }\\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0()); }\\n \\n \\t'environment' \\n \\n-{ after(grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); }\\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); }\\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1()); }\\n \\n \\t'operator' \\n \\n-{ after(grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); }\\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); }\\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2()); }\\n \\n \\t'system' \\n \\n-{ after(grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); }\\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); }\\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3()); }\\n \\n \\t'verification' \\n \\n-{ after(grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); }\\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3()); }\\n )\\n \\n ;\\n finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n-rule__DocItemType__Alternatives\\n+rule__DocItemType__TypeNameAlternatives_0\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n }\\n :\\n (\\n-{ before(grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); }\\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0()); }\\n \\n \\t'condition' \\n \\n-{ after(grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); }\\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); }\\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1()); }\\n \\n \\t'figure' \\n \\n-{ after(grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); }\\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); }\\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2()); }\\n \\n \\t'break' \\n \\n-{ after(grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); }\\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); }\\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3()); }\\n \\n \\t'model' \\n \\n-{ after(grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); }\\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); }\\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4()); }\\n \\n \\t'paragraph' \\n \\n-{ after(grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); }\\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); }\\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5()); }\\n \\n \\t'section' \\n \\n-{ after(grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); }\\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); }\\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6()); }\\n \\n \\t'table' \\n \\n-{ after(grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); }\\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6()); }\\n )\\n \\n ;\\n finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n-rule__ModelType__Alternatives\\n+rule__ModelType__TypeNameAlternatives_0\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n }\\n :\\n (\\n-{ before(grammarAccess.getModelTypeAccess().getOutputKeyword_0()); }\\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0()); }\\n \\n \\t'output' \\n \\n-{ after(grammarAccess.getModelTypeAccess().getOutputKeyword_0()); }\\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getModelTypeAccess().getModeKeyword_1()); }\\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1()); }\\n \\n \\t'mode' \\n \\n-{ after(grammarAccess.getModelTypeAccess().getModeKeyword_1()); }\\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getModelTypeAccess().getStateKeyword_2()); }\\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2()); }\\n \\n \\t'state' \\n \\n-{ after(grammarAccess.getModelTypeAccess().getStateKeyword_2()); }\\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getModelTypeAccess().getMacroKeyword_3()); }\\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3()); }\\n \\n \\t'macro' \\n \\n-{ after(grammarAccess.getModelTypeAccess().getMacroKeyword_3()); }\\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); }\\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4()); }\\n \\n \\t'function' \\n \\n-{ after(grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); }\\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getModelTypeAccess().getInputKeyword_5()); }\\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5()); }\\n \\n \\t'input' \\n \\n-{ after(grammarAccess.getModelTypeAccess().getInputKeyword_5()); }\\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5()); }\\n )\\n \\n ;\\n finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n-rule__ListItemType__Alternatives\\n+rule__ListItemType__TypeNameAlternatives_0\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n }\\n :\\n (\\n-{ before(grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); }\\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0()); }\\n \\n \\t'requirement' \\n \\n-{ after(grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); }\\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); }\\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1()); }\\n \\n \\t'goal' \\n \\n-{ after(grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); }\\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); }\\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2()); }\\n \\n \\t'hazard' \\n \\n-{ after(grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); }\\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2()); }\\n )\\n \\n |(\\n-{ before(grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); }\\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3()); }\\n \\n \\t'constraint' \\n \\n-{ after(grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); }\\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3()); }\\n )\\n \\n ;\\n@@ -746,9 +746,9 @@ rule__Specification__Group__1__Impl\\n }\\n :\\n (\\n-{ before(grammarAccess.getSpecificationAccess().getIdAssignment_1()); }\\n-(rule__Specification__IdAssignment_1)\\n-{ after(grammarAccess.getSpecificationAccess().getIdAssignment_1()); }\\n+{ before(grammarAccess.getSpecificationAccess().getNameAssignment_1()); }\\n+(rule__Specification__NameAssignment_1)\\n+{ after(grammarAccess.getSpecificationAccess().getNameAssignment_1()); }\\n )\\n \\n ;\\n@@ -847,9 +847,9 @@ rule__Refinement__Group__1__Impl\\n }\\n :\\n (\\n-{ before(grammarAccess.getRefinementAccess().getIdAssignment_1()); }\\n-(rule__Refinement__IdAssignment_1)\\n-{ after(grammarAccess.getRefinementAccess().getIdAssignment_1()); }\\n+{ before(grammarAccess.getRefinementAccess().getNameAssignment_1()); }\\n+(rule__Refinement__NameAssignment_1)\\n+{ after(grammarAccess.getRefinementAccess().getNameAssignment_1()); }\\n )\\n \\n ;\\n@@ -977,9 +977,9 @@ rule__Intent__Group__1__Impl\\n }\\n :\\n (\\n-{ before(grammarAccess.getIntentAccess().getIdAssignment_1()); }\\n-(rule__Intent__IdAssignment_1)\\n-{ after(grammarAccess.getIntentAccess().getIdAssignment_1()); }\\n+{ before(grammarAccess.getIntentAccess().getNameAssignment_1()); }\\n+(rule__Intent__NameAssignment_1)\\n+{ after(grammarAccess.getIntentAccess().getNameAssignment_1()); }\\n )\\n \\n ;\\n@@ -1107,9 +1107,9 @@ rule__Decomposition__Group__1__Impl\\n }\\n :\\n (\\n-{ before(grammarAccess.getDecompositionAccess().getIdAssignment_1()); }\\n-(rule__Decomposition__IdAssignment_1)\\n-{ after(grammarAccess.getDecompositionAccess().getIdAssignment_1()); }\\n+{ before(grammarAccess.getDecompositionAccess().getNameAssignment_1()); }\\n+(rule__Decomposition__NameAssignment_1)\\n+{ after(grammarAccess.getDecompositionAccess().getNameAssignment_1()); }\\n )\\n \\n ;\\n@@ -1683,9 +1683,9 @@ rule__DocItem__Group__1__Impl\\n }\\n :\\n (\\n-{ before(grammarAccess.getDocItemAccess().getIdAssignment_1()); }\\n-(rule__DocItem__IdAssignment_1)\\n-{ after(grammarAccess.getDocItemAccess().getIdAssignment_1()); }\\n+{ before(grammarAccess.getDocItemAccess().getNameAssignment_1()); }\\n+(rule__DocItem__NameAssignment_1)\\n+{ after(grammarAccess.getDocItemAccess().getNameAssignment_1()); }\\n )\\n \\n ;\\n@@ -1808,9 +1808,9 @@ rule__ModelItem__Group__1__Impl\\n }\\n :\\n (\\n-{ before(grammarAccess.getModelItemAccess().getIdAssignment_1()); }\\n-(rule__ModelItem__IdAssignment_1)\\n-{ after(grammarAccess.getModelItemAccess().getIdAssignment_1()); }\\n+{ before(grammarAccess.getModelItemAccess().getNameAssignment_1()); }\\n+(rule__ModelItem__NameAssignment_1)\\n+{ after(grammarAccess.getModelItemAccess().getNameAssignment_1()); }\\n )\\n \\n ;\\n@@ -1933,9 +1933,9 @@ rule__ListItem__Group__1__Impl\\n }\\n :\\n (\\n-{ before(grammarAccess.getListItemAccess().getIdAssignment_1()); }\\n-(rule__ListItem__IdAssignment_1)\\n-{ after(grammarAccess.getListItemAccess().getIdAssignment_1()); }\\n+{ before(grammarAccess.getListItemAccess().getNameAssignment_1()); }\\n+(rule__ListItem__NameAssignment_1)\\n+{ after(grammarAccess.getListItemAccess().getNameAssignment_1()); }\\n )\\n \\n ;\\n@@ -2153,10 +2153,17 @@ rule__ListItem__Group_3__1__Impl\\n }\\n :\\n (\\n+(\\n+{ before(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\\n+(rule__ListItem__DocReferencesAssignment_3_1)\\n+{ after(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\\n+)\\n+(\\n { before(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\\n (rule__ListItem__DocReferencesAssignment_3_1)*\\n { after(grammarAccess.getListItemAccess().getDocReferencesAssignment_3_1()); }\\n )\\n+)\\n \\n ;\\n finally {\\n@@ -2249,10 +2256,17 @@ rule__ListItem__Group_4__1__Impl\\n }\\n :\\n (\\n+(\\n+{ before(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\\n+(rule__ListItem__ItemReferencesAssignment_4_1)\\n+{ after(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\\n+)\\n+(\\n { before(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\\n (rule__ListItem__ItemReferencesAssignment_4_1)*\\n { after(grammarAccess.getListItemAccess().getItemReferencesAssignment_4_1()); }\\n )\\n+)\\n \\n ;\\n finally {\\n@@ -2345,10 +2359,17 @@ rule__ListItem__Group_5__1__Impl\\n }\\n :\\n (\\n+(\\n+{ before(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\\n+(rule__ListItem__ModelReferencesAssignment_5_1)\\n+{ after(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\\n+)\\n+(\\n { before(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\\n (rule__ListItem__ModelReferencesAssignment_5_1)*\\n { after(grammarAccess.getListItemAccess().getModelReferencesAssignment_5_1()); }\\n )\\n+)\\n \\n ;\\n finally {\\n@@ -2393,14 +2414,14 @@ finally {\\n \\n \\n \\n-rule__Specification__IdAssignment_1\\n+rule__Specification__NameAssignment_1\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n }\\n :\\n (\\n-{ before(grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); }\\n-\\tRULE_ID{ after(grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); }\\n+{ before(grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); }\\n+\\tRULE_ID{ after(grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); }\\n )\\n \\n ;\\n@@ -2423,14 +2444,14 @@ finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n-rule__Refinement__IdAssignment_1\\n+rule__Refinement__NameAssignment_1\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n }\\n :\\n (\\n-{ before(grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); }\\n-\\tRULE_ID{ after(grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); }\\n+{ before(grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); }\\n+\\tRULE_ID{ after(grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); }\\n )\\n \\n ;\\n@@ -2483,14 +2504,14 @@ finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n-rule__Intent__IdAssignment_1\\n+rule__Intent__NameAssignment_1\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n }\\n :\\n (\\n-{ before(grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); }\\n-\\tRULE_ID{ after(grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); }\\n+{ before(grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); }\\n+\\tRULE_ID{ after(grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); }\\n )\\n \\n ;\\n@@ -2528,6 +2549,22 @@ finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n+rule__IntentType__TypeNameAssignment\\n+ @init {\\n+\\t\\tint stackSize = keepStackSize();\\n+ }\\n+:\\n+(\\n+{ before(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0()); }\\n+(rule__IntentType__TypeNameAlternatives_0)\\n+{ after(grammarAccess.getIntentTypeAccess().getTypeNameAlternatives_0()); }\\n+)\\n+\\n+;\\n+finally {\\n+\\trestoreStackSize(stackSize);\\n+}\\n+\\n rule__Decomposition__TypeAssignment_0\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n@@ -2543,14 +2580,14 @@ finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n-rule__Decomposition__IdAssignment_1\\n+rule__Decomposition__NameAssignment_1\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n }\\n :\\n (\\n-{ before(grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); }\\n-\\tRULE_ID{ after(grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); }\\n+{ before(grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); }\\n+\\tRULE_ID{ after(grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); }\\n )\\n \\n ;\\n@@ -2618,6 +2655,22 @@ finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n+rule__DecompositionType__TypeNameAssignment\\n+ @init {\\n+\\t\\tint stackSize = keepStackSize();\\n+ }\\n+:\\n+(\\n+{ before(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0()); }\\n+(rule__DecompositionType__TypeNameAlternatives_0)\\n+{ after(grammarAccess.getDecompositionTypeAccess().getTypeNameAlternatives_0()); }\\n+)\\n+\\n+;\\n+finally {\\n+\\trestoreStackSize(stackSize);\\n+}\\n+\\n rule__Document__EntriesAssignment_1\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n@@ -2633,6 +2686,22 @@ finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n+rule__DocItemType__TypeNameAssignment\\n+ @init {\\n+\\t\\tint stackSize = keepStackSize();\\n+ }\\n+:\\n+(\\n+{ before(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0()); }\\n+(rule__DocItemType__TypeNameAlternatives_0)\\n+{ after(grammarAccess.getDocItemTypeAccess().getTypeNameAlternatives_0()); }\\n+)\\n+\\n+;\\n+finally {\\n+\\trestoreStackSize(stackSize);\\n+}\\n+\\n rule__DocItem__TypeAssignment_0\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n@@ -2648,14 +2717,14 @@ finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n-rule__DocItem__IdAssignment_1\\n+rule__DocItem__NameAssignment_1\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n }\\n :\\n (\\n-{ before(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); }\\n-\\tRULE_ID{ after(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); }\\n+{ before(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); }\\n+\\tRULE_ID{ after(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); }\\n )\\n \\n ;\\n@@ -2678,6 +2747,22 @@ finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n+rule__ModelType__TypeNameAssignment\\n+ @init {\\n+\\t\\tint stackSize = keepStackSize();\\n+ }\\n+:\\n+(\\n+{ before(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0()); }\\n+(rule__ModelType__TypeNameAlternatives_0)\\n+{ after(grammarAccess.getModelTypeAccess().getTypeNameAlternatives_0()); }\\n+)\\n+\\n+;\\n+finally {\\n+\\trestoreStackSize(stackSize);\\n+}\\n+\\n rule__ModelItem__TypeAssignment_0\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n@@ -2693,14 +2778,14 @@ finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n-rule__ModelItem__IdAssignment_1\\n+rule__ModelItem__NameAssignment_1\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n }\\n :\\n (\\n-{ before(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); }\\n-\\tRULE_ID{ after(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); }\\n+{ before(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); }\\n+\\tRULE_ID{ after(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); }\\n )\\n \\n ;\\n@@ -2723,6 +2808,22 @@ finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n+rule__ListItemType__TypeNameAssignment\\n+ @init {\\n+\\t\\tint stackSize = keepStackSize();\\n+ }\\n+:\\n+(\\n+{ before(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0()); }\\n+(rule__ListItemType__TypeNameAlternatives_0)\\n+{ after(grammarAccess.getListItemTypeAccess().getTypeNameAlternatives_0()); }\\n+)\\n+\\n+;\\n+finally {\\n+\\trestoreStackSize(stackSize);\\n+}\\n+\\n rule__ListItem__TypeAssignment_0\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n@@ -2738,14 +2839,14 @@ finally {\\n \\trestoreStackSize(stackSize);\\n }\\n \\n-rule__ListItem__IdAssignment_1\\n+rule__ListItem__NameAssignment_1\\n @init {\\n \\t\\tint stackSize = keepStackSize();\\n }\\n :\\n (\\n-{ before(grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); }\\n-\\tRULE_ID{ after(grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); }\\n+{ before(grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); }\\n+\\tRULE_ID{ after(grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); }\\n )\\n \\n ;\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecification.g\",\n \"sha\": \"2f0f83febe026383eed03a5f02b7967fd5fc4101\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 37,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java\",\n \"changes\": 74,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 37,\n \"filename\": \"net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecificationLexer.java\",\n \"new_code\": \" // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: ( '^' )?\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: '^'\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:10: ( ( '0' .. '9' )+ )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:12: ( '0' .. '9' )+\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:12: ( '0' .. '9' )+\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:13: '0' .. '9'\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:13: ( ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' ) )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:16: '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"'\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:20: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )*\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:21: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:66: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:86: '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\''\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:91: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )*\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:92: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:137: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:19: '/*' ( options {greedy=false; } : . )* '*/'\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:24: ( options {greedy=false; } : . )*\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:52: .\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:17: ( '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )? )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:19: '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:24: (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )*\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:24: ~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:40: ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: ( '\\\\\\\\r' )? '\\\\\\\\n'\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: ( '\\\\\\\\r' )?\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: '\\\\\\\\r'\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:9: ( ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+ )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2942:16: ( . )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2942:18: .\",\n \"new_methods\": [],\n \"old_code\": \" // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: ( '^' )?\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: '^'\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:10: ( ( '0' .. '9' )+ )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:12: ( '0' .. '9' )+\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:12: ( '0' .. '9' )+\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:13: '0' .. '9'\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:13: ( ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' ) )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:16: '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"'\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:20: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )*\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:21: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:66: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:86: '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\''\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:91: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )*\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:92: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:137: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:19: '/*' ( options {greedy=false; } : . )* '*/'\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:24: ( options {greedy=false; } : . )*\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:52: .\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:17: ( '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )? )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:19: '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:24: (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )*\\n \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:24: ~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:40: ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: ( '\\\\\\\\r' )? '\\\\\\\\n'\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: ( '\\\\\\\\r' )?\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: '\\\\\\\\r'\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:9: ( ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+ )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2841:16: ( . )\\n // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2841:18: .\",\n \"old_methods\": [],\n \"patch\": \"@@ -846,10 +846,10 @@ public final void mRULE_ID() throws RecognitionException {\\n try {\\n int _type = RULE_ID;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n {\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: ( '^' )?\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: ( '^' )?\\n int alt1=2;\\n int LA1_0 = input.LA(1);\\n \\n@@ -858,7 +858,7 @@ public final void mRULE_ID() throws RecognitionException {\\n }\\n switch (alt1) {\\n case 1 :\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:11: '^'\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:11: '^'\\n {\\n match('^'); \\n \\n@@ -876,7 +876,7 @@ public final void mRULE_ID() throws RecognitionException {\\n recover(mse);\\n throw mse;}\\n \\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2829:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2930:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n loop2:\\n do {\\n int alt2=2;\\n@@ -925,10 +925,10 @@ public final void mRULE_INT() throws RecognitionException {\\n try {\\n int _type = RULE_INT;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:10: ( ( '0' .. '9' )+ )\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:12: ( '0' .. '9' )+\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:10: ( ( '0' .. '9' )+ )\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:12: ( '0' .. '9' )+\\n {\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:12: ( '0' .. '9' )+\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:12: ( '0' .. '9' )+\\n int cnt3=0;\\n loop3:\\n do {\\n@@ -942,7 +942,7 @@ public final void mRULE_INT() throws RecognitionException {\\n \\n switch (alt3) {\\n \\tcase 1 :\\n- \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2831:13: '0' .. '9'\\n+ \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2932:13: '0' .. '9'\\n \\t {\\n \\t matchRange('0','9'); \\n \\n@@ -974,10 +974,10 @@ public final void mRULE_STRING() throws RecognitionException {\\n try {\\n int _type = RULE_STRING;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:13: ( ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' ) )\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:13: ( ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' ) )\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n {\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n int alt6=2;\\n int LA6_0 = input.LA(1);\\n \\n@@ -995,10 +995,10 @@ else if ( (LA6_0=='\\\\'') ) {\\n }\\n switch (alt6) {\\n case 1 :\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:16: '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"'\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:16: '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"'\\n {\\n match('\\\\\\\"'); \\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:20: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )*\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:20: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )*\\n loop4:\\n do {\\n int alt4=3;\\n@@ -1014,7 +1014,7 @@ else if ( ((LA4_0>='\\\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\\n \\n switch (alt4) {\\n \\tcase 1 :\\n- \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:21: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n+ \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:21: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n \\t {\\n \\t match('\\\\\\\\'); \\n \\t if ( input.LA(1)=='\\\\\\\"'||input.LA(1)=='\\\\''||input.LA(1)=='\\\\\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\\n@@ -1030,7 +1030,7 @@ else if ( ((LA4_0>='\\\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\\n \\t }\\n \\t break;\\n \\tcase 2 :\\n- \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:66: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) )\\n+ \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:66: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) )\\n \\t {\\n \\t if ( (input.LA(1)>='\\\\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\\\uFFFF') ) {\\n \\t input.consume();\\n@@ -1055,10 +1055,10 @@ else if ( ((LA4_0>='\\\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\\n }\\n break;\\n case 2 :\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:86: '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\''\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:86: '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\''\\n {\\n match('\\\\''); \\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:91: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )*\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:91: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )*\\n loop5:\\n do {\\n int alt5=3;\\n@@ -1074,7 +1074,7 @@ else if ( ((LA5_0>='\\\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\\n \\n switch (alt5) {\\n \\tcase 1 :\\n- \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:92: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n+ \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:92: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n \\t {\\n \\t match('\\\\\\\\'); \\n \\t if ( input.LA(1)=='\\\\\\\"'||input.LA(1)=='\\\\''||input.LA(1)=='\\\\\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\\n@@ -1090,7 +1090,7 @@ else if ( ((LA5_0>='\\\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\\n \\t }\\n \\t break;\\n \\tcase 2 :\\n- \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2833:137: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) )\\n+ \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2934:137: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) )\\n \\t {\\n \\t if ( (input.LA(1)>='\\\\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\\\uFFFF') ) {\\n \\t input.consume();\\n@@ -1133,12 +1133,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {\\n try {\\n int _type = RULE_ML_COMMENT;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:19: '/*' ( options {greedy=false; } : . )* '*/'\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:19: '/*' ( options {greedy=false; } : . )* '*/'\\n {\\n match(\\\"/*\\\"); \\n \\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:24: ( options {greedy=false; } : . )*\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:24: ( options {greedy=false; } : . )*\\n loop7:\\n do {\\n int alt7=2;\\n@@ -1163,7 +1163,7 @@ else if ( ((LA7_0>='\\\\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\\\\uFFFF')) ) {\\n \\n switch (alt7) {\\n \\tcase 1 :\\n- \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2835:52: .\\n+ \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2936:52: .\\n \\t {\\n \\t matchAny(); \\n \\n@@ -1193,12 +1193,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\\n try {\\n int _type = RULE_SL_COMMENT;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:17: ( '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )? )\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:19: '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:17: ( '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )? )\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:19: '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n {\\n match(\\\"//\\\"); \\n \\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:24: (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )*\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:24: (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )*\\n loop8:\\n do {\\n int alt8=2;\\n@@ -1211,7 +1211,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\\n \\n switch (alt8) {\\n \\tcase 1 :\\n- \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:24: ~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) )\\n+ \\t // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:24: ~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) )\\n \\t {\\n \\t if ( (input.LA(1)>='\\\\u0000' && input.LA(1)<='\\\\t')||(input.LA(1)>='\\\\u000B' && input.LA(1)<='\\\\f')||(input.LA(1)>='\\\\u000E' && input.LA(1)<='\\\\uFFFF') ) {\\n \\t input.consume();\\n@@ -1231,7 +1231,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\\n }\\n } while (true);\\n \\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:40: ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:40: ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n int alt10=2;\\n int LA10_0 = input.LA(1);\\n \\n@@ -1240,9 +1240,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\\n }\\n switch (alt10) {\\n case 1 :\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: ( '\\\\\\\\r' )? '\\\\\\\\n'\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: ( '\\\\\\\\r' )? '\\\\\\\\n'\\n {\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: ( '\\\\\\\\r' )?\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: ( '\\\\\\\\r' )?\\n int alt9=2;\\n int LA9_0 = input.LA(1);\\n \\n@@ -1251,7 +1251,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\\n }\\n switch (alt9) {\\n case 1 :\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2837:41: '\\\\\\\\r'\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2938:41: '\\\\\\\\r'\\n {\\n match('\\\\r'); \\n \\n@@ -1283,10 +1283,10 @@ public final void mRULE_WS() throws RecognitionException {\\n try {\\n int _type = RULE_WS;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:9: ( ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+ )\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:9: ( ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+ )\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n {\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2839:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2940:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n int cnt11=0;\\n loop11:\\n do {\\n@@ -1340,8 +1340,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\\n try {\\n int _type = RULE_ANY_OTHER;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2841:16: ( . )\\n- // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2841:18: .\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2942:16: ( . )\\n+ // ../net.certware.intent.ui/src-gen/net/certware/intent/ui/contentassist/antlr/internal/InternalIntentSpecification.g:2942:18: .\\n {\\n matchAny(); \\n \",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fcontentassist%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java\",\n \"sha\": \"1ea410586be287ba859369930d85590f6df88798\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 169,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.xtend\",\n \"changes\": 181,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.xtend?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 12,\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"new_code\": \"* NOT generated by Xtext\\nimport net.certware.intent.intentSpecification.Decomposition\\nimport net.certware.intent.intentSpecification.DocItem\\nimport net.certware.intent.intentSpecification.Document\\nimport net.certware.intent.intentSpecification.Intent\\nimport net.certware.intent.intentSpecification.ListItem\\nimport net.certware.intent.intentSpecification.ModelItem\\nimport net.certware.intent.intentSpecification.Refinement\\nimport net.certware.intent.intentSpecification.Specification\\nimport org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider\\nimport org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider\\nclass IntentSpecificationLabelProvider extends DefaultEObjectLabelProvider {\\n\\tnew(AdapterFactoryLabelProvider delegate) {\\n\\tdef image(Refinement e) {\\n\\t\\t'obj16/refinement.gif'\\n\\t}\\n\\t\\n\\tdef image(Intent e) {\\n\\t\\t'obj16/intent.gif'\\n\\t}\\n\\t\\n\\tdef image(Specification e) {\\n\\t\\t'obj16/specification.gif'\\n\\t}\\n\\t\\n\\tdef image(Decomposition e) {\\n\\t\\t'obj16/decomposition.gif'\\n\\t}\\n\\t\\n\\tdef image(Document e) {\\n\\t\\t'obj16/document.gif'\\n\\t}\\n\\t\\n\\tdef image(ModelItem e) {\\n\\t\\t'obj16/modelitem.gif'\\n\\t}\\n\\t\\n\\tdef image(ListItem e) {\\n\\t\\t'obj16/listitem.gif'\\n\\t}\\n\\t\\n\\t/*\\n\\t * text responses\\n\\t */\\n\\tdef text(Intent e) {\\n\\t\\tvar type = e.type\\n\\t\\tvar typeName = type.typeName\\n\\t\\t// \\ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\\n\\t\\tif ('basic'.equals(typeName)) {\\n\\t\\t\\treturn 'Basic' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('purpose'.equals(typeName)) {\\n\\t\\t\\treturn 'Purpose' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('principles'.equals(typeName)) {\\n\\t\\t\\treturn 'Principles' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('models'.equals(typeName)) {\\n\\t\\t\\treturn 'Models' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('design'.equals(typeName)) {\\n\\t\\t\\treturn 'Design' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('implementation'.equals(typeName)) {\\n\\t\\t\\treturn 'Implementation' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('operation'.equals(typeName)) {\\n\\t\\t\\treturn 'Operation' + ' ' + e.name\\n\\t\\t}\\n\\t\\t'Intent' + ' ' + e.name\\n\\t}\\n\\t\\n\\tdef text(Refinement e) {\\n\\t\\t'Refinement' + ' ' + e.name\\n\\t}\\n\\t\\n\\tdef text(Decomposition e) {\\n\\t\\tvar type = e.type\\n\\t\\tvar typeName = type.typeName\\n\\t\\tif ( 'environment'.equals(typeName)) {\\n\\t\\t\\treturn 'Environment' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('operator'.equals(typeName)) {\\n\\t\\t\\treturn 'Operator' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('system'.equals(typeName)) {\\n\\t\\t\\treturn 'System' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('verification'.equals(typeName)) {\\n\\t\\t\\treturn 'V&V' + ' ' + e.name\\n\\t\\t}\\n\\t\\t'Decomposition' + ' ' + e.name\\n\\t}\\n\\n\\tdef text(Document e) {\\n\\t\\t'Document' // has no name or ID\\n\\t}\\n\\t\\n\\tdef text(DocItem e) {\\n\\t\\tvar type = e.type\\n\\t\\tvar typeName = type.typeName\\n\\t\\tif ('condition'.equals(typeName)) {\\n\\t\\t\\treturn 'Condition' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('figure'.equals(typeName)) {\\n\\t\\t\\treturn 'Figure' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('break'.equals(typeName)) {\\n\\t\\t\\treturn 'Break'\\n\\t\\t}\\n\\t\\tif ('model'.equals(typeName)) {\\n\\t\\t\\treturn 'Model' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('paragraph'.equals(typeName)) {\\n\\t\\t\\treturn 'Paragraph' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('section'.equals(typeName)) {\\n\\t\\t\\treturn 'Section' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('table'.equals(typeName)) {\\n\\t\\t\\treturn 'Table' + ' ' + e.name\\n\\t\\t}\\n\\n\\t\\t'Item' + ' ' + e.name\\t\\t\\n\\t}\\n\\t\\n\\t\\n\\tdef text(ModelItem e) {\\n\\t\\tvar type = e.type\\n\\t\\tvar typeName = type.typeName\\n\\t\\t\\n\\t\\tif ('output'.equals(typeName)){\\n\\t\\t\\treturn 'Output' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('mode'.equals(typeName)){\\n\\t\\t\\treturn 'Mode' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('state'.equals(typeName)) {\\n\\t\\t\\treturn 'State' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('macro'.equals(typeName)) {\\n\\t\\t\\treturn 'Macro' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('function'.equals(typeName)) {\\n\\t\\t\\treturn 'Function' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('input'.equals(typeName)) {\\n\\t\\t\\treturn 'Input' + ' ' + e.name\\n\\t\\t}\\n\\t\\t'Model' + ' ' + e.name\\n\\t}\\n\\t\\n\\tdef text(ListItem e) {\\n\\t\\tvar type = e.type\\n\\t\\t\\n\\t\\tif ('hazard'.equals(type.typeName)) {\\n\\t\\t\\treturn 'Hazard' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('requirement'.equals(type.typeName)) {\\n\\t\\t\\treturn 'Requirement' + ' ' + e.name\\n\\t\\t}\\n\\t\\tif ('goal'.equals(type.typeName)) {\\n\\t\\t\\treturn 'Goal' + ' ' + e.name\\n\\t\\t} \\n\\t\\tif ('constraint'.equals(type.typeName)) {\\n\\t\\t\\treturn 'Constraint' + ' ' + e.name\\t\\t\\t\\n\\t\\t}\\n\\t\\t'List' + ' ' + e.name\\n\\t}\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"Refinement e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"'obj16/refinement.gif'\",\n \"signature\": \"def image(Refinement e)\"\n },\n {\n \"arguments\": [\n \"Intent e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"'obj16/intent.gif'\",\n \"signature\": \"def image(Intent e)\"\n },\n {\n \"arguments\": [\n \"Specification e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"'obj16/specification.gif'\",\n \"signature\": \"def image(Specification e)\"\n },\n {\n \"arguments\": [\n \"Decomposition e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"'obj16/decomposition.gif'\",\n \"signature\": \"def image(Decomposition e)\"\n },\n {\n \"arguments\": [\n \"Document e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"'obj16/document.gif'\",\n \"signature\": \"def image(Document e)\"\n },\n {\n \"arguments\": [\n \"ModelItem e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"'obj16/modelitem.gif'\",\n \"signature\": \"def image(ModelItem e)\"\n },\n {\n \"arguments\": [\n \"ListItem e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"'obj16/listitem.gif'\",\n \"signature\": \"def image(ListItem e)\"\n },\n {\n \"arguments\": [\n \"Intent e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"var type = e.type\\n\\t\\tvar typeName = type.typeName\\n\\t\\t// \\ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\\n\\t\\tif ('basic'.equals(typeName)) {\\n\\t\\t\\treturn 'Basic' + ' ' + e.name\",\n \"signature\": \"def text(Intent e)\"\n },\n {\n \"arguments\": [\n \"Refinement e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"'Refinement' + ' ' + e.name\",\n \"signature\": \"def text(Refinement e)\"\n },\n {\n \"arguments\": [\n \"Decomposition e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"var type = e.type\\n\\t\\tvar typeName = type.typeName\\n\\t\\tif ( 'environment'.equals(typeName)) {\\n\\t\\t\\treturn 'Environment' + ' ' + e.name\",\n \"signature\": \"def text(Decomposition e)\"\n },\n {\n \"arguments\": [\n \"Document e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"'Document' // has no name or ID\",\n \"signature\": \"def text(Document e)\"\n },\n {\n \"arguments\": [\n \"DocItem e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"var type = e.type\\n\\t\\tvar typeName = type.typeName\\n\\t\\tif ('condition'.equals(typeName)) {\\n\\t\\t\\treturn 'Condition' + ' ' + e.name\",\n \"signature\": \"def text(DocItem e)\"\n },\n {\n \"arguments\": [\n \"ModelItem e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"var type = e.type\\n\\t\\tvar typeName = type.typeName\\n\\t\\t\\n\\t\\tif ('output'.equals(typeName)){\\n\\t\\t\\treturn 'Output' + ' ' + e.name\",\n \"signature\": \"def text(ModelItem e)\"\n },\n {\n \"arguments\": [\n \"ListItem e\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"var type = e.type\\n\\t\\t\\n\\t\\tif ('hazard'.equals(type.typeName)) {\\n\\t\\t\\treturn 'Hazard' + ' ' + e.name\",\n \"signature\": \"def text(ListItem e)\"\n }\n ],\n \"old_code\": \"* generated by Xtext\\nclass IntentSpecificationLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider {\\n\\tnew(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) {\\n\\t// Labels and icons can be computed like this:\\n\\t\\n//\\tdef text(Greeting ele) {\\n//\\t\\t'A greeting to ' + ele.name\\n//\\t}\\n//\\n//\\tdef image(Greeting ele) {\\n//\\t\\t'Greeting.gif'\\n//\\t}\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"Greeting ele\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"//\\t\\t'A greeting to ' + ele.name\\n//\",\n \"signature\": \"def text(Greeting ele)\"\n },\n {\n \"arguments\": [\n \"Greeting ele\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.xtend\",\n \"implementation\": \"//\\t\\t'Greeting.gif'\\n//\",\n \"signature\": \"def image(Greeting ele)\"\n }\n ],\n \"patch\": \"@@ -1,29 +1,186 @@\\n /*\\n-* generated by Xtext\\n+* NOT generated by Xtext\\n */\\n package net.certware.intent.ui.labeling\\n \\n import com.google.inject.Inject\\n+import net.certware.intent.intentSpecification.Decomposition\\n+import net.certware.intent.intentSpecification.DocItem\\n+import net.certware.intent.intentSpecification.Document\\n+import net.certware.intent.intentSpecification.Intent\\n+import net.certware.intent.intentSpecification.ListItem\\n+import net.certware.intent.intentSpecification.ModelItem\\n+import net.certware.intent.intentSpecification.Refinement\\n+import net.certware.intent.intentSpecification.Specification\\n+import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider\\n+import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider\\n \\n /**\\n * Provides labels for a EObjects.\\n * \\n * see http://www.eclipse.org/Xtext/documentation.html#labelProvider\\n */\\n-class IntentSpecificationLabelProvider extends org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider {\\n+class IntentSpecificationLabelProvider extends DefaultEObjectLabelProvider {\\n \\n \\t@Inject\\n-\\tnew(org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider delegate) {\\n+\\tnew(AdapterFactoryLabelProvider delegate) {\\n \\t\\tsuper(delegate);\\n \\t}\\n \\n-\\t// Labels and icons can be computed like this:\\n-\\t\\n-//\\tdef text(Greeting ele) {\\n-//\\t\\t'A greeting to ' + ele.name\\n-//\\t}\\n-//\\n-//\\tdef image(Greeting ele) {\\n-//\\t\\t'Greeting.gif'\\n-//\\t}\\n+\\tdef image(Refinement e) {\\n+\\t\\t'obj16/refinement.gif'\\n+\\t}\\n+\\t\\n+\\tdef image(Intent e) {\\n+\\t\\t'obj16/intent.gif'\\n+\\t}\\n+\\t\\n+\\tdef image(Specification e) {\\n+\\t\\t'obj16/specification.gif'\\n+\\t}\\n+\\t\\n+\\tdef image(Decomposition e) {\\n+\\t\\t'obj16/decomposition.gif'\\n+\\t}\\n+\\t\\n+\\tdef image(Document e) {\\n+\\t\\t'obj16/document.gif'\\n+\\t}\\n+\\t\\n+\\tdef image(ModelItem e) {\\n+\\t\\t'obj16/modelitem.gif'\\n+\\t}\\n+\\t\\n+\\tdef image(ListItem e) {\\n+\\t\\t'obj16/listitem.gif'\\n+\\t}\\n+\\t\\n+\\t/*\\n+\\t * text responses\\n+\\t */\\n+\\tdef text(Intent e) {\\n+\\t\\tvar type = e.type\\n+\\t\\tvar typeName = type.typeName\\n+\\t\\t// \\ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\\n+\\t\\tif ('basic'.equals(typeName)) {\\n+\\t\\t\\treturn 'Basic' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('purpose'.equals(typeName)) {\\n+\\t\\t\\treturn 'Purpose' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('principles'.equals(typeName)) {\\n+\\t\\t\\treturn 'Principles' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('models'.equals(typeName)) {\\n+\\t\\t\\treturn 'Models' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('design'.equals(typeName)) {\\n+\\t\\t\\treturn 'Design' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('implementation'.equals(typeName)) {\\n+\\t\\t\\treturn 'Implementation' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('operation'.equals(typeName)) {\\n+\\t\\t\\treturn 'Operation' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\t'Intent' + ' ' + e.name\\n+\\t}\\n+\\t\\n+\\tdef text(Refinement e) {\\n+\\t\\t'Refinement' + ' ' + e.name\\n+\\t}\\n+\\t\\n+\\tdef text(Decomposition e) {\\n+\\t\\tvar type = e.type\\n+\\t\\tvar typeName = type.typeName\\n+\\t\\tif ( 'environment'.equals(typeName)) {\\n+\\t\\t\\treturn 'Environment' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('operator'.equals(typeName)) {\\n+\\t\\t\\treturn 'Operator' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('system'.equals(typeName)) {\\n+\\t\\t\\treturn 'System' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('verification'.equals(typeName)) {\\n+\\t\\t\\treturn 'V&V' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\t'Decomposition' + ' ' + e.name\\n+\\t}\\n+\\n+\\tdef text(Document e) {\\n+\\t\\t'Document' // has no name or ID\\n+\\t}\\n+\\t\\n+\\tdef text(DocItem e) {\\n+\\t\\tvar type = e.type\\n+\\t\\tvar typeName = type.typeName\\n+\\t\\tif ('condition'.equals(typeName)) {\\n+\\t\\t\\treturn 'Condition' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('figure'.equals(typeName)) {\\n+\\t\\t\\treturn 'Figure' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('break'.equals(typeName)) {\\n+\\t\\t\\treturn 'Break'\\n+\\t\\t}\\n+\\t\\tif ('model'.equals(typeName)) {\\n+\\t\\t\\treturn 'Model' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('paragraph'.equals(typeName)) {\\n+\\t\\t\\treturn 'Paragraph' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('section'.equals(typeName)) {\\n+\\t\\t\\treturn 'Section' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('table'.equals(typeName)) {\\n+\\t\\t\\treturn 'Table' + ' ' + e.name\\n+\\t\\t}\\n+\\n+\\t\\t'Item' + ' ' + e.name\\t\\t\\n+\\t}\\n+\\t\\n+\\t\\n+\\tdef text(ModelItem e) {\\n+\\t\\tvar type = e.type\\n+\\t\\tvar typeName = type.typeName\\n+\\t\\t\\n+\\t\\tif ('output'.equals(typeName)){\\n+\\t\\t\\treturn 'Output' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('mode'.equals(typeName)){\\n+\\t\\t\\treturn 'Mode' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('state'.equals(typeName)) {\\n+\\t\\t\\treturn 'State' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('macro'.equals(typeName)) {\\n+\\t\\t\\treturn 'Macro' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('function'.equals(typeName)) {\\n+\\t\\t\\treturn 'Function' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('input'.equals(typeName)) {\\n+\\t\\t\\treturn 'Input' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\t'Model' + ' ' + e.name\\n+\\t}\\n+\\t\\n+\\tdef text(ListItem e) {\\n+\\t\\tvar type = e.type\\n+\\t\\t\\n+\\t\\tif ('hazard'.equals(type.typeName)) {\\n+\\t\\t\\treturn 'Hazard' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('requirement'.equals(type.typeName)) {\\n+\\t\\t\\treturn 'Requirement' + ' ' + e.name\\n+\\t\\t}\\n+\\t\\tif ('goal'.equals(type.typeName)) {\\n+\\t\\t\\treturn 'Goal' + ' ' + e.name\\n+\\t\\t} \\n+\\t\\tif ('constraint'.equals(type.typeName)) {\\n+\\t\\t\\treturn 'Constraint' + ' ' + e.name\\t\\t\\t\\n+\\t\\t}\\n+\\t\\t'List' + ' ' + e.name\\n+\\t}\\n }\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.xtend\",\n \"sha\": \"db5092061520be3b76f11f66af4d236ba42900e9\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 131,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.xtend\",\n \"changes\": 139,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.xtend?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 8,\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend\",\n \"new_code\": \" * NOT generated by Xtext\\n */\\nimport net.certware.intent.intentSpecification.Decomposition\\nimport net.certware.intent.intentSpecification.Intent\\nimport net.certware.intent.intentSpecification.ListItem\\nimport net.certware.intent.intentSpecification.ModelItem\\nimport net.certware.intent.intentSpecification.Refinement\\nimport net.certware.intent.validation.IntentSpecificationValidator\\nimport org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider\\nimport org.eclipse.xtext.ui.editor.quickfix.Fix\\nimport org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor\\nimport org.eclipse.xtext.validation.Issue\\n * @see http://www.eclipse.org/Xtext/documentation.html#quickfixes\\n * @author mrb@certware.net\\nclass IntentSpecificationQuickfixProvider extends DefaultQuickfixProvider {\\n\\t\\n\\t/*\\n\\t * Fix duplicated intent entries by removing one.\\n\\t */\\n\\t@Fix(IntentSpecificationValidator::UNIQUE_INTENTS_REFINEMENT)\\n\\tdef removeIntent(Issue issue, IssueResolutionAcceptor acceptor) {\\n\\t\\tacceptor.accept(issue,\\n\\t\\t\\t\\\"Remove duplicated entry\\\", // label\\n\\t\\t\\t\\\"Remove intent named\\\" + ' ' + issue.data.get(0), // description\\n\\t\\t\\t\\\"obj16/intent.gif\\\", // icon\\n\\t\\t\\t[\\n\\t\\t\\t\\telement, context |\\n\\t\\t\\t\\tvar container = element as Refinement\\n\\t\\t\\t\\tvar itemName = issue.data.get(0) as String\\n\\t\\t\\t\\tvar list = container.intents\\n\\t\\t\\t\\tvar iter = list.iterator\\n\\t\\t\\t\\tvar lastItem = null as Intent\\n\\t\\t\\t\\twhile(iter.hasNext) {\\n\\t\\t\\t\\t\\tvar item = iter.next()\\n\\t\\t\\t\\t\\tif ( item.name.equals(itemName)) {\\n\\t\\t\\t\\t\\t\\tlastItem = item\\n\\t\\t\\t\\t\\t}\\n\\t\\t\\t\\t}\\n\\t\\t\\t\\t\\n\\t\\t\\t\\tif (lastItem != null ) {\\n\\t\\t\\t\\t\\tlist.remove(lastItem)\\n\\t\\t\\t\\t}\\n\\t\\t\\t]\\n\\t\\t);\\n\\t}\\n\\n\\t/*\\n\\t * Fix duplicated intent entries by removing one.\\n\\t */\\n\\t@Fix(IntentSpecificationValidator::UNIQUE_DECOMPOSITION_INTENT)\\n\\tdef removeDecomposition(Issue issue, IssueResolutionAcceptor acceptor) {\\n\\t\\tacceptor.accept(issue,\\n\\t\\t\\t\\\"Remove duplicated decomposition\\\", // label\\n\\t\\t\\t\\\"Remove decomposition named\\\" + ' ' + issue.data.get(0), // description\\n\\t\\t\\t\\\"obj16/decomposition.gif\\\", // icon\\n\\t\\t\\t[\\n\\t\\t\\t\\telement, context |\\n\\t\\t\\t\\tvar container = element as Intent\\n\\t\\t\\t\\tvar itemName = issue.data.get(0) as String\\n\\t\\t\\t\\tvar list = container.decompositions\\n\\t\\t\\t\\tvar iter = list.iterator\\n\\t\\t\\t\\tvar lastItem = null as Decomposition\\n\\t\\t\\t\\twhile(iter.hasNext) {\\n\\t\\t\\t\\t\\tvar item = iter.next() as Decomposition\\n\\t\\t\\t\\t\\tif ( item.name.equals(itemName)) {\\n\\t\\t\\t\\t\\t\\tlastItem = item\\n\\t\\t\\t\\t\\t}\\n\\t\\t\\t\\t}\\n\\t\\t\\t\\t\\n\\t\\t\\t\\tif (lastItem != null ) {\\n\\t\\t\\t\\t\\tlist.remove(lastItem)\\n\\t\\t\\t\\t}\\n\\t\\t\\t]\\n\\t\\t);\\n\\t}\\n\\t/*\\n\\t * Fix duplicated list entries by removing one.\\n\\t */\\n\\t@Fix(IntentSpecificationValidator::UNIQUE_LIST_ITEM_LIST_ITEM)\\n\\tdef removeListItem(Issue issue, IssueResolutionAcceptor acceptor) {\\n\\t\\tacceptor.accept(issue,\\n\\t\\t\\t\\\"Remove duplicated list item\\\", // label\\n\\t\\t\\t\\\"Remove list item named\\\" + ' ' + issue.data.get(0), // description\\n\\t\\t\\t\\\"obj16/listitem.gif\\\", // icon\\n\\t\\t\\t[\\n\\t\\t\\t\\telement, context |\\n\\t\\t\\t\\tvar outerList = element as ListItem\\n\\t\\t\\t\\tvar itemName = issue.data.get(0) as String\\n\\t\\t\\t\\tvar list = outerList.itemReferences\\n\\t\\t\\t\\tvar iter = list.iterator\\n\\t\\t\\t\\tvar lastItem = null as ListItem\\n\\t\\t\\t\\twhile(iter.hasNext) {\\n\\t\\t\\t\\t\\tvar item = iter.next()\\n\\t\\t\\t\\t\\tif ( item.name.equals(itemName)) {\\n\\t\\t\\t\\t\\t\\tlastItem = item\\n\\t\\t\\t\\t\\t}\\n\\t\\t\\t\\t}\\n\\t\\t\\t\\t\\n\\t\\t\\t\\tif (lastItem != null ) {\\n\\t\\t\\t\\t\\tlist.remove(lastItem)\\n\\t\\t\\t\\t}\\n\\t\\t\\t]\\n\\t\\t);\\n\\t}\\n\\t\\n\\t@Fix(IntentSpecificationValidator::UNIQUE_MODEL_ITEM_LIST_ITEM)\\n\\tdef removeModelItem(Issue issue, IssueResolutionAcceptor acceptor) {\\n\\t\\tacceptor.accept(issue,\\n\\t\\t\\t\\\"Remove duplicated entry\\\", // label\\n\\t\\t\\t\\\"Remove model item named\\\" + ' ' + issue.data.get(0), // description\\n\\t\\t\\t\\\"obj16/modelitem.gif\\\", // icon\\n\\t\\t\\t[\\n\\t\\t\\t\\telement, context |\\n\\t\\t\\t\\tvar outerList = element as ListItem\\n\\t\\t\\t\\tvar itemName = issue.data.get(0) as String\\n\\t\\t\\t\\tvar list = outerList.modelReferences\\n\\t\\t\\t\\tvar iter = list.iterator\\n\\t\\t\\t\\tvar lastItem = null as ModelItem\\n\\t\\t\\t\\twhile(iter.hasNext) {\\n\\t\\t\\t\\t\\tvar item = iter.next()\\n\\t\\t\\t\\t\\tif ( item.name.equals(itemName)) {\\n\\t\\t\\t\\t\\t\\tlastItem = item\\n\\t\\t\\t\\t\\t}\\n\\t\\t\\t\\t}\\n\\t\\t\\t\\t\\n\\t\\t\\t\\tif (lastItem != null ) {\\n\\t\\t\\t\\t\\tlist.remove(lastItem)\\n\\t\\t\\t\\t}\\n\\t\\t\\t]\\n\\t\\t);\\n\\t}\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"Issue issue\",\n \" IssueResolutionAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend\",\n \"implementation\": \"acceptor.accept(issue,\\n\\t\\t\\t\\\"Remove duplicated entry\\\", // label\\n\\t\\t\\t\\\"Remove intent named\\\" + ' ' + issue.data.get(0), // description\\n\\t\\t\\t\\\"obj16/intent.gif\\\", // icon\\n\\t\\t\\t[\\n\\t\\t\\t\\telement, context |\\n\\t\\t\\t\\tvar container = element as Refinement\\n\\t\\t\\t\\tvar itemName = issue.data.get(0) as String\\n\\t\\t\\t\\tvar list = container.intents\\n\\t\\t\\t\\tvar iter = list.iterator\\n\\t\\t\\t\\tvar lastItem = null as Intent\\n\\t\\t\\t\\twhile(iter.hasNext) {\\n\\t\\t\\t\\t\\tvar item = iter.next()\\n\\t\\t\\t\\t\\tif ( item.name.equals(itemName)) {\\n\\t\\t\\t\\t\\t\\tlastItem = item\",\n \"signature\": \"def removeIntent(Issue issue, IssueResolutionAcceptor acceptor)\"\n },\n {\n \"arguments\": [\n \"Issue issue\",\n \" IssueResolutionAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend\",\n \"implementation\": \"acceptor.accept(issue,\\n\\t\\t\\t\\\"Remove duplicated decomposition\\\", // label\\n\\t\\t\\t\\\"Remove decomposition named\\\" + ' ' + issue.data.get(0), // description\\n\\t\\t\\t\\\"obj16/decomposition.gif\\\", // icon\\n\\t\\t\\t[\\n\\t\\t\\t\\telement, context |\\n\\t\\t\\t\\tvar container = element as Intent\\n\\t\\t\\t\\tvar itemName = issue.data.get(0) as String\\n\\t\\t\\t\\tvar list = container.decompositions\\n\\t\\t\\t\\tvar iter = list.iterator\\n\\t\\t\\t\\tvar lastItem = null as Decomposition\\n\\t\\t\\t\\twhile(iter.hasNext) {\\n\\t\\t\\t\\t\\tvar item = iter.next() as Decomposition\\n\\t\\t\\t\\t\\tif ( item.name.equals(itemName)) {\\n\\t\\t\\t\\t\\t\\tlastItem = item\",\n \"signature\": \"def removeDecomposition(Issue issue, IssueResolutionAcceptor acceptor)\"\n },\n {\n \"arguments\": [\n \"Issue issue\",\n \" IssueResolutionAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend\",\n \"implementation\": \"acceptor.accept(issue,\\n\\t\\t\\t\\\"Remove duplicated list item\\\", // label\\n\\t\\t\\t\\\"Remove list item named\\\" + ' ' + issue.data.get(0), // description\\n\\t\\t\\t\\\"obj16/listitem.gif\\\", // icon\\n\\t\\t\\t[\\n\\t\\t\\t\\telement, context |\\n\\t\\t\\t\\tvar outerList = element as ListItem\\n\\t\\t\\t\\tvar itemName = issue.data.get(0) as String\\n\\t\\t\\t\\tvar list = outerList.itemReferences\\n\\t\\t\\t\\tvar iter = list.iterator\\n\\t\\t\\t\\tvar lastItem = null as ListItem\\n\\t\\t\\t\\twhile(iter.hasNext) {\\n\\t\\t\\t\\t\\tvar item = iter.next()\\n\\t\\t\\t\\t\\tif ( item.name.equals(itemName)) {\\n\\t\\t\\t\\t\\t\\tlastItem = item\",\n \"signature\": \"def removeListItem(Issue issue, IssueResolutionAcceptor acceptor)\"\n },\n {\n \"arguments\": [\n \"Issue issue\",\n \" IssueResolutionAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.xtend\",\n \"implementation\": \"acceptor.accept(issue,\\n\\t\\t\\t\\\"Remove duplicated entry\\\", // label\\n\\t\\t\\t\\\"Remove model item named\\\" + ' ' + issue.data.get(0), // description\\n\\t\\t\\t\\\"obj16/modelitem.gif\\\", // icon\\n\\t\\t\\t[\\n\\t\\t\\t\\telement, context |\\n\\t\\t\\t\\tvar outerList = element as ListItem\\n\\t\\t\\t\\tvar itemName = issue.data.get(0) as String\\n\\t\\t\\t\\tvar list = outerList.modelReferences\\n\\t\\t\\t\\tvar iter = list.iterator\\n\\t\\t\\t\\tvar lastItem = null as ModelItem\\n\\t\\t\\t\\twhile(iter.hasNext) {\\n\\t\\t\\t\\t\\tvar item = iter.next()\\n\\t\\t\\t\\t\\tif ( item.name.equals(itemName)) {\\n\\t\\t\\t\\t\\t\\tlastItem = item\",\n \"signature\": \"def removeModelItem(Issue issue, IssueResolutionAcceptor acceptor)\"\n }\n ],\n \"old_code\": \"* generated by Xtext\\n*/\\n//import org.eclipse.xtext.ui.editor.quickfix.Fix\\n//import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor\\n//import org.eclipse.xtext.validation.Issue\\n *\\n * see http://www.eclipse.org/Xtext/documentation.html#quickfixes\\nclass IntentSpecificationQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,18 +1,141 @@\\n /*\\n-* generated by Xtext\\n-*/\\n+ * NOT generated by Xtext\\n+ */\\n package net.certware.intent.ui.quickfix\\n \\n-//import org.eclipse.xtext.ui.editor.quickfix.Fix\\n-//import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor\\n-//import org.eclipse.xtext.validation.Issue\\n+import net.certware.intent.intentSpecification.Decomposition\\n+import net.certware.intent.intentSpecification.Intent\\n+import net.certware.intent.intentSpecification.ListItem\\n+import net.certware.intent.intentSpecification.ModelItem\\n+import net.certware.intent.intentSpecification.Refinement\\n+import net.certware.intent.validation.IntentSpecificationValidator\\n+import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider\\n+import org.eclipse.xtext.ui.editor.quickfix.Fix\\n+import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor\\n+import org.eclipse.xtext.validation.Issue\\n \\n /**\\n * Custom quickfixes.\\n- *\\n- * see http://www.eclipse.org/Xtext/documentation.html#quickfixes\\n+ * @see http://www.eclipse.org/Xtext/documentation.html#quickfixes\\n+ * @author mrb@certware.net\\n */\\n-class IntentSpecificationQuickfixProvider extends org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider {\\n+class IntentSpecificationQuickfixProvider extends DefaultQuickfixProvider {\\n+\\t\\n+\\t/*\\n+\\t * Fix duplicated intent entries by removing one.\\n+\\t */\\n+\\t@Fix(IntentSpecificationValidator::UNIQUE_INTENTS_REFINEMENT)\\n+\\tdef removeIntent(Issue issue, IssueResolutionAcceptor acceptor) {\\n+\\t\\tacceptor.accept(issue,\\n+\\t\\t\\t\\\"Remove duplicated entry\\\", // label\\n+\\t\\t\\t\\\"Remove intent named\\\" + ' ' + issue.data.get(0), // description\\n+\\t\\t\\t\\\"obj16/intent.gif\\\", // icon\\n+\\t\\t\\t[\\n+\\t\\t\\t\\telement, context |\\n+\\t\\t\\t\\tvar container = element as Refinement\\n+\\t\\t\\t\\tvar itemName = issue.data.get(0) as String\\n+\\t\\t\\t\\tvar list = container.intents\\n+\\t\\t\\t\\tvar iter = list.iterator\\n+\\t\\t\\t\\tvar lastItem = null as Intent\\n+\\t\\t\\t\\twhile(iter.hasNext) {\\n+\\t\\t\\t\\t\\tvar item = iter.next()\\n+\\t\\t\\t\\t\\tif ( item.name.equals(itemName)) {\\n+\\t\\t\\t\\t\\t\\tlastItem = item\\n+\\t\\t\\t\\t\\t}\\n+\\t\\t\\t\\t}\\n+\\t\\t\\t\\t\\n+\\t\\t\\t\\tif (lastItem != null ) {\\n+\\t\\t\\t\\t\\tlist.remove(lastItem)\\n+\\t\\t\\t\\t}\\n+\\t\\t\\t]\\n+\\t\\t);\\n+\\t}\\n+\\n+\\t/*\\n+\\t * Fix duplicated intent entries by removing one.\\n+\\t */\\n+\\t@Fix(IntentSpecificationValidator::UNIQUE_DECOMPOSITION_INTENT)\\n+\\tdef removeDecomposition(Issue issue, IssueResolutionAcceptor acceptor) {\\n+\\t\\tacceptor.accept(issue,\\n+\\t\\t\\t\\\"Remove duplicated decomposition\\\", // label\\n+\\t\\t\\t\\\"Remove decomposition named\\\" + ' ' + issue.data.get(0), // description\\n+\\t\\t\\t\\\"obj16/decomposition.gif\\\", // icon\\n+\\t\\t\\t[\\n+\\t\\t\\t\\telement, context |\\n+\\t\\t\\t\\tvar container = element as Intent\\n+\\t\\t\\t\\tvar itemName = issue.data.get(0) as String\\n+\\t\\t\\t\\tvar list = container.decompositions\\n+\\t\\t\\t\\tvar iter = list.iterator\\n+\\t\\t\\t\\tvar lastItem = null as Decomposition\\n+\\t\\t\\t\\twhile(iter.hasNext) {\\n+\\t\\t\\t\\t\\tvar item = iter.next() as Decomposition\\n+\\t\\t\\t\\t\\tif ( item.name.equals(itemName)) {\\n+\\t\\t\\t\\t\\t\\tlastItem = item\\n+\\t\\t\\t\\t\\t}\\n+\\t\\t\\t\\t}\\n+\\t\\t\\t\\t\\n+\\t\\t\\t\\tif (lastItem != null ) {\\n+\\t\\t\\t\\t\\tlist.remove(lastItem)\\n+\\t\\t\\t\\t}\\n+\\t\\t\\t]\\n+\\t\\t);\\n+\\t}\\n+\\t/*\\n+\\t * Fix duplicated list entries by removing one.\\n+\\t */\\n+\\t@Fix(IntentSpecificationValidator::UNIQUE_LIST_ITEM_LIST_ITEM)\\n+\\tdef removeListItem(Issue issue, IssueResolutionAcceptor acceptor) {\\n+\\t\\tacceptor.accept(issue,\\n+\\t\\t\\t\\\"Remove duplicated list item\\\", // label\\n+\\t\\t\\t\\\"Remove list item named\\\" + ' ' + issue.data.get(0), // description\\n+\\t\\t\\t\\\"obj16/listitem.gif\\\", // icon\\n+\\t\\t\\t[\\n+\\t\\t\\t\\telement, context |\\n+\\t\\t\\t\\tvar outerList = element as ListItem\\n+\\t\\t\\t\\tvar itemName = issue.data.get(0) as String\\n+\\t\\t\\t\\tvar list = outerList.itemReferences\\n+\\t\\t\\t\\tvar iter = list.iterator\\n+\\t\\t\\t\\tvar lastItem = null as ListItem\\n+\\t\\t\\t\\twhile(iter.hasNext) {\\n+\\t\\t\\t\\t\\tvar item = iter.next()\\n+\\t\\t\\t\\t\\tif ( item.name.equals(itemName)) {\\n+\\t\\t\\t\\t\\t\\tlastItem = item\\n+\\t\\t\\t\\t\\t}\\n+\\t\\t\\t\\t}\\n+\\t\\t\\t\\t\\n+\\t\\t\\t\\tif (lastItem != null ) {\\n+\\t\\t\\t\\t\\tlist.remove(lastItem)\\n+\\t\\t\\t\\t}\\n+\\t\\t\\t]\\n+\\t\\t);\\n+\\t}\\n+\\t\\n+\\t@Fix(IntentSpecificationValidator::UNIQUE_MODEL_ITEM_LIST_ITEM)\\n+\\tdef removeModelItem(Issue issue, IssueResolutionAcceptor acceptor) {\\n+\\t\\tacceptor.accept(issue,\\n+\\t\\t\\t\\\"Remove duplicated entry\\\", // label\\n+\\t\\t\\t\\\"Remove model item named\\\" + ' ' + issue.data.get(0), // description\\n+\\t\\t\\t\\\"obj16/modelitem.gif\\\", // icon\\n+\\t\\t\\t[\\n+\\t\\t\\t\\telement, context |\\n+\\t\\t\\t\\tvar outerList = element as ListItem\\n+\\t\\t\\t\\tvar itemName = issue.data.get(0) as String\\n+\\t\\t\\t\\tvar list = outerList.modelReferences\\n+\\t\\t\\t\\tvar iter = list.iterator\\n+\\t\\t\\t\\tvar lastItem = null as ModelItem\\n+\\t\\t\\t\\twhile(iter.hasNext) {\\n+\\t\\t\\t\\t\\tvar item = iter.next()\\n+\\t\\t\\t\\t\\tif ( item.name.equals(itemName)) {\\n+\\t\\t\\t\\t\\t\\tlastItem = item\\n+\\t\\t\\t\\t\\t}\\n+\\t\\t\\t\\t}\\n+\\t\\t\\t\\t\\n+\\t\\t\\t\\tif (lastItem != null ) {\\n+\\t\\t\\t\\t\\tlist.remove(lastItem)\\n+\\t\\t\\t\\t}\\n+\\t\\t\\t]\\n+\\t\\t);\\n+\\t}\\n \\n //\\t@Fix(MyDslValidator::INVALID_NAME)\\n //\\tdef capitalizeName(Issue issue, IssueResolutionAcceptor acceptor) {\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.xtend\",\n \"sha\": \"44be548a658b3731af7b97c3654097721a89d19f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fwizard%2FIntentSpecificationNewProject.xpt\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fwizard%2FIntentSpecificationNewProject.xpt?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 1,\n \"filename\": \"net.certware.intent.ui/src/net/certware/intent/ui/wizard/IntentSpecificationNewProject.xpt\",\n \"new_code\": \"«FILE \\\"src/model/Model.intent\\\"-»\",\n \"new_methods\": [],\n \"old_code\": \"«FILE \\\"src/model/Model.intentspecification\\\"-»\",\n \"old_methods\": [],\n \"patch\": \"@@ -6,7 +6,7 @@\\n «ENDDEFINE»\\n \\n «DEFINE model FOR IntentSpecificationProjectInfo»\\n-«FILE \\\"src/model/Model.intentspecification\\\"-»\\n+«FILE \\\"src/model/Model.intent\\\"-»\\n /*\\n * This is an example model\\n */\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fui%2Fwizard%2FIntentSpecificationNewProject.xpt\",\n \"sha\": \"564de2e356a15c25618cd9ebb9667822f7ef6c19\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 290,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.java\",\n \"changes\": 291,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 1,\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"new_code\": \" * NOT generated by Xtext\\nimport net.certware.intent.intentSpecification.Decomposition;\\nimport net.certware.intent.intentSpecification.DecompositionType;\\nimport net.certware.intent.intentSpecification.DocItem;\\nimport net.certware.intent.intentSpecification.DocItemType;\\nimport net.certware.intent.intentSpecification.Document;\\nimport net.certware.intent.intentSpecification.Intent;\\nimport net.certware.intent.intentSpecification.IntentType;\\nimport net.certware.intent.intentSpecification.ListItem;\\nimport net.certware.intent.intentSpecification.ListItemType;\\nimport net.certware.intent.intentSpecification.ModelItem;\\nimport net.certware.intent.intentSpecification.ModelType;\\nimport net.certware.intent.intentSpecification.Refinement;\\nimport net.certware.intent.intentSpecification.Specification;\\n \\n public String image(final Refinement e) {\\n return \\\"obj16/refinement.gif\\\";\\n }\\n \\n public String image(final Intent e) {\\n return \\\"obj16/intent.gif\\\";\\n }\\n \\n public String image(final Specification e) {\\n return \\\"obj16/specification.gif\\\";\\n }\\n \\n public String image(final Decomposition e) {\\n return \\\"obj16/decomposition.gif\\\";\\n }\\n \\n public String image(final Document e) {\\n return \\\"obj16/document.gif\\\";\\n }\\n \\n public String image(final ModelItem e) {\\n return \\\"obj16/modelitem.gif\\\";\\n }\\n \\n public String image(final ListItem e) {\\n return \\\"obj16/listitem.gif\\\";\\n }\\n \\n /**\\n * text responses\\n */\\n public String text(final Intent e) {\\n String _xblockexpression = null;\\n {\\n IntentType type = e.getType();\\n String typeName = type.getTypeName();\\n boolean _equals = \\\"basic\\\".equals(typeName);\\n if (_equals) {\\n String _plus = (\\\"Basic\\\" + \\\" \\\");\\n String _name = e.getName();\\n return (_plus + _name);\\n }\\n boolean _equals_1 = \\\"purpose\\\".equals(typeName);\\n if (_equals_1) {\\n String _plus_1 = (\\\"Purpose\\\" + \\\" \\\");\\n String _name_1 = e.getName();\\n return (_plus_1 + _name_1);\\n }\\n boolean _equals_2 = \\\"principles\\\".equals(typeName);\\n if (_equals_2) {\\n String _plus_2 = (\\\"Principles\\\" + \\\" \\\");\\n String _name_2 = e.getName();\\n return (_plus_2 + _name_2);\\n }\\n boolean _equals_3 = \\\"models\\\".equals(typeName);\\n if (_equals_3) {\\n String _plus_3 = (\\\"Models\\\" + \\\" \\\");\\n String _name_3 = e.getName();\\n return (_plus_3 + _name_3);\\n }\\n boolean _equals_4 = \\\"design\\\".equals(typeName);\\n if (_equals_4) {\\n String _plus_4 = (\\\"Design\\\" + \\\" \\\");\\n String _name_4 = e.getName();\\n return (_plus_4 + _name_4);\\n }\\n boolean _equals_5 = \\\"implementation\\\".equals(typeName);\\n if (_equals_5) {\\n String _plus_5 = (\\\"Implementation\\\" + \\\" \\\");\\n String _name_5 = e.getName();\\n return (_plus_5 + _name_5);\\n }\\n boolean _equals_6 = \\\"operation\\\".equals(typeName);\\n if (_equals_6) {\\n String _plus_6 = (\\\"Operation\\\" + \\\" \\\");\\n String _name_6 = e.getName();\\n return (_plus_6 + _name_6);\\n }\\n String _plus_7 = (\\\"Intent\\\" + \\\" \\\");\\n String _name_7 = e.getName();\\n String _plus_8 = (_plus_7 + _name_7);\\n _xblockexpression = (_plus_8);\\n }\\n return _xblockexpression;\\n }\\n \\n public String text(final Refinement e) {\\n String _plus = (\\\"Refinement\\\" + \\\" \\\");\\n String _name = e.getName();\\n String _plus_1 = (_plus + _name);\\n return _plus_1;\\n }\\n \\n public String text(final Decomposition e) {\\n String _xblockexpression = null;\\n {\\n DecompositionType type = e.getType();\\n String typeName = type.getTypeName();\\n boolean _equals = \\\"environment\\\".equals(typeName);\\n if (_equals) {\\n String _plus = (\\\"Environment\\\" + \\\" \\\");\\n String _name = e.getName();\\n return (_plus + _name);\\n }\\n boolean _equals_1 = \\\"operator\\\".equals(typeName);\\n if (_equals_1) {\\n String _plus_1 = (\\\"Operator\\\" + \\\" \\\");\\n String _name_1 = e.getName();\\n return (_plus_1 + _name_1);\\n }\\n boolean _equals_2 = \\\"system\\\".equals(typeName);\\n if (_equals_2) {\\n String _plus_2 = (\\\"System\\\" + \\\" \\\");\\n String _name_2 = e.getName();\\n return (_plus_2 + _name_2);\\n }\\n boolean _equals_3 = \\\"verification\\\".equals(typeName);\\n if (_equals_3) {\\n String _plus_3 = (\\\"V&V\\\" + \\\" \\\");\\n String _name_3 = e.getName();\\n return (_plus_3 + _name_3);\\n }\\n String _plus_4 = (\\\"Decomposition\\\" + \\\" \\\");\\n String _name_4 = e.getName();\\n String _plus_5 = (_plus_4 + _name_4);\\n _xblockexpression = (_plus_5);\\n }\\n return _xblockexpression;\\n }\\n \\n public String text(final Document e) {\\n return \\\"Document\\\";\\n }\\n \\n public String text(final DocItem e) {\\n String _xblockexpression = null;\\n {\\n DocItemType type = e.getType();\\n String typeName = type.getTypeName();\\n boolean _equals = \\\"condition\\\".equals(typeName);\\n if (_equals) {\\n String _plus = (\\\"Condition\\\" + \\\" \\\");\\n String _name = e.getName();\\n return (_plus + _name);\\n }\\n boolean _equals_1 = \\\"figure\\\".equals(typeName);\\n if (_equals_1) {\\n String _plus_1 = (\\\"Figure\\\" + \\\" \\\");\\n String _name_1 = e.getName();\\n return (_plus_1 + _name_1);\\n }\\n boolean _equals_2 = \\\"break\\\".equals(typeName);\\n if (_equals_2) {\\n return \\\"Break\\\";\\n }\\n boolean _equals_3 = \\\"model\\\".equals(typeName);\\n if (_equals_3) {\\n String _plus_2 = (\\\"Model\\\" + \\\" \\\");\\n String _name_2 = e.getName();\\n return (_plus_2 + _name_2);\\n }\\n boolean _equals_4 = \\\"paragraph\\\".equals(typeName);\\n if (_equals_4) {\\n String _plus_3 = (\\\"Paragraph\\\" + \\\" \\\");\\n String _name_3 = e.getName();\\n return (_plus_3 + _name_3);\\n }\\n boolean _equals_5 = \\\"section\\\".equals(typeName);\\n if (_equals_5) {\\n String _plus_4 = (\\\"Section\\\" + \\\" \\\");\\n String _name_4 = e.getName();\\n return (_plus_4 + _name_4);\\n }\\n boolean _equals_6 = \\\"table\\\".equals(typeName);\\n if (_equals_6) {\\n String _plus_5 = (\\\"Table\\\" + \\\" \\\");\\n String _name_5 = e.getName();\\n return (_plus_5 + _name_5);\\n }\\n String _plus_6 = (\\\"Item\\\" + \\\" \\\");\\n String _name_6 = e.getName();\\n String _plus_7 = (_plus_6 + _name_6);\\n _xblockexpression = (_plus_7);\\n }\\n return _xblockexpression;\\n }\\n \\n public String text(final ModelItem e) {\\n String _xblockexpression = null;\\n {\\n ModelType type = e.getType();\\n String typeName = type.getTypeName();\\n boolean _equals = \\\"output\\\".equals(typeName);\\n if (_equals) {\\n String _plus = (\\\"Output\\\" + \\\" \\\");\\n String _name = e.getName();\\n return (_plus + _name);\\n }\\n boolean _equals_1 = \\\"mode\\\".equals(typeName);\\n if (_equals_1) {\\n String _plus_1 = (\\\"Mode\\\" + \\\" \\\");\\n String _name_1 = e.getName();\\n return (_plus_1 + _name_1);\\n }\\n boolean _equals_2 = \\\"state\\\".equals(typeName);\\n if (_equals_2) {\\n String _plus_2 = (\\\"State\\\" + \\\" \\\");\\n String _name_2 = e.getName();\\n return (_plus_2 + _name_2);\\n }\\n boolean _equals_3 = \\\"macro\\\".equals(typeName);\\n if (_equals_3) {\\n String _plus_3 = (\\\"Macro\\\" + \\\" \\\");\\n String _name_3 = e.getName();\\n return (_plus_3 + _name_3);\\n }\\n boolean _equals_4 = \\\"function\\\".equals(typeName);\\n if (_equals_4) {\\n String _plus_4 = (\\\"Function\\\" + \\\" \\\");\\n String _name_4 = e.getName();\\n return (_plus_4 + _name_4);\\n }\\n boolean _equals_5 = \\\"input\\\".equals(typeName);\\n if (_equals_5) {\\n String _plus_5 = (\\\"Input\\\" + \\\" \\\");\\n String _name_5 = e.getName();\\n return (_plus_5 + _name_5);\\n }\\n String _plus_6 = (\\\"Model\\\" + \\\" \\\");\\n String _name_6 = e.getName();\\n String _plus_7 = (_plus_6 + _name_6);\\n _xblockexpression = (_plus_7);\\n }\\n return _xblockexpression;\\n }\\n \\n public String text(final ListItem e) {\\n String _xblockexpression = null;\\n {\\n ListItemType type = e.getType();\\n String _typeName = type.getTypeName();\\n boolean _equals = \\\"hazard\\\".equals(_typeName);\\n if (_equals) {\\n String _plus = (\\\"Hazard\\\" + \\\" \\\");\\n String _name = e.getName();\\n return (_plus + _name);\\n }\\n String _typeName_1 = type.getTypeName();\\n boolean _equals_1 = \\\"requirement\\\".equals(_typeName_1);\\n if (_equals_1) {\\n String _plus_1 = (\\\"Requirement\\\" + \\\" \\\");\\n String _name_1 = e.getName();\\n return (_plus_1 + _name_1);\\n }\\n String _typeName_2 = type.getTypeName();\\n boolean _equals_2 = \\\"goal\\\".equals(_typeName_2);\\n if (_equals_2) {\\n String _plus_2 = (\\\"Goal\\\" + \\\" \\\");\\n String _name_2 = e.getName();\\n return (_plus_2 + _name_2);\\n }\\n String _typeName_3 = type.getTypeName();\\n boolean _equals_3 = \\\"constraint\\\".equals(_typeName_3);\\n if (_equals_3) {\\n String _plus_3 = (\\\"Constraint\\\" + \\\" \\\");\\n String _name_3 = e.getName();\\n return (_plus_3 + _name_3);\\n }\\n String _plus_4 = (\\\"List\\\" + \\\" \\\");\\n String _name_4 = e.getName();\\n String _plus_5 = (_plus_4 + _name_4);\\n _xblockexpression = (_plus_5);\\n }\\n return _xblockexpression;\\n }\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"final Refinement e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"return \\\"obj16/refinement.gif\\\";\",\n \"signature\": \"String image(final Refinement e)\"\n },\n {\n \"arguments\": [\n \"final Intent e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"return \\\"obj16/intent.gif\\\";\",\n \"signature\": \"String image(final Intent e)\"\n },\n {\n \"arguments\": [\n \"final Specification e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"return \\\"obj16/specification.gif\\\";\",\n \"signature\": \"String image(final Specification e)\"\n },\n {\n \"arguments\": [\n \"final Decomposition e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"return \\\"obj16/decomposition.gif\\\";\",\n \"signature\": \"String image(final Decomposition e)\"\n },\n {\n \"arguments\": [\n \"final Document e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"return \\\"obj16/document.gif\\\";\",\n \"signature\": \"String image(final Document e)\"\n },\n {\n \"arguments\": [\n \"final ModelItem e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"return \\\"obj16/modelitem.gif\\\";\",\n \"signature\": \"String image(final ModelItem e)\"\n },\n {\n \"arguments\": [\n \"final ListItem e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"return \\\"obj16/listitem.gif\\\";\",\n \"signature\": \"String image(final ListItem e)\"\n },\n {\n \"arguments\": [\n \"final Intent e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"String _xblockexpression = null;\\n {\\n IntentType type = e.getType();\\n String typeName = type.getTypeName();\\n boolean _equals = \\\"basic\\\".equals(typeName);\\n if (_equals) {\\n String _plus = (\\\"Basic\\\" + \\\" \\\");\\n String _name = e.getName();\\n return (_plus + _name);\",\n \"signature\": \"String text(final Intent e)\"\n },\n {\n \"arguments\": [\n \"final Refinement e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"String _plus = (\\\"Refinement\\\" + \\\" \\\");\\n String _name = e.getName();\\n String _plus_1 = (_plus + _name);\\n return _plus_1;\",\n \"signature\": \"String text(final Refinement e)\"\n },\n {\n \"arguments\": [\n \"final Decomposition e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"String _xblockexpression = null;\\n {\\n DecompositionType type = e.getType();\\n String typeName = type.getTypeName();\\n boolean _equals = \\\"environment\\\".equals(typeName);\\n if (_equals) {\\n String _plus = (\\\"Environment\\\" + \\\" \\\");\\n String _name = e.getName();\\n return (_plus + _name);\",\n \"signature\": \"String text(final Decomposition e)\"\n },\n {\n \"arguments\": [\n \"final Document e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"return \\\"Document\\\";\",\n \"signature\": \"String text(final Document e)\"\n },\n {\n \"arguments\": [\n \"final DocItem e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"String _xblockexpression = null;\\n {\\n DocItemType type = e.getType();\\n String typeName = type.getTypeName();\\n boolean _equals = \\\"condition\\\".equals(typeName);\\n if (_equals) {\\n String _plus = (\\\"Condition\\\" + \\\" \\\");\\n String _name = e.getName();\\n return (_plus + _name);\",\n \"signature\": \"String text(final DocItem e)\"\n },\n {\n \"arguments\": [\n \"final ModelItem e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"String _xblockexpression = null;\\n {\\n ModelType type = e.getType();\\n String typeName = type.getTypeName();\\n boolean _equals = \\\"output\\\".equals(typeName);\\n if (_equals) {\\n String _plus = (\\\"Output\\\" + \\\" \\\");\\n String _name = e.getName();\\n return (_plus + _name);\",\n \"signature\": \"String text(final ModelItem e)\"\n },\n {\n \"arguments\": [\n \"final ListItem e\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/labeling/IntentSpecificationLabelProvider.java\",\n \"implementation\": \"String _xblockexpression = null;\\n {\\n ListItemType type = e.getType();\\n String _typeName = type.getTypeName();\\n boolean _equals = \\\"hazard\\\".equals(_typeName);\\n if (_equals) {\\n String _plus = (\\\"Hazard\\\" + \\\" \\\");\\n String _name = e.getName();\\n return (_plus + _name);\",\n \"signature\": \"String text(final ListItem e)\"\n }\n ],\n \"old_code\": \" * generated by Xtext\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,22 @@\\n /**\\n- * generated by Xtext\\n+ * NOT generated by Xtext\\n */\\n package net.certware.intent.ui.labeling;\\n \\n import com.google.inject.Inject;\\n+import net.certware.intent.intentSpecification.Decomposition;\\n+import net.certware.intent.intentSpecification.DecompositionType;\\n+import net.certware.intent.intentSpecification.DocItem;\\n+import net.certware.intent.intentSpecification.DocItemType;\\n+import net.certware.intent.intentSpecification.Document;\\n+import net.certware.intent.intentSpecification.Intent;\\n+import net.certware.intent.intentSpecification.IntentType;\\n+import net.certware.intent.intentSpecification.ListItem;\\n+import net.certware.intent.intentSpecification.ListItemType;\\n+import net.certware.intent.intentSpecification.ModelItem;\\n+import net.certware.intent.intentSpecification.ModelType;\\n+import net.certware.intent.intentSpecification.Refinement;\\n+import net.certware.intent.intentSpecification.Specification;\\n import org.eclipse.emf.edit.ui.provider.AdapterFactoryLabelProvider;\\n import org.eclipse.xtext.ui.label.DefaultEObjectLabelProvider;\\n \\n@@ -18,4 +31,280 @@ public class IntentSpecificationLabelProvider extends DefaultEObjectLabelProvide\\n public IntentSpecificationLabelProvider(final AdapterFactoryLabelProvider delegate) {\\n super(delegate);\\n }\\n+ \\n+ public String image(final Refinement e) {\\n+ return \\\"obj16/refinement.gif\\\";\\n+ }\\n+ \\n+ public String image(final Intent e) {\\n+ return \\\"obj16/intent.gif\\\";\\n+ }\\n+ \\n+ public String image(final Specification e) {\\n+ return \\\"obj16/specification.gif\\\";\\n+ }\\n+ \\n+ public String image(final Decomposition e) {\\n+ return \\\"obj16/decomposition.gif\\\";\\n+ }\\n+ \\n+ public String image(final Document e) {\\n+ return \\\"obj16/document.gif\\\";\\n+ }\\n+ \\n+ public String image(final ModelItem e) {\\n+ return \\\"obj16/modelitem.gif\\\";\\n+ }\\n+ \\n+ public String image(final ListItem e) {\\n+ return \\\"obj16/listitem.gif\\\";\\n+ }\\n+ \\n+ /**\\n+ * text responses\\n+ */\\n+ public String text(final Intent e) {\\n+ String _xblockexpression = null;\\n+ {\\n+ IntentType type = e.getType();\\n+ String typeName = type.getTypeName();\\n+ boolean _equals = \\\"basic\\\".equals(typeName);\\n+ if (_equals) {\\n+ String _plus = (\\\"Basic\\\" + \\\" \\\");\\n+ String _name = e.getName();\\n+ return (_plus + _name);\\n+ }\\n+ boolean _equals_1 = \\\"purpose\\\".equals(typeName);\\n+ if (_equals_1) {\\n+ String _plus_1 = (\\\"Purpose\\\" + \\\" \\\");\\n+ String _name_1 = e.getName();\\n+ return (_plus_1 + _name_1);\\n+ }\\n+ boolean _equals_2 = \\\"principles\\\".equals(typeName);\\n+ if (_equals_2) {\\n+ String _plus_2 = (\\\"Principles\\\" + \\\" \\\");\\n+ String _name_2 = e.getName();\\n+ return (_plus_2 + _name_2);\\n+ }\\n+ boolean _equals_3 = \\\"models\\\".equals(typeName);\\n+ if (_equals_3) {\\n+ String _plus_3 = (\\\"Models\\\" + \\\" \\\");\\n+ String _name_3 = e.getName();\\n+ return (_plus_3 + _name_3);\\n+ }\\n+ boolean _equals_4 = \\\"design\\\".equals(typeName);\\n+ if (_equals_4) {\\n+ String _plus_4 = (\\\"Design\\\" + \\\" \\\");\\n+ String _name_4 = e.getName();\\n+ return (_plus_4 + _name_4);\\n+ }\\n+ boolean _equals_5 = \\\"implementation\\\".equals(typeName);\\n+ if (_equals_5) {\\n+ String _plus_5 = (\\\"Implementation\\\" + \\\" \\\");\\n+ String _name_5 = e.getName();\\n+ return (_plus_5 + _name_5);\\n+ }\\n+ boolean _equals_6 = \\\"operation\\\".equals(typeName);\\n+ if (_equals_6) {\\n+ String _plus_6 = (\\\"Operation\\\" + \\\" \\\");\\n+ String _name_6 = e.getName();\\n+ return (_plus_6 + _name_6);\\n+ }\\n+ String _plus_7 = (\\\"Intent\\\" + \\\" \\\");\\n+ String _name_7 = e.getName();\\n+ String _plus_8 = (_plus_7 + _name_7);\\n+ _xblockexpression = (_plus_8);\\n+ }\\n+ return _xblockexpression;\\n+ }\\n+ \\n+ public String text(final Refinement e) {\\n+ String _plus = (\\\"Refinement\\\" + \\\" \\\");\\n+ String _name = e.getName();\\n+ String _plus_1 = (_plus + _name);\\n+ return _plus_1;\\n+ }\\n+ \\n+ public String text(final Decomposition e) {\\n+ String _xblockexpression = null;\\n+ {\\n+ DecompositionType type = e.getType();\\n+ String typeName = type.getTypeName();\\n+ boolean _equals = \\\"environment\\\".equals(typeName);\\n+ if (_equals) {\\n+ String _plus = (\\\"Environment\\\" + \\\" \\\");\\n+ String _name = e.getName();\\n+ return (_plus + _name);\\n+ }\\n+ boolean _equals_1 = \\\"operator\\\".equals(typeName);\\n+ if (_equals_1) {\\n+ String _plus_1 = (\\\"Operator\\\" + \\\" \\\");\\n+ String _name_1 = e.getName();\\n+ return (_plus_1 + _name_1);\\n+ }\\n+ boolean _equals_2 = \\\"system\\\".equals(typeName);\\n+ if (_equals_2) {\\n+ String _plus_2 = (\\\"System\\\" + \\\" \\\");\\n+ String _name_2 = e.getName();\\n+ return (_plus_2 + _name_2);\\n+ }\\n+ boolean _equals_3 = \\\"verification\\\".equals(typeName);\\n+ if (_equals_3) {\\n+ String _plus_3 = (\\\"V&V\\\" + \\\" \\\");\\n+ String _name_3 = e.getName();\\n+ return (_plus_3 + _name_3);\\n+ }\\n+ String _plus_4 = (\\\"Decomposition\\\" + \\\" \\\");\\n+ String _name_4 = e.getName();\\n+ String _plus_5 = (_plus_4 + _name_4);\\n+ _xblockexpression = (_plus_5);\\n+ }\\n+ return _xblockexpression;\\n+ }\\n+ \\n+ public String text(final Document e) {\\n+ return \\\"Document\\\";\\n+ }\\n+ \\n+ public String text(final DocItem e) {\\n+ String _xblockexpression = null;\\n+ {\\n+ DocItemType type = e.getType();\\n+ String typeName = type.getTypeName();\\n+ boolean _equals = \\\"condition\\\".equals(typeName);\\n+ if (_equals) {\\n+ String _plus = (\\\"Condition\\\" + \\\" \\\");\\n+ String _name = e.getName();\\n+ return (_plus + _name);\\n+ }\\n+ boolean _equals_1 = \\\"figure\\\".equals(typeName);\\n+ if (_equals_1) {\\n+ String _plus_1 = (\\\"Figure\\\" + \\\" \\\");\\n+ String _name_1 = e.getName();\\n+ return (_plus_1 + _name_1);\\n+ }\\n+ boolean _equals_2 = \\\"break\\\".equals(typeName);\\n+ if (_equals_2) {\\n+ return \\\"Break\\\";\\n+ }\\n+ boolean _equals_3 = \\\"model\\\".equals(typeName);\\n+ if (_equals_3) {\\n+ String _plus_2 = (\\\"Model\\\" + \\\" \\\");\\n+ String _name_2 = e.getName();\\n+ return (_plus_2 + _name_2);\\n+ }\\n+ boolean _equals_4 = \\\"paragraph\\\".equals(typeName);\\n+ if (_equals_4) {\\n+ String _plus_3 = (\\\"Paragraph\\\" + \\\" \\\");\\n+ String _name_3 = e.getName();\\n+ return (_plus_3 + _name_3);\\n+ }\\n+ boolean _equals_5 = \\\"section\\\".equals(typeName);\\n+ if (_equals_5) {\\n+ String _plus_4 = (\\\"Section\\\" + \\\" \\\");\\n+ String _name_4 = e.getName();\\n+ return (_plus_4 + _name_4);\\n+ }\\n+ boolean _equals_6 = \\\"table\\\".equals(typeName);\\n+ if (_equals_6) {\\n+ String _plus_5 = (\\\"Table\\\" + \\\" \\\");\\n+ String _name_5 = e.getName();\\n+ return (_plus_5 + _name_5);\\n+ }\\n+ String _plus_6 = (\\\"Item\\\" + \\\" \\\");\\n+ String _name_6 = e.getName();\\n+ String _plus_7 = (_plus_6 + _name_6);\\n+ _xblockexpression = (_plus_7);\\n+ }\\n+ return _xblockexpression;\\n+ }\\n+ \\n+ public String text(final ModelItem e) {\\n+ String _xblockexpression = null;\\n+ {\\n+ ModelType type = e.getType();\\n+ String typeName = type.getTypeName();\\n+ boolean _equals = \\\"output\\\".equals(typeName);\\n+ if (_equals) {\\n+ String _plus = (\\\"Output\\\" + \\\" \\\");\\n+ String _name = e.getName();\\n+ return (_plus + _name);\\n+ }\\n+ boolean _equals_1 = \\\"mode\\\".equals(typeName);\\n+ if (_equals_1) {\\n+ String _plus_1 = (\\\"Mode\\\" + \\\" \\\");\\n+ String _name_1 = e.getName();\\n+ return (_plus_1 + _name_1);\\n+ }\\n+ boolean _equals_2 = \\\"state\\\".equals(typeName);\\n+ if (_equals_2) {\\n+ String _plus_2 = (\\\"State\\\" + \\\" \\\");\\n+ String _name_2 = e.getName();\\n+ return (_plus_2 + _name_2);\\n+ }\\n+ boolean _equals_3 = \\\"macro\\\".equals(typeName);\\n+ if (_equals_3) {\\n+ String _plus_3 = (\\\"Macro\\\" + \\\" \\\");\\n+ String _name_3 = e.getName();\\n+ return (_plus_3 + _name_3);\\n+ }\\n+ boolean _equals_4 = \\\"function\\\".equals(typeName);\\n+ if (_equals_4) {\\n+ String _plus_4 = (\\\"Function\\\" + \\\" \\\");\\n+ String _name_4 = e.getName();\\n+ return (_plus_4 + _name_4);\\n+ }\\n+ boolean _equals_5 = \\\"input\\\".equals(typeName);\\n+ if (_equals_5) {\\n+ String _plus_5 = (\\\"Input\\\" + \\\" \\\");\\n+ String _name_5 = e.getName();\\n+ return (_plus_5 + _name_5);\\n+ }\\n+ String _plus_6 = (\\\"Model\\\" + \\\" \\\");\\n+ String _name_6 = e.getName();\\n+ String _plus_7 = (_plus_6 + _name_6);\\n+ _xblockexpression = (_plus_7);\\n+ }\\n+ return _xblockexpression;\\n+ }\\n+ \\n+ public String text(final ListItem e) {\\n+ String _xblockexpression = null;\\n+ {\\n+ ListItemType type = e.getType();\\n+ String _typeName = type.getTypeName();\\n+ boolean _equals = \\\"hazard\\\".equals(_typeName);\\n+ if (_equals) {\\n+ String _plus = (\\\"Hazard\\\" + \\\" \\\");\\n+ String _name = e.getName();\\n+ return (_plus + _name);\\n+ }\\n+ String _typeName_1 = type.getTypeName();\\n+ boolean _equals_1 = \\\"requirement\\\".equals(_typeName_1);\\n+ if (_equals_1) {\\n+ String _plus_1 = (\\\"Requirement\\\" + \\\" \\\");\\n+ String _name_1 = e.getName();\\n+ return (_plus_1 + _name_1);\\n+ }\\n+ String _typeName_2 = type.getTypeName();\\n+ boolean _equals_2 = \\\"goal\\\".equals(_typeName_2);\\n+ if (_equals_2) {\\n+ String _plus_2 = (\\\"Goal\\\" + \\\" \\\");\\n+ String _name_2 = e.getName();\\n+ return (_plus_2 + _name_2);\\n+ }\\n+ String _typeName_3 = type.getTypeName();\\n+ boolean _equals_3 = \\\"constraint\\\".equals(_typeName_3);\\n+ if (_equals_3) {\\n+ String _plus_3 = (\\\"Constraint\\\" + \\\" \\\");\\n+ String _name_3 = e.getName();\\n+ return (_plus_3 + _name_3);\\n+ }\\n+ String _plus_4 = (\\\"List\\\" + \\\" \\\");\\n+ String _name_4 = e.getName();\\n+ String _plus_5 = (_plus_4 + _name_4);\\n+ _xblockexpression = (_plus_5);\\n+ }\\n+ return _xblockexpression;\\n+ }\\n }\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Flabeling%2FIntentSpecificationLabelProvider.java\",\n \"sha\": \"0c00b035e5b9e5a25b1e829f8abb31b37914673b\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 187,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.java\",\n \"changes\": 190,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 3,\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java\",\n \"new_code\": \" * NOT generated by Xtext\\nimport com.google.common.base.Objects;\\nimport java.util.Iterator;\\nimport net.certware.intent.intentSpecification.Decomposition;\\nimport net.certware.intent.intentSpecification.Intent;\\nimport net.certware.intent.intentSpecification.ListItem;\\nimport net.certware.intent.intentSpecification.ModelItem;\\nimport net.certware.intent.intentSpecification.Refinement;\\nimport net.certware.intent.validation.IntentSpecificationValidator;\\nimport org.eclipse.emf.common.util.EList;\\nimport org.eclipse.emf.ecore.EObject;\\nimport org.eclipse.xtext.ui.editor.model.edit.IModificationContext;\\nimport org.eclipse.xtext.ui.editor.model.edit.ISemanticModification;\\nimport org.eclipse.xtext.ui.editor.quickfix.Fix;\\nimport org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor;\\nimport org.eclipse.xtext.validation.Issue;\\n * @see http://www.eclipse.org/Xtext/documentation.html#quickfixes\\n * @author mrb@certware.net\\n /**\\n * Fix duplicated intent entries by removing one.\\n */\\n @Fix(IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT)\\n public void removeIntent(final Issue issue, final IssueResolutionAcceptor acceptor) {\\n String _plus = (\\\"Remove intent named\\\" + \\\" \\\");\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String _plus_1 = (_plus + _get);\\n final ISemanticModification _function = new ISemanticModification() {\\n public void apply(final EObject element, final IModificationContext context) throws Exception {\\n Refinement container = ((Refinement) element);\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String itemName = ((String) _get);\\n EList list = container.getIntents();\\n Iterator iter = list.iterator();\\n Intent lastItem = ((Intent) null);\\n boolean _hasNext = iter.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n Intent item = iter.next();\\n String _name = item.getName();\\n boolean _equals = _name.equals(itemName);\\n if (_equals) {\\n lastItem = item;\\n }\\n }\\n boolean _hasNext_1 = iter.hasNext();\\n _while = _hasNext_1;\\n }\\n boolean _notEquals = (!Objects.equal(lastItem, null));\\n if (_notEquals) {\\n list.remove(lastItem);\\n }\\n }\\n };\\n acceptor.accept(issue, \\n \\\"Remove duplicated entry\\\", _plus_1, \\n \\\"obj16/intent.gif\\\", _function);\\n }\\n \\n /**\\n * Fix duplicated intent entries by removing one.\\n */\\n @Fix(IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT)\\n public void removeDecomposition(final Issue issue, final IssueResolutionAcceptor acceptor) {\\n String _plus = (\\\"Remove decomposition named\\\" + \\\" \\\");\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String _plus_1 = (_plus + _get);\\n final ISemanticModification _function = new ISemanticModification() {\\n public void apply(final EObject element, final IModificationContext context) throws Exception {\\n Intent container = ((Intent) element);\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String itemName = ((String) _get);\\n EList list = container.getDecompositions();\\n Iterator iter = list.iterator();\\n Decomposition lastItem = ((Decomposition) null);\\n boolean _hasNext = iter.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n Decomposition _next = iter.next();\\n Decomposition item = ((Decomposition) _next);\\n String _name = item.getName();\\n boolean _equals = _name.equals(itemName);\\n if (_equals) {\\n lastItem = item;\\n }\\n }\\n boolean _hasNext_1 = iter.hasNext();\\n _while = _hasNext_1;\\n }\\n boolean _notEquals = (!Objects.equal(lastItem, null));\\n if (_notEquals) {\\n list.remove(lastItem);\\n }\\n }\\n };\\n acceptor.accept(issue, \\n \\\"Remove duplicated decomposition\\\", _plus_1, \\n \\\"obj16/decomposition.gif\\\", _function);\\n }\\n \\n /**\\n * Fix duplicated list entries by removing one.\\n */\\n @Fix(IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM)\\n public void removeListItem(final Issue issue, final IssueResolutionAcceptor acceptor) {\\n String _plus = (\\\"Remove list item named\\\" + \\\" \\\");\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String _plus_1 = (_plus + _get);\\n final ISemanticModification _function = new ISemanticModification() {\\n public void apply(final EObject element, final IModificationContext context) throws Exception {\\n ListItem outerList = ((ListItem) element);\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String itemName = ((String) _get);\\n EList list = outerList.getItemReferences();\\n Iterator iter = list.iterator();\\n ListItem lastItem = ((ListItem) null);\\n boolean _hasNext = iter.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n ListItem item = iter.next();\\n String _name = item.getName();\\n boolean _equals = _name.equals(itemName);\\n if (_equals) {\\n lastItem = item;\\n }\\n }\\n boolean _hasNext_1 = iter.hasNext();\\n _while = _hasNext_1;\\n }\\n boolean _notEquals = (!Objects.equal(lastItem, null));\\n if (_notEquals) {\\n list.remove(lastItem);\\n }\\n }\\n };\\n acceptor.accept(issue, \\n \\\"Remove duplicated list item\\\", _plus_1, \\n \\\"obj16/listitem.gif\\\", _function);\\n }\\n \\n @Fix(IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM)\\n public void removeModelItem(final Issue issue, final IssueResolutionAcceptor acceptor) {\\n String _plus = (\\\"Remove model item named\\\" + \\\" \\\");\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String _plus_1 = (_plus + _get);\\n final ISemanticModification _function = new ISemanticModification() {\\n public void apply(final EObject element, final IModificationContext context) throws Exception {\\n ListItem outerList = ((ListItem) element);\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String itemName = ((String) _get);\\n EList list = outerList.getModelReferences();\\n Iterator iter = list.iterator();\\n ModelItem lastItem = ((ModelItem) null);\\n boolean _hasNext = iter.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n ModelItem item = iter.next();\\n String _name = item.getName();\\n boolean _equals = _name.equals(itemName);\\n if (_equals) {\\n lastItem = item;\\n }\\n }\\n boolean _hasNext_1 = iter.hasNext();\\n _while = _hasNext_1;\\n }\\n boolean _notEquals = (!Objects.equal(lastItem, null));\\n if (_notEquals) {\\n list.remove(lastItem);\\n }\\n }\\n };\\n acceptor.accept(issue, \\n \\\"Remove duplicated entry\\\", _plus_1, \\n \\\"obj16/modelitem.gif\\\", _function);\\n }\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"final Issue issue\",\n \" final IssueResolutionAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java\",\n \"implementation\": \"String _plus = (\\\"Remove intent named\\\" + \\\" \\\");\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String _plus_1 = (_plus + _get);\\n final ISemanticModification _function = new ISemanticModification() {\\n public void apply(final EObject element, final IModificationContext context) throws Exception {\\n Refinement container = ((Refinement) element);\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String itemName = ((String) _get);\\n EList list = container.getIntents();\\n Iterator iter = list.iterator();\\n Intent lastItem = ((Intent) null);\\n boolean _hasNext = iter.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n Intent item = iter.next();\\n String _name = item.getName();\\n boolean _equals = _name.equals(itemName);\\n if (_equals) {\\n lastItem = item;\",\n \"signature\": \"void removeIntent(final Issue issue, final IssueResolutionAcceptor acceptor)\"\n },\n {\n \"arguments\": [\n \"final Issue issue\",\n \" final IssueResolutionAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java\",\n \"implementation\": \"String _plus = (\\\"Remove decomposition named\\\" + \\\" \\\");\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String _plus_1 = (_plus + _get);\\n final ISemanticModification _function = new ISemanticModification() {\\n public void apply(final EObject element, final IModificationContext context) throws Exception {\\n Intent container = ((Intent) element);\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String itemName = ((String) _get);\\n EList list = container.getDecompositions();\\n Iterator iter = list.iterator();\\n Decomposition lastItem = ((Decomposition) null);\\n boolean _hasNext = iter.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n Decomposition _next = iter.next();\\n Decomposition item = ((Decomposition) _next);\\n String _name = item.getName();\\n boolean _equals = _name.equals(itemName);\\n if (_equals) {\\n lastItem = item;\",\n \"signature\": \"void removeDecomposition(final Issue issue, final IssueResolutionAcceptor acceptor)\"\n },\n {\n \"arguments\": [\n \"final Issue issue\",\n \" final IssueResolutionAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java\",\n \"implementation\": \"String _plus = (\\\"Remove list item named\\\" + \\\" \\\");\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String _plus_1 = (_plus + _get);\\n final ISemanticModification _function = new ISemanticModification() {\\n public void apply(final EObject element, final IModificationContext context) throws Exception {\\n ListItem outerList = ((ListItem) element);\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String itemName = ((String) _get);\\n EList list = outerList.getItemReferences();\\n Iterator iter = list.iterator();\\n ListItem lastItem = ((ListItem) null);\\n boolean _hasNext = iter.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n ListItem item = iter.next();\\n String _name = item.getName();\\n boolean _equals = _name.equals(itemName);\\n if (_equals) {\\n lastItem = item;\",\n \"signature\": \"void removeListItem(final Issue issue, final IssueResolutionAcceptor acceptor)\"\n },\n {\n \"arguments\": [\n \"final Issue issue\",\n \" final IssueResolutionAcceptor acceptor\"\n ],\n \"filename\": \"net.certware.intent.ui/xtend-gen/net/certware/intent/ui/quickfix/IntentSpecificationQuickfixProvider.java\",\n \"implementation\": \"String _plus = (\\\"Remove model item named\\\" + \\\" \\\");\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String _plus_1 = (_plus + _get);\\n final ISemanticModification _function = new ISemanticModification() {\\n public void apply(final EObject element, final IModificationContext context) throws Exception {\\n ListItem outerList = ((ListItem) element);\\n String[] _data = issue.getData();\\n String _get = _data[0];\\n String itemName = ((String) _get);\\n EList list = outerList.getModelReferences();\\n Iterator iter = list.iterator();\\n ModelItem lastItem = ((ModelItem) null);\\n boolean _hasNext = iter.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n ModelItem item = iter.next();\\n String _name = item.getName();\\n boolean _equals = _name.equals(itemName);\\n if (_equals) {\\n lastItem = item;\",\n \"signature\": \"void removeModelItem(final Issue issue, final IssueResolutionAcceptor acceptor)\"\n }\n ],\n \"old_code\": \" * generated by Xtext\\n * \\n * see http://www.eclipse.org/Xtext/documentation.html#quickfixes\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,15 +1,199 @@\\n /**\\n- * generated by Xtext\\n+ * NOT generated by Xtext\\n */\\n package net.certware.intent.ui.quickfix;\\n \\n+import com.google.common.base.Objects;\\n+import java.util.Iterator;\\n+import net.certware.intent.intentSpecification.Decomposition;\\n+import net.certware.intent.intentSpecification.Intent;\\n+import net.certware.intent.intentSpecification.ListItem;\\n+import net.certware.intent.intentSpecification.ModelItem;\\n+import net.certware.intent.intentSpecification.Refinement;\\n+import net.certware.intent.validation.IntentSpecificationValidator;\\n+import org.eclipse.emf.common.util.EList;\\n+import org.eclipse.emf.ecore.EObject;\\n+import org.eclipse.xtext.ui.editor.model.edit.IModificationContext;\\n+import org.eclipse.xtext.ui.editor.model.edit.ISemanticModification;\\n import org.eclipse.xtext.ui.editor.quickfix.DefaultQuickfixProvider;\\n+import org.eclipse.xtext.ui.editor.quickfix.Fix;\\n+import org.eclipse.xtext.ui.editor.quickfix.IssueResolutionAcceptor;\\n+import org.eclipse.xtext.validation.Issue;\\n \\n /**\\n * Custom quickfixes.\\n- * \\n- * see http://www.eclipse.org/Xtext/documentation.html#quickfixes\\n+ * @see http://www.eclipse.org/Xtext/documentation.html#quickfixes\\n+ * @author mrb@certware.net\\n */\\n @SuppressWarnings(\\\"all\\\")\\n public class IntentSpecificationQuickfixProvider extends DefaultQuickfixProvider {\\n+ /**\\n+ * Fix duplicated intent entries by removing one.\\n+ */\\n+ @Fix(IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT)\\n+ public void removeIntent(final Issue issue, final IssueResolutionAcceptor acceptor) {\\n+ String _plus = (\\\"Remove intent named\\\" + \\\" \\\");\\n+ String[] _data = issue.getData();\\n+ String _get = _data[0];\\n+ String _plus_1 = (_plus + _get);\\n+ final ISemanticModification _function = new ISemanticModification() {\\n+ public void apply(final EObject element, final IModificationContext context) throws Exception {\\n+ Refinement container = ((Refinement) element);\\n+ String[] _data = issue.getData();\\n+ String _get = _data[0];\\n+ String itemName = ((String) _get);\\n+ EList list = container.getIntents();\\n+ Iterator iter = list.iterator();\\n+ Intent lastItem = ((Intent) null);\\n+ boolean _hasNext = iter.hasNext();\\n+ boolean _while = _hasNext;\\n+ while (_while) {\\n+ {\\n+ Intent item = iter.next();\\n+ String _name = item.getName();\\n+ boolean _equals = _name.equals(itemName);\\n+ if (_equals) {\\n+ lastItem = item;\\n+ }\\n+ }\\n+ boolean _hasNext_1 = iter.hasNext();\\n+ _while = _hasNext_1;\\n+ }\\n+ boolean _notEquals = (!Objects.equal(lastItem, null));\\n+ if (_notEquals) {\\n+ list.remove(lastItem);\\n+ }\\n+ }\\n+ };\\n+ acceptor.accept(issue, \\n+ \\\"Remove duplicated entry\\\", _plus_1, \\n+ \\\"obj16/intent.gif\\\", _function);\\n+ }\\n+ \\n+ /**\\n+ * Fix duplicated intent entries by removing one.\\n+ */\\n+ @Fix(IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT)\\n+ public void removeDecomposition(final Issue issue, final IssueResolutionAcceptor acceptor) {\\n+ String _plus = (\\\"Remove decomposition named\\\" + \\\" \\\");\\n+ String[] _data = issue.getData();\\n+ String _get = _data[0];\\n+ String _plus_1 = (_plus + _get);\\n+ final ISemanticModification _function = new ISemanticModification() {\\n+ public void apply(final EObject element, final IModificationContext context) throws Exception {\\n+ Intent container = ((Intent) element);\\n+ String[] _data = issue.getData();\\n+ String _get = _data[0];\\n+ String itemName = ((String) _get);\\n+ EList list = container.getDecompositions();\\n+ Iterator iter = list.iterator();\\n+ Decomposition lastItem = ((Decomposition) null);\\n+ boolean _hasNext = iter.hasNext();\\n+ boolean _while = _hasNext;\\n+ while (_while) {\\n+ {\\n+ Decomposition _next = iter.next();\\n+ Decomposition item = ((Decomposition) _next);\\n+ String _name = item.getName();\\n+ boolean _equals = _name.equals(itemName);\\n+ if (_equals) {\\n+ lastItem = item;\\n+ }\\n+ }\\n+ boolean _hasNext_1 = iter.hasNext();\\n+ _while = _hasNext_1;\\n+ }\\n+ boolean _notEquals = (!Objects.equal(lastItem, null));\\n+ if (_notEquals) {\\n+ list.remove(lastItem);\\n+ }\\n+ }\\n+ };\\n+ acceptor.accept(issue, \\n+ \\\"Remove duplicated decomposition\\\", _plus_1, \\n+ \\\"obj16/decomposition.gif\\\", _function);\\n+ }\\n+ \\n+ /**\\n+ * Fix duplicated list entries by removing one.\\n+ */\\n+ @Fix(IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM)\\n+ public void removeListItem(final Issue issue, final IssueResolutionAcceptor acceptor) {\\n+ String _plus = (\\\"Remove list item named\\\" + \\\" \\\");\\n+ String[] _data = issue.getData();\\n+ String _get = _data[0];\\n+ String _plus_1 = (_plus + _get);\\n+ final ISemanticModification _function = new ISemanticModification() {\\n+ public void apply(final EObject element, final IModificationContext context) throws Exception {\\n+ ListItem outerList = ((ListItem) element);\\n+ String[] _data = issue.getData();\\n+ String _get = _data[0];\\n+ String itemName = ((String) _get);\\n+ EList list = outerList.getItemReferences();\\n+ Iterator iter = list.iterator();\\n+ ListItem lastItem = ((ListItem) null);\\n+ boolean _hasNext = iter.hasNext();\\n+ boolean _while = _hasNext;\\n+ while (_while) {\\n+ {\\n+ ListItem item = iter.next();\\n+ String _name = item.getName();\\n+ boolean _equals = _name.equals(itemName);\\n+ if (_equals) {\\n+ lastItem = item;\\n+ }\\n+ }\\n+ boolean _hasNext_1 = iter.hasNext();\\n+ _while = _hasNext_1;\\n+ }\\n+ boolean _notEquals = (!Objects.equal(lastItem, null));\\n+ if (_notEquals) {\\n+ list.remove(lastItem);\\n+ }\\n+ }\\n+ };\\n+ acceptor.accept(issue, \\n+ \\\"Remove duplicated list item\\\", _plus_1, \\n+ \\\"obj16/listitem.gif\\\", _function);\\n+ }\\n+ \\n+ @Fix(IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM)\\n+ public void removeModelItem(final Issue issue, final IssueResolutionAcceptor acceptor) {\\n+ String _plus = (\\\"Remove model item named\\\" + \\\" \\\");\\n+ String[] _data = issue.getData();\\n+ String _get = _data[0];\\n+ String _plus_1 = (_plus + _get);\\n+ final ISemanticModification _function = new ISemanticModification() {\\n+ public void apply(final EObject element, final IModificationContext context) throws Exception {\\n+ ListItem outerList = ((ListItem) element);\\n+ String[] _data = issue.getData();\\n+ String _get = _data[0];\\n+ String itemName = ((String) _get);\\n+ EList list = outerList.getModelReferences();\\n+ Iterator iter = list.iterator();\\n+ ModelItem lastItem = ((ModelItem) null);\\n+ boolean _hasNext = iter.hasNext();\\n+ boolean _while = _hasNext;\\n+ while (_while) {\\n+ {\\n+ ModelItem item = iter.next();\\n+ String _name = item.getName();\\n+ boolean _equals = _name.equals(itemName);\\n+ if (_equals) {\\n+ lastItem = item;\\n+ }\\n+ }\\n+ boolean _hasNext_1 = iter.hasNext();\\n+ _while = _hasNext_1;\\n+ }\\n+ boolean _notEquals = (!Objects.equal(lastItem, null));\\n+ if (_notEquals) {\\n+ list.remove(lastItem);\\n+ }\\n+ }\\n+ };\\n+ acceptor.accept(issue, \\n+ \\\"Remove duplicated entry\\\", _plus_1, \\n+ \\\"obj16/modelitem.gif\\\", _function);\\n+ }\\n }\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent.ui%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fui%2Fquickfix%2FIntentSpecificationQuickfixProvider.java\",\n \"sha\": \"b4d28f50087b281d599cf0e2ac7dcde57b03c15c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 32,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.ecore\",\n \"changes\": 44,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.ecore?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 12,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/IntentSpecification.ecore\",\n \"new_code\": \" \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \",\n \"new_methods\": [],\n \"old_code\": \" \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \",\n \"old_methods\": [],\n \"patch\": \"@@ -3,26 +3,31 @@\\n xmlns:ecore=\\\"http://www.eclipse.org/emf/2002/Ecore\\\" name=\\\"intentSpecification\\\" nsURI=\\\"http://www.certware.net/intent/IntentSpecification\\\"\\n nsPrefix=\\\"intentSpecification\\\">\\n \\n- \\n+ \\n \\n \\n \\n- \\n+ \\n \\n \\n \\n \\n- \\n- \\n+ \\n+ \\n \\n \\n \\n+ \\n+ \\n+ \\n \\n- \\n- \\n+ \\n+ \\n \\n \\n@@ -31,23 +36,38 @@\\n \\n \\n+ \\n+ \\n+ \\n \\n \\n \\n+ \\n+ \\n+ \\n \\n- \\n- \\n+ \\n+ \\n \\n \\n+ \\n+ \\n+ \\n \\n- \\n- \\n+ \\n+ \\n \\n \\n+ \\n+ \\n+ \\n \\n- \\n- \\n+ \\n+ \\n \\n \",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.ecore\",\n \"sha\": \"cddff653591222ff87c6f4aa003c852e2657f69d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 27,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.genmodel\",\n \"changes\": 39,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.genmodel?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 12,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/IntentSpecification.genmodel\",\n \"new_code\": \" \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \",\n \"new_methods\": [],\n \"old_code\": \" \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \",\n \"old_methods\": [],\n \"patch\": \"@@ -9,44 +9,59 @@\\n \\n \\n- \\n+ \\n \\n \\n \\n- \\n+ \\n \\n \\n \\n \\n- \\n- \\n+ \\n+ \\n \\n \\n \\n+ \\n+ \\n+ \\n \\n- \\n- \\n+ \\n+ \\n \\n \\n \\n \\n \\n+ \\n+ \\n+ \\n \\n \\n \\n+ \\n+ \\n+ \\n \\n- \\n- \\n+ \\n+ \\n \\n \\n+ \\n+ \\n+ \\n \\n- \\n- \\n+ \\n+ \\n \\n \\n+ \\n+ \\n+ \\n \\n- \\n- \\n+ \\n+ \\n \\n \\n \",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.genmodel\",\n \"sha\": \"9e5c3914e6ea6b49dca859fc23f99c66ff79e11e\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 20,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDecomposition.java\",\n \"changes\": 40,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDecomposition.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 20,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/Decomposition.java\",\n \"new_code\": \" *
          • {@link net.certware.intent.intentSpecification.Decomposition#getName Name}
            • \\n * Returns the value of the 'Type' containment reference.\\n * If the meaning of the 'Type' containment reference isn't clear,\\n * @return the value of the 'Type' containment reference.\\n * @see #setType(DecompositionType)\\n * @model containment=\\\"true\\\"\\n DecompositionType getType();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}' containment reference.\\n * @param value the new value of the 'Type' containment reference.\\n void setType(DecompositionType value);\\n * Returns the value of the 'Name' attribute.\\n * If the meaning of the 'Name' attribute isn't clear,\\n * @return the value of the 'Name' attribute.\\n * @see #setName(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Name()\\n String getName();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getName Name}' attribute.\\n * @param value the new value of the 'Name' attribute.\\n * @see #getName()\\n void setName(String value);\",\n \"new_methods\": [],\n \"old_code\": \" *
          • {@link net.certware.intent.intentSpecification.Decomposition#getId Id}
            • \\n * Returns the value of the 'Type' attribute.\\n * If the meaning of the 'Type' attribute isn't clear,\\n * @return the value of the 'Type' attribute.\\n * @see #setType(String)\\n * @model\\n String getType();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}' attribute.\\n * @param value the new value of the 'Type' attribute.\\n void setType(String value);\\n * Returns the value of the 'Id' attribute.\\n * If the meaning of the 'Id' attribute isn't clear,\\n * @return the value of the 'Id' attribute.\\n * @see #setId(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Id()\\n String getId();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getId Id}' attribute.\\n * @param value the new value of the 'Id' attribute.\\n * @see #getId()\\n void setId(String value);\",\n \"old_methods\": [],\n \"patch\": \"@@ -15,7 +15,7 @@\\n * The following features are supported:\\n *
              \\n *
            • {@link net.certware.intent.intentSpecification.Decomposition#getType Type}
              • \\n- *
            • {@link net.certware.intent.intentSpecification.Decomposition#getId Id}
              • \\n+ *
            • {@link net.certware.intent.intentSpecification.Decomposition#getName Name}
              • \\n *
            • {@link net.certware.intent.intentSpecification.Decomposition#getDesc Desc}
              • \\n *
            • {@link net.certware.intent.intentSpecification.Decomposition#getDocuments Documents}
              • \\n *
            • {@link net.certware.intent.intentSpecification.Decomposition#getModels Models}
              • \\n@@ -30,56 +30,56 @@\\n public interface Decomposition extends EObject\\n {\\n /**\\n- * Returns the value of the 'Type' attribute.\\n+ * Returns the value of the 'Type' containment reference.\\n * \\n *

              \\n- * If the meaning of the 'Type' attribute isn't clear,\\n+ * If the meaning of the 'Type' containment reference isn't clear,\\n * there really should be more of a description here...\\n *

              \\n * \\n- * @return the value of the 'Type' attribute.\\n- * @see #setType(String)\\n+ * @return the value of the 'Type' containment reference.\\n+ * @see #setType(DecompositionType)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Type()\\n- * @model\\n+ * @model containment=\\\"true\\\"\\n * @generated\\n */\\n- String getType();\\n+ DecompositionType getType();\\n \\n /**\\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}' attribute.\\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}' containment reference.\\n * \\n * \\n- * @param value the new value of the 'Type' attribute.\\n+ * @param value the new value of the 'Type' containment reference.\\n * @see #getType()\\n * @generated\\n */\\n- void setType(String value);\\n+ void setType(DecompositionType value);\\n \\n /**\\n- * Returns the value of the 'Id' attribute.\\n+ * Returns the value of the 'Name' attribute.\\n * \\n *

              \\n- * If the meaning of the 'Id' attribute isn't clear,\\n+ * If the meaning of the 'Name' attribute isn't clear,\\n * there really should be more of a description here...\\n *

              \\n * \\n- * @return the value of the 'Id' attribute.\\n- * @see #setId(String)\\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Id()\\n+ * @return the value of the 'Name' attribute.\\n+ * @see #setName(String)\\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDecomposition_Name()\\n * @model\\n * @generated\\n */\\n- String getId();\\n+ String getName();\\n \\n /**\\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getId Id}' attribute.\\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Decomposition#getName Name}' attribute.\\n * \\n * \\n- * @param value the new value of the 'Id' attribute.\\n- * @see #getId()\\n+ * @param value the new value of the 'Name' attribute.\\n+ * @see #getName()\\n * @generated\\n */\\n- void setId(String value);\\n+ void setName(String value);\\n \\n /**\\n * Returns the value of the 'Desc' attribute.\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDecomposition.java\",\n \"sha\": \"98f71982458d95d10e32701be8e35af734635926\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 20,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDocItem.java\",\n \"changes\": 40,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDocItem.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 20,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/DocItem.java\",\n \"new_code\": \" *
            • {@link net.certware.intent.intentSpecification.DocItem#getName Name}
              • \\n * Returns the value of the 'Type' containment reference.\\n * If the meaning of the 'Type' containment reference isn't clear,\\n * @return the value of the 'Type' containment reference.\\n * @see #setType(DocItemType)\\n * @model containment=\\\"true\\\"\\n DocItemType getType();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getType Type}' containment reference.\\n * @param value the new value of the 'Type' containment reference.\\n void setType(DocItemType value);\\n * Returns the value of the 'Name' attribute.\\n * If the meaning of the 'Name' attribute isn't clear,\\n * @return the value of the 'Name' attribute.\\n * @see #setName(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Name()\\n String getName();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getName Name}' attribute.\\n * @param value the new value of the 'Name' attribute.\\n * @see #getName()\\n void setName(String value);\",\n \"new_methods\": [],\n \"old_code\": \" *
            • {@link net.certware.intent.intentSpecification.DocItem#getId Id}
              • \\n * Returns the value of the 'Type' attribute.\\n * If the meaning of the 'Type' attribute isn't clear,\\n * @return the value of the 'Type' attribute.\\n * @see #setType(String)\\n * @model\\n String getType();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getType Type}' attribute.\\n * @param value the new value of the 'Type' attribute.\\n void setType(String value);\\n * Returns the value of the 'Id' attribute.\\n * If the meaning of the 'Id' attribute isn't clear,\\n * @return the value of the 'Id' attribute.\\n * @see #setId(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Id()\\n String getId();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getId Id}' attribute.\\n * @param value the new value of the 'Id' attribute.\\n * @see #getId()\\n void setId(String value);\",\n \"old_methods\": [],\n \"patch\": \"@@ -13,7 +13,7 @@\\n * The following features are supported:\\n *
                \\n *
              • {@link net.certware.intent.intentSpecification.DocItem#getType Type}
                • \\n- *
              • {@link net.certware.intent.intentSpecification.DocItem#getId Id}
                • \\n+ *
              • {@link net.certware.intent.intentSpecification.DocItem#getName Name}
                • \\n *
              • {@link net.certware.intent.intentSpecification.DocItem#getRef Ref}
                • \\n *
              \\n *

              \\n@@ -25,56 +25,56 @@\\n public interface DocItem extends EObject\\n {\\n /**\\n- * Returns the value of the 'Type' attribute.\\n+ * Returns the value of the 'Type' containment reference.\\n * \\n *

              \\n- * If the meaning of the 'Type' attribute isn't clear,\\n+ * If the meaning of the 'Type' containment reference isn't clear,\\n * there really should be more of a description here...\\n *

              \\n * \\n- * @return the value of the 'Type' attribute.\\n- * @see #setType(String)\\n+ * @return the value of the 'Type' containment reference.\\n+ * @see #setType(DocItemType)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Type()\\n- * @model\\n+ * @model containment=\\\"true\\\"\\n * @generated\\n */\\n- String getType();\\n+ DocItemType getType();\\n \\n /**\\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getType Type}' attribute.\\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getType Type}' containment reference.\\n * \\n * \\n- * @param value the new value of the 'Type' attribute.\\n+ * @param value the new value of the 'Type' containment reference.\\n * @see #getType()\\n * @generated\\n */\\n- void setType(String value);\\n+ void setType(DocItemType value);\\n \\n /**\\n- * Returns the value of the 'Id' attribute.\\n+ * Returns the value of the 'Name' attribute.\\n * \\n *

              \\n- * If the meaning of the 'Id' attribute isn't clear,\\n+ * If the meaning of the 'Name' attribute isn't clear,\\n * there really should be more of a description here...\\n *

              \\n * \\n- * @return the value of the 'Id' attribute.\\n- * @see #setId(String)\\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Id()\\n+ * @return the value of the 'Name' attribute.\\n+ * @see #setName(String)\\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getDocItem_Name()\\n * @model\\n * @generated\\n */\\n- String getId();\\n+ String getName();\\n \\n /**\\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getId Id}' attribute.\\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.DocItem#getName Name}' attribute.\\n * \\n * \\n- * @param value the new value of the 'Id' attribute.\\n- * @see #getId()\\n+ * @param value the new value of the 'Name' attribute.\\n+ * @see #getName()\\n * @generated\\n */\\n- void setId(String value);\\n+ void setName(String value);\\n \\n /**\\n * Returns the value of the 'Ref' attribute.\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FDocItem.java\",\n \"sha\": \"4575af3ab69ca85d66d4190c97f0825bcf08246c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 20,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntent.java\",\n \"changes\": 40,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntent.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 20,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/Intent.java\",\n \"new_code\": \" *
            • {@link net.certware.intent.intentSpecification.Intent#getName Name}
              • \\n * Returns the value of the 'Type' containment reference.\\n * If the meaning of the 'Type' containment reference isn't clear,\\n * @return the value of the 'Type' containment reference.\\n * @see #setType(IntentType)\\n * @model containment=\\\"true\\\"\\n IntentType getType();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getType Type}' containment reference.\\n * @param value the new value of the 'Type' containment reference.\\n void setType(IntentType value);\\n * Returns the value of the 'Name' attribute.\\n * If the meaning of the 'Name' attribute isn't clear,\\n * @return the value of the 'Name' attribute.\\n * @see #setName(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Name()\\n String getName();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getName Name}' attribute.\\n * @param value the new value of the 'Name' attribute.\\n * @see #getName()\\n void setName(String value);\",\n \"new_methods\": [],\n \"old_code\": \" *
            • {@link net.certware.intent.intentSpecification.Intent#getId Id}
              • \\n * Returns the value of the 'Type' attribute.\\n * If the meaning of the 'Type' attribute isn't clear,\\n * @return the value of the 'Type' attribute.\\n * @see #setType(String)\\n * @model\\n String getType();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getType Type}' attribute.\\n * @param value the new value of the 'Type' attribute.\\n void setType(String value);\\n * Returns the value of the 'Id' attribute.\\n * If the meaning of the 'Id' attribute isn't clear,\\n * @return the value of the 'Id' attribute.\\n * @see #setId(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Id()\\n String getId();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getId Id}' attribute.\\n * @param value the new value of the 'Id' attribute.\\n * @see #getId()\\n void setId(String value);\",\n \"old_methods\": [],\n \"patch\": \"@@ -15,7 +15,7 @@\\n * The following features are supported:\\n *
                \\n *
              • {@link net.certware.intent.intentSpecification.Intent#getType Type}
                • \\n- *
              • {@link net.certware.intent.intentSpecification.Intent#getId Id}
                • \\n+ *
              • {@link net.certware.intent.intentSpecification.Intent#getName Name}
                • \\n *
              • {@link net.certware.intent.intentSpecification.Intent#getDesc Desc}
                • \\n *
              • {@link net.certware.intent.intentSpecification.Intent#getDecompositions Decompositions}
                • \\n *
              \\n@@ -28,56 +28,56 @@\\n public interface Intent extends EObject\\n {\\n /**\\n- * Returns the value of the 'Type' attribute.\\n+ * Returns the value of the 'Type' containment reference.\\n * \\n *

              \\n- * If the meaning of the 'Type' attribute isn't clear,\\n+ * If the meaning of the 'Type' containment reference isn't clear,\\n * there really should be more of a description here...\\n *

              \\n * \\n- * @return the value of the 'Type' attribute.\\n- * @see #setType(String)\\n+ * @return the value of the 'Type' containment reference.\\n+ * @see #setType(IntentType)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Type()\\n- * @model\\n+ * @model containment=\\\"true\\\"\\n * @generated\\n */\\n- String getType();\\n+ IntentType getType();\\n \\n /**\\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getType Type}' attribute.\\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getType Type}' containment reference.\\n * \\n * \\n- * @param value the new value of the 'Type' attribute.\\n+ * @param value the new value of the 'Type' containment reference.\\n * @see #getType()\\n * @generated\\n */\\n- void setType(String value);\\n+ void setType(IntentType value);\\n \\n /**\\n- * Returns the value of the 'Id' attribute.\\n+ * Returns the value of the 'Name' attribute.\\n * \\n *

              \\n- * If the meaning of the 'Id' attribute isn't clear,\\n+ * If the meaning of the 'Name' attribute isn't clear,\\n * there really should be more of a description here...\\n *

              \\n * \\n- * @return the value of the 'Id' attribute.\\n- * @see #setId(String)\\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Id()\\n+ * @return the value of the 'Name' attribute.\\n+ * @see #setName(String)\\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getIntent_Name()\\n * @model\\n * @generated\\n */\\n- String getId();\\n+ String getName();\\n \\n /**\\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getId Id}' attribute.\\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Intent#getName Name}' attribute.\\n * \\n * \\n- * @param value the new value of the 'Id' attribute.\\n- * @see #getId()\\n+ * @param value the new value of the 'Name' attribute.\\n+ * @see #getName()\\n * @generated\\n */\\n- void setId(String value);\\n+ void setName(String value);\\n \\n /**\\n * Returns the value of the 'Desc' attribute.\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntent.java\",\n \"sha\": \"183b90ab1821495c327905917801b010015ecfb6\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 45,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationFactory.java\",\n \"changes\": 45,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationFactory.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 0,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/IntentSpecificationFactory.java\",\n \"new_code\": \" /**\\n * Returns a new object of class 'Intent Type'.\\n * \\n * \\n * @return a new object of class 'Intent Type'.\\n * @generated\\n */\\n IntentType createIntentType();\\n\\n /**\\n * Returns a new object of class 'Decomposition Type'.\\n * \\n * \\n * @return a new object of class 'Decomposition Type'.\\n * @generated\\n */\\n DecompositionType createDecompositionType();\\n\\n /**\\n * Returns a new object of class 'Doc Item Type'.\\n * \\n * \\n * @return a new object of class 'Doc Item Type'.\\n * @generated\\n */\\n DocItemType createDocItemType();\\n\\n /**\\n * Returns a new object of class 'Model Type'.\\n * \\n * \\n * @return a new object of class 'Model Type'.\\n * @generated\\n */\\n ModelType createModelType();\\n\\n /**\\n * Returns a new object of class 'List Item Type'.\\n * \\n * \\n * @return a new object of class 'List Item Type'.\\n * @generated\\n */\\n ListItemType createListItemType();\\n\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -49,6 +49,15 @@ public interface IntentSpecificationFactory extends EFactory\\n */\\n Intent createIntent();\\n \\n+ /**\\n+ * Returns a new object of class 'Intent Type'.\\n+ * \\n+ * \\n+ * @return a new object of class 'Intent Type'.\\n+ * @generated\\n+ */\\n+ IntentType createIntentType();\\n+\\n /**\\n * Returns a new object of class 'Decomposition'.\\n * \\n@@ -58,6 +67,15 @@ public interface IntentSpecificationFactory extends EFactory\\n */\\n Decomposition createDecomposition();\\n \\n+ /**\\n+ * Returns a new object of class 'Decomposition Type'.\\n+ * \\n+ * \\n+ * @return a new object of class 'Decomposition Type'.\\n+ * @generated\\n+ */\\n+ DecompositionType createDecompositionType();\\n+\\n /**\\n * Returns a new object of class 'Document'.\\n * \\n@@ -67,6 +85,15 @@ public interface IntentSpecificationFactory extends EFactory\\n */\\n Document createDocument();\\n \\n+ /**\\n+ * Returns a new object of class 'Doc Item Type'.\\n+ * \\n+ * \\n+ * @return a new object of class 'Doc Item Type'.\\n+ * @generated\\n+ */\\n+ DocItemType createDocItemType();\\n+\\n /**\\n * Returns a new object of class 'Doc Item'.\\n * \\n@@ -76,6 +103,15 @@ public interface IntentSpecificationFactory extends EFactory\\n */\\n DocItem createDocItem();\\n \\n+ /**\\n+ * Returns a new object of class 'Model Type'.\\n+ * \\n+ * \\n+ * @return a new object of class 'Model Type'.\\n+ * @generated\\n+ */\\n+ ModelType createModelType();\\n+\\n /**\\n * Returns a new object of class 'Model Item'.\\n * \\n@@ -85,6 +121,15 @@ public interface IntentSpecificationFactory extends EFactory\\n */\\n ModelItem createModelItem();\\n \\n+ /**\\n+ * Returns a new object of class 'List Item Type'.\\n+ * \\n+ * \\n+ * @return a new object of class 'List Item Type'.\\n+ * @generated\\n+ */\\n+ ListItemType createListItemType();\\n+\\n /**\\n * Returns a new object of class 'List Item'.\\n * \",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationFactory.java\",\n \"sha\": \"3ec7f532719ab204c89e50c25ce52cdfecf21e4b\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 426,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationPackage.java\",\n \"changes\": 517,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationPackage.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 91,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/IntentSpecificationPackage.java\",\n \"new_code\": \" * The feature id for the 'Name' attribute.\\n int SPECIFICATION__NAME = 0;\\n * The feature id for the 'Name' attribute.\\n int REFINEMENT__NAME = 0;\\n * The feature id for the 'Type' containment reference.\\n * The feature id for the 'Name' attribute.\\n int INTENT__NAME = 1;\\n /**\\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.IntentTypeImpl Intent Type}' class.\\n * \\n * \\n * @see net.certware.intent.intentSpecification.impl.IntentTypeImpl\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getIntentType()\\n * @generated\\n */\\n int INTENT_TYPE = 3;\\n\\n /**\\n * The feature id for the 'Type Name' attribute.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n int INTENT_TYPE__TYPE_NAME = 0;\\n\\n /**\\n * The number of structural features of the 'Intent Type' class.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n int INTENT_TYPE_FEATURE_COUNT = 1;\\n\\n int DECOMPOSITION = 4;\\n * The feature id for the 'Type' containment reference.\\n * The feature id for the 'Name' attribute.\\n int DECOMPOSITION__NAME = 1;\\n /**\\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DecompositionTypeImpl Decomposition Type}' class.\\n * \\n * \\n * @see net.certware.intent.intentSpecification.impl.DecompositionTypeImpl\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecompositionType()\\n * @generated\\n */\\n int DECOMPOSITION_TYPE = 5;\\n\\n /**\\n * The feature id for the 'Type Name' attribute.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n int DECOMPOSITION_TYPE__TYPE_NAME = 0;\\n\\n /**\\n * The number of structural features of the 'Decomposition Type' class.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n int DECOMPOSITION_TYPE_FEATURE_COUNT = 1;\\n\\n int DOCUMENT = 6;\\n /**\\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DocItemTypeImpl Doc Item Type}' class.\\n * \\n * \\n * @see net.certware.intent.intentSpecification.impl.DocItemTypeImpl\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItemType()\\n * @generated\\n */\\n int DOC_ITEM_TYPE = 7;\\n\\n /**\\n * The feature id for the 'Type Name' attribute.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n int DOC_ITEM_TYPE__TYPE_NAME = 0;\\n\\n /**\\n * The number of structural features of the 'Doc Item Type' class.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n int DOC_ITEM_TYPE_FEATURE_COUNT = 1;\\n\\n int DOC_ITEM = 8;\\n * The feature id for the 'Type' containment reference.\\n * The feature id for the 'Name' attribute.\\n int DOC_ITEM__NAME = 1;\\n /**\\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ModelTypeImpl Model Type}' class.\\n * \\n * \\n * @see net.certware.intent.intentSpecification.impl.ModelTypeImpl\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelType()\\n * @generated\\n */\\n int MODEL_TYPE = 9;\\n\\n /**\\n * The feature id for the 'Type Name' attribute.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n int MODEL_TYPE__TYPE_NAME = 0;\\n\\n /**\\n * The number of structural features of the 'Model Type' class.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n int MODEL_TYPE_FEATURE_COUNT = 1;\\n\\n int MODEL_ITEM = 10;\\n * The feature id for the 'Type' containment reference.\\n * The feature id for the 'Name' attribute.\\n int MODEL_ITEM__NAME = 1;\\n /**\\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ListItemTypeImpl List Item Type}' class.\\n * \\n * \\n * @see net.certware.intent.intentSpecification.impl.ListItemTypeImpl\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItemType()\\n * @generated\\n */\\n int LIST_ITEM_TYPE = 11;\\n\\n /**\\n * The feature id for the 'Type Name' attribute.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n int LIST_ITEM_TYPE__TYPE_NAME = 0;\\n\\n /**\\n * The number of structural features of the 'List Item Type' class.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n int LIST_ITEM_TYPE_FEATURE_COUNT = 1;\\n\\n int LIST_ITEM = 12;\\n * The feature id for the 'Type' containment reference.\\n * The feature id for the 'Name' attribute.\\n int LIST_ITEM__NAME = 1;\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Specification#getName Name}'.\\n * @return the meta object for the attribute 'Name'.\\n * @see net.certware.intent.intentSpecification.Specification#getName()\\n EAttribute getSpecification_Name();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getName Name}'.\\n * @return the meta object for the attribute 'Name'.\\n * @see net.certware.intent.intentSpecification.Refinement#getName()\\n EAttribute getRefinement_Name();\\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.Intent#getType Type}'.\\n * @return the meta object for the containment reference 'Type'.\\n EReference getIntent_Type();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getName Name}'.\\n * @return the meta object for the attribute 'Name'.\\n * @see net.certware.intent.intentSpecification.Intent#getName()\\n EAttribute getIntent_Name();\\n /**\\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.IntentType Intent Type}'.\\n * \\n * \\n * @return the meta object for class 'Intent Type'.\\n * @see net.certware.intent.intentSpecification.IntentType\\n * @generated\\n */\\n EClass getIntentType();\\n\\n /**\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.IntentType#getTypeName Type Name}'.\\n * \\n * \\n * @return the meta object for the attribute 'Type Name'.\\n * @see net.certware.intent.intentSpecification.IntentType#getTypeName()\\n * @see #getIntentType()\\n * @generated\\n */\\n EAttribute getIntentType_TypeName();\\n\\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}'.\\n * @return the meta object for the containment reference 'Type'.\\n EReference getDecomposition_Type();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getName Name}'.\\n * @return the meta object for the attribute 'Name'.\\n * @see net.certware.intent.intentSpecification.Decomposition#getName()\\n EAttribute getDecomposition_Name();\\n /**\\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DecompositionType Decomposition Type}'.\\n * \\n * \\n * @return the meta object for class 'Decomposition Type'.\\n * @see net.certware.intent.intentSpecification.DecompositionType\\n * @generated\\n */\\n EClass getDecompositionType();\\n\\n /**\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DecompositionType#getTypeName Type Name}'.\\n * \\n * \\n * @return the meta object for the attribute 'Type Name'.\\n * @see net.certware.intent.intentSpecification.DecompositionType#getTypeName()\\n * @see #getDecompositionType()\\n * @generated\\n */\\n EAttribute getDecompositionType_TypeName();\\n\\n /**\\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DocItemType Doc Item Type}'.\\n * \\n * \\n * @return the meta object for class 'Doc Item Type'.\\n * @see net.certware.intent.intentSpecification.DocItemType\\n * @generated\\n */\\n EClass getDocItemType();\\n\\n /**\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItemType#getTypeName Type Name}'.\\n * \\n * \\n * @return the meta object for the attribute 'Type Name'.\\n * @see net.certware.intent.intentSpecification.DocItemType#getTypeName()\\n * @see #getDocItemType()\\n * @generated\\n */\\n EAttribute getDocItemType_TypeName();\\n\\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.DocItem#getType Type}'.\\n * @return the meta object for the containment reference 'Type'.\\n EReference getDocItem_Type();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getName Name}'.\\n * @return the meta object for the attribute 'Name'.\\n * @see net.certware.intent.intentSpecification.DocItem#getName()\\n EAttribute getDocItem_Name();\\n /**\\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ModelType Model Type}'.\\n * \\n * \\n * @return the meta object for class 'Model Type'.\\n * @see net.certware.intent.intentSpecification.ModelType\\n * @generated\\n */\\n EClass getModelType();\\n\\n /**\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelType#getTypeName Type Name}'.\\n * \\n * \\n * @return the meta object for the attribute 'Type Name'.\\n * @see net.certware.intent.intentSpecification.ModelType#getTypeName()\\n * @see #getModelType()\\n * @generated\\n */\\n EAttribute getModelType_TypeName();\\n\\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}'.\\n * @return the meta object for the containment reference 'Type'.\\n EReference getModelItem_Type();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getName Name}'.\\n * @return the meta object for the attribute 'Name'.\\n * @see net.certware.intent.intentSpecification.ModelItem#getName()\\n EAttribute getModelItem_Name();\\n /**\\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ListItemType List Item Type}'.\\n * \\n * \\n * @return the meta object for class 'List Item Type'.\\n * @see net.certware.intent.intentSpecification.ListItemType\\n * @generated\\n */\\n EClass getListItemType();\\n\\n /**\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItemType#getTypeName Type Name}'.\\n * \\n * \\n * @return the meta object for the attribute 'Type Name'.\\n * @see net.certware.intent.intentSpecification.ListItemType#getTypeName()\\n * @see #getListItemType()\\n * @generated\\n */\\n EAttribute getListItemType_TypeName();\\n\\n * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.ListItem#getType Type}'.\\n * @return the meta object for the containment reference 'Type'.\\n EReference getListItem_Type();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getName Name}'.\\n * @return the meta object for the attribute 'Name'.\\n * @see net.certware.intent.intentSpecification.ListItem#getName()\\n EAttribute getListItem_Name();\\n * The meta object literal for the 'Name' attribute feature.\\n EAttribute SPECIFICATION__NAME = eINSTANCE.getSpecification_Name();\\n * The meta object literal for the 'Name' attribute feature.\\n EAttribute REFINEMENT__NAME = eINSTANCE.getRefinement_Name();\\n * The meta object literal for the 'Type' containment reference feature.\\n EReference INTENT__TYPE = eINSTANCE.getIntent_Type();\\n * The meta object literal for the 'Name' attribute feature.\\n EAttribute INTENT__NAME = eINSTANCE.getIntent_Name();\\n /**\\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.IntentTypeImpl Intent Type}' class.\\n * \\n * \\n * @see net.certware.intent.intentSpecification.impl.IntentTypeImpl\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getIntentType()\\n * @generated\\n */\\n EClass INTENT_TYPE = eINSTANCE.getIntentType();\\n\\n /**\\n * The meta object literal for the 'Type Name' attribute feature.\\n * \\n * \\n * @generated\\n */\\n EAttribute INTENT_TYPE__TYPE_NAME = eINSTANCE.getIntentType_TypeName();\\n\\n * The meta object literal for the 'Type' containment reference feature.\\n EReference DECOMPOSITION__TYPE = eINSTANCE.getDecomposition_Type();\\n * The meta object literal for the 'Name' attribute feature.\\n EAttribute DECOMPOSITION__NAME = eINSTANCE.getDecomposition_Name();\\n /**\\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DecompositionTypeImpl Decomposition Type}' class.\\n * \\n * \\n * @see net.certware.intent.intentSpecification.impl.DecompositionTypeImpl\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecompositionType()\\n * @generated\\n */\\n EClass DECOMPOSITION_TYPE = eINSTANCE.getDecompositionType();\\n\\n /**\\n * The meta object literal for the 'Type Name' attribute feature.\\n * \\n * \\n * @generated\\n */\\n EAttribute DECOMPOSITION_TYPE__TYPE_NAME = eINSTANCE.getDecompositionType_TypeName();\\n\\n /**\\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DocItemTypeImpl Doc Item Type}' class.\\n * \\n * \\n * @see net.certware.intent.intentSpecification.impl.DocItemTypeImpl\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItemType()\\n * @generated\\n */\\n EClass DOC_ITEM_TYPE = eINSTANCE.getDocItemType();\\n\\n /**\\n * The meta object literal for the 'Type Name' attribute feature.\\n * \\n * \\n * @generated\\n */\\n EAttribute DOC_ITEM_TYPE__TYPE_NAME = eINSTANCE.getDocItemType_TypeName();\\n\\n * The meta object literal for the 'Type' containment reference feature.\\n EReference DOC_ITEM__TYPE = eINSTANCE.getDocItem_Type();\\n * The meta object literal for the 'Name' attribute feature.\\n EAttribute DOC_ITEM__NAME = eINSTANCE.getDocItem_Name();\\n /**\\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ModelTypeImpl Model Type}' class.\\n * \\n * \\n * @see net.certware.intent.intentSpecification.impl.ModelTypeImpl\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelType()\\n * @generated\\n */\\n EClass MODEL_TYPE = eINSTANCE.getModelType();\\n\\n /**\\n * The meta object literal for the 'Type Name' attribute feature.\\n * \\n * \\n * @generated\\n */\\n EAttribute MODEL_TYPE__TYPE_NAME = eINSTANCE.getModelType_TypeName();\\n\\n * The meta object literal for the 'Type' containment reference feature.\\n EReference MODEL_ITEM__TYPE = eINSTANCE.getModelItem_Type();\\n * The meta object literal for the 'Name' attribute feature.\\n EAttribute MODEL_ITEM__NAME = eINSTANCE.getModelItem_Name();\\n /**\\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ListItemTypeImpl List Item Type}' class.\\n * \\n * \\n * @see net.certware.intent.intentSpecification.impl.ListItemTypeImpl\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItemType()\\n * @generated\\n */\\n EClass LIST_ITEM_TYPE = eINSTANCE.getListItemType();\\n\\n /**\\n * The meta object literal for the 'Type Name' attribute feature.\\n * \\n * \\n * @generated\\n */\\n EAttribute LIST_ITEM_TYPE__TYPE_NAME = eINSTANCE.getListItemType_TypeName();\\n\\n * The meta object literal for the 'Type' containment reference feature.\\n EReference LIST_ITEM__TYPE = eINSTANCE.getListItem_Type();\\n * The meta object literal for the 'Name' attribute feature.\\n EAttribute LIST_ITEM__NAME = eINSTANCE.getListItem_Name();\",\n \"new_methods\": [],\n \"old_code\": \" * The feature id for the 'Id' attribute.\\n int SPECIFICATION__ID = 0;\\n * The feature id for the 'Id' attribute.\\n int REFINEMENT__ID = 0;\\n * The feature id for the 'Type' attribute.\\n * The feature id for the 'Id' attribute.\\n int INTENT__ID = 1;\\n int DECOMPOSITION = 3;\\n * The feature id for the 'Type' attribute.\\n * The feature id for the 'Id' attribute.\\n int DECOMPOSITION__ID = 1;\\n int DOCUMENT = 4;\\n int DOC_ITEM = 5;\\n * The feature id for the 'Type' attribute.\\n * The feature id for the 'Id' attribute.\\n int DOC_ITEM__ID = 1;\\n int MODEL_ITEM = 6;\\n * The feature id for the 'Type' attribute.\\n * The feature id for the 'Id' attribute.\\n int MODEL_ITEM__ID = 1;\\n int LIST_ITEM = 7;\\n * The feature id for the 'Type' attribute.\\n * The feature id for the 'Id' attribute.\\n int LIST_ITEM__ID = 1;\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Specification#getId Id}'.\\n * @return the meta object for the attribute 'Id'.\\n * @see net.certware.intent.intentSpecification.Specification#getId()\\n EAttribute getSpecification_Id();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getId Id}'.\\n * @return the meta object for the attribute 'Id'.\\n * @see net.certware.intent.intentSpecification.Refinement#getId()\\n EAttribute getRefinement_Id();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getType Type}'.\\n * @return the meta object for the attribute 'Type'.\\n EAttribute getIntent_Type();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getId Id}'.\\n * @return the meta object for the attribute 'Id'.\\n * @see net.certware.intent.intentSpecification.Intent#getId()\\n EAttribute getIntent_Id();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}'.\\n * @return the meta object for the attribute 'Type'.\\n EAttribute getDecomposition_Type();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getId Id}'.\\n * @return the meta object for the attribute 'Id'.\\n * @see net.certware.intent.intentSpecification.Decomposition#getId()\\n EAttribute getDecomposition_Id();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getType Type}'.\\n * @return the meta object for the attribute 'Type'.\\n EAttribute getDocItem_Type();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getId Id}'.\\n * @return the meta object for the attribute 'Id'.\\n * @see net.certware.intent.intentSpecification.DocItem#getId()\\n EAttribute getDocItem_Id();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}'.\\n * @return the meta object for the attribute 'Type'.\\n EAttribute getModelItem_Type();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getId Id}'.\\n * @return the meta object for the attribute 'Id'.\\n * @see net.certware.intent.intentSpecification.ModelItem#getId()\\n EAttribute getModelItem_Id();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getType Type}'.\\n * @return the meta object for the attribute 'Type'.\\n EAttribute getListItem_Type();\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getId Id}'.\\n * @return the meta object for the attribute 'Id'.\\n * @see net.certware.intent.intentSpecification.ListItem#getId()\\n EAttribute getListItem_Id();\\n * The meta object literal for the 'Id' attribute feature.\\n EAttribute SPECIFICATION__ID = eINSTANCE.getSpecification_Id();\\n * The meta object literal for the 'Id' attribute feature.\\n EAttribute REFINEMENT__ID = eINSTANCE.getRefinement_Id();\\n * The meta object literal for the 'Type' attribute feature.\\n EAttribute INTENT__TYPE = eINSTANCE.getIntent_Type();\\n * The meta object literal for the 'Id' attribute feature.\\n EAttribute INTENT__ID = eINSTANCE.getIntent_Id();\\n * The meta object literal for the 'Type' attribute feature.\\n EAttribute DECOMPOSITION__TYPE = eINSTANCE.getDecomposition_Type();\\n * The meta object literal for the 'Id' attribute feature.\\n EAttribute DECOMPOSITION__ID = eINSTANCE.getDecomposition_Id();\\n * The meta object literal for the 'Type' attribute feature.\\n EAttribute DOC_ITEM__TYPE = eINSTANCE.getDocItem_Type();\\n * The meta object literal for the 'Id' attribute feature.\\n EAttribute DOC_ITEM__ID = eINSTANCE.getDocItem_Id();\\n * The meta object literal for the 'Type' attribute feature.\\n EAttribute MODEL_ITEM__TYPE = eINSTANCE.getModelItem_Type();\\n * The meta object literal for the 'Id' attribute feature.\\n EAttribute MODEL_ITEM__ID = eINSTANCE.getModelItem_Id();\\n * The meta object literal for the 'Type' attribute feature.\\n EAttribute LIST_ITEM__TYPE = eINSTANCE.getListItem_Type();\\n * The meta object literal for the 'Id' attribute feature.\\n EAttribute LIST_ITEM__ID = eINSTANCE.getListItem_Id();\",\n \"old_methods\": [],\n \"patch\": \"@@ -67,13 +67,13 @@ public interface IntentSpecificationPackage extends EPackage\\n int SPECIFICATION = 0;\\n \\n /**\\n- * The feature id for the 'Id' attribute.\\n+ * The feature id for the 'Name' attribute.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n- int SPECIFICATION__ID = 0;\\n+ int SPECIFICATION__NAME = 0;\\n \\n /**\\n * The feature id for the 'Refinements' containment reference list.\\n@@ -104,13 +104,13 @@ public interface IntentSpecificationPackage extends EPackage\\n int REFINEMENT = 1;\\n \\n /**\\n- * The feature id for the 'Id' attribute.\\n+ * The feature id for the 'Name' attribute.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n- int REFINEMENT__ID = 0;\\n+ int REFINEMENT__NAME = 0;\\n \\n /**\\n * The feature id for the 'Desc' attribute.\\n@@ -150,7 +150,7 @@ public interface IntentSpecificationPackage extends EPackage\\n int INTENT = 2;\\n \\n /**\\n- * The feature id for the 'Type' attribute.\\n+ * The feature id for the 'Type' containment reference.\\n * \\n * \\n * @generated\\n@@ -159,13 +159,13 @@ public interface IntentSpecificationPackage extends EPackage\\n int INTENT__TYPE = 0;\\n \\n /**\\n- * The feature id for the 'Id' attribute.\\n+ * The feature id for the 'Name' attribute.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n- int INTENT__ID = 1;\\n+ int INTENT__NAME = 1;\\n \\n /**\\n * The feature id for the 'Desc' attribute.\\n@@ -194,6 +194,34 @@ public interface IntentSpecificationPackage extends EPackage\\n */\\n int INTENT_FEATURE_COUNT = 4;\\n \\n+ /**\\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.IntentTypeImpl Intent Type}' class.\\n+ * \\n+ * \\n+ * @see net.certware.intent.intentSpecification.impl.IntentTypeImpl\\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getIntentType()\\n+ * @generated\\n+ */\\n+ int INTENT_TYPE = 3;\\n+\\n+ /**\\n+ * The feature id for the 'Type Name' attribute.\\n+ * \\n+ * \\n+ * @generated\\n+ * @ordered\\n+ */\\n+ int INTENT_TYPE__TYPE_NAME = 0;\\n+\\n+ /**\\n+ * The number of structural features of the 'Intent Type' class.\\n+ * \\n+ * \\n+ * @generated\\n+ * @ordered\\n+ */\\n+ int INTENT_TYPE_FEATURE_COUNT = 1;\\n+\\n /**\\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DecompositionImpl Decomposition}' class.\\n * \\n@@ -202,10 +230,10 @@ public interface IntentSpecificationPackage extends EPackage\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecomposition()\\n * @generated\\n */\\n- int DECOMPOSITION = 3;\\n+ int DECOMPOSITION = 4;\\n \\n /**\\n- * The feature id for the 'Type' attribute.\\n+ * The feature id for the 'Type' containment reference.\\n * \\n * \\n * @generated\\n@@ -214,13 +242,13 @@ public interface IntentSpecificationPackage extends EPackage\\n int DECOMPOSITION__TYPE = 0;\\n \\n /**\\n- * The feature id for the 'Id' attribute.\\n+ * The feature id for the 'Name' attribute.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n- int DECOMPOSITION__ID = 1;\\n+ int DECOMPOSITION__NAME = 1;\\n \\n /**\\n * The feature id for the 'Desc' attribute.\\n@@ -267,6 +295,34 @@ public interface IntentSpecificationPackage extends EPackage\\n */\\n int DECOMPOSITION_FEATURE_COUNT = 6;\\n \\n+ /**\\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DecompositionTypeImpl Decomposition Type}' class.\\n+ * \\n+ * \\n+ * @see net.certware.intent.intentSpecification.impl.DecompositionTypeImpl\\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecompositionType()\\n+ * @generated\\n+ */\\n+ int DECOMPOSITION_TYPE = 5;\\n+\\n+ /**\\n+ * The feature id for the 'Type Name' attribute.\\n+ * \\n+ * \\n+ * @generated\\n+ * @ordered\\n+ */\\n+ int DECOMPOSITION_TYPE__TYPE_NAME = 0;\\n+\\n+ /**\\n+ * The number of structural features of the 'Decomposition Type' class.\\n+ * \\n+ * \\n+ * @generated\\n+ * @ordered\\n+ */\\n+ int DECOMPOSITION_TYPE_FEATURE_COUNT = 1;\\n+\\n /**\\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DocumentImpl Document}' class.\\n * \\n@@ -275,7 +331,7 @@ public interface IntentSpecificationPackage extends EPackage\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocument()\\n * @generated\\n */\\n- int DOCUMENT = 4;\\n+ int DOCUMENT = 6;\\n \\n /**\\n * The feature id for the 'Entries' containment reference list.\\n@@ -295,6 +351,34 @@ public interface IntentSpecificationPackage extends EPackage\\n */\\n int DOCUMENT_FEATURE_COUNT = 1;\\n \\n+ /**\\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DocItemTypeImpl Doc Item Type}' class.\\n+ * \\n+ * \\n+ * @see net.certware.intent.intentSpecification.impl.DocItemTypeImpl\\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItemType()\\n+ * @generated\\n+ */\\n+ int DOC_ITEM_TYPE = 7;\\n+\\n+ /**\\n+ * The feature id for the 'Type Name' attribute.\\n+ * \\n+ * \\n+ * @generated\\n+ * @ordered\\n+ */\\n+ int DOC_ITEM_TYPE__TYPE_NAME = 0;\\n+\\n+ /**\\n+ * The number of structural features of the 'Doc Item Type' class.\\n+ * \\n+ * \\n+ * @generated\\n+ * @ordered\\n+ */\\n+ int DOC_ITEM_TYPE_FEATURE_COUNT = 1;\\n+\\n /**\\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.DocItemImpl Doc Item}' class.\\n * \\n@@ -303,10 +387,10 @@ public interface IntentSpecificationPackage extends EPackage\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItem()\\n * @generated\\n */\\n- int DOC_ITEM = 5;\\n+ int DOC_ITEM = 8;\\n \\n /**\\n- * The feature id for the 'Type' attribute.\\n+ * The feature id for the 'Type' containment reference.\\n * \\n * \\n * @generated\\n@@ -315,13 +399,13 @@ public interface IntentSpecificationPackage extends EPackage\\n int DOC_ITEM__TYPE = 0;\\n \\n /**\\n- * The feature id for the 'Id' attribute.\\n+ * The feature id for the 'Name' attribute.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n- int DOC_ITEM__ID = 1;\\n+ int DOC_ITEM__NAME = 1;\\n \\n /**\\n * The feature id for the 'Ref' attribute.\\n@@ -341,6 +425,34 @@ public interface IntentSpecificationPackage extends EPackage\\n */\\n int DOC_ITEM_FEATURE_COUNT = 3;\\n \\n+ /**\\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ModelTypeImpl Model Type}' class.\\n+ * \\n+ * \\n+ * @see net.certware.intent.intentSpecification.impl.ModelTypeImpl\\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelType()\\n+ * @generated\\n+ */\\n+ int MODEL_TYPE = 9;\\n+\\n+ /**\\n+ * The feature id for the 'Type Name' attribute.\\n+ * \\n+ * \\n+ * @generated\\n+ * @ordered\\n+ */\\n+ int MODEL_TYPE__TYPE_NAME = 0;\\n+\\n+ /**\\n+ * The number of structural features of the 'Model Type' class.\\n+ * \\n+ * \\n+ * @generated\\n+ * @ordered\\n+ */\\n+ int MODEL_TYPE_FEATURE_COUNT = 1;\\n+\\n /**\\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ModelItemImpl Model Item}' class.\\n * \\n@@ -349,10 +461,10 @@ public interface IntentSpecificationPackage extends EPackage\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelItem()\\n * @generated\\n */\\n- int MODEL_ITEM = 6;\\n+ int MODEL_ITEM = 10;\\n \\n /**\\n- * The feature id for the 'Type' attribute.\\n+ * The feature id for the 'Type' containment reference.\\n * \\n * \\n * @generated\\n@@ -361,13 +473,13 @@ public interface IntentSpecificationPackage extends EPackage\\n int MODEL_ITEM__TYPE = 0;\\n \\n /**\\n- * The feature id for the 'Id' attribute.\\n+ * The feature id for the 'Name' attribute.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n- int MODEL_ITEM__ID = 1;\\n+ int MODEL_ITEM__NAME = 1;\\n \\n /**\\n * The feature id for the 'Desc' attribute.\\n@@ -387,6 +499,34 @@ public interface IntentSpecificationPackage extends EPackage\\n */\\n int MODEL_ITEM_FEATURE_COUNT = 3;\\n \\n+ /**\\n+ * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ListItemTypeImpl List Item Type}' class.\\n+ * \\n+ * \\n+ * @see net.certware.intent.intentSpecification.impl.ListItemTypeImpl\\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItemType()\\n+ * @generated\\n+ */\\n+ int LIST_ITEM_TYPE = 11;\\n+\\n+ /**\\n+ * The feature id for the 'Type Name' attribute.\\n+ * \\n+ * \\n+ * @generated\\n+ * @ordered\\n+ */\\n+ int LIST_ITEM_TYPE__TYPE_NAME = 0;\\n+\\n+ /**\\n+ * The number of structural features of the 'List Item Type' class.\\n+ * \\n+ * \\n+ * @generated\\n+ * @ordered\\n+ */\\n+ int LIST_ITEM_TYPE_FEATURE_COUNT = 1;\\n+\\n /**\\n * The meta object id for the '{@link net.certware.intent.intentSpecification.impl.ListItemImpl List Item}' class.\\n * \\n@@ -395,10 +535,10 @@ public interface IntentSpecificationPackage extends EPackage\\n * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItem()\\n * @generated\\n */\\n- int LIST_ITEM = 7;\\n+ int LIST_ITEM = 12;\\n \\n /**\\n- * The feature id for the 'Type' attribute.\\n+ * The feature id for the 'Type' containment reference.\\n * \\n * \\n * @generated\\n@@ -407,13 +547,13 @@ public interface IntentSpecificationPackage extends EPackage\\n int LIST_ITEM__TYPE = 0;\\n \\n /**\\n- * The feature id for the 'Id' attribute.\\n+ * The feature id for the 'Name' attribute.\\n * \\n * \\n * @generated\\n * @ordered\\n */\\n- int LIST_ITEM__ID = 1;\\n+ int LIST_ITEM__NAME = 1;\\n \\n /**\\n * The feature id for the 'Desc' attribute.\\n@@ -472,15 +612,15 @@ public interface IntentSpecificationPackage extends EPackage\\n EClass getSpecification();\\n \\n /**\\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Specification#getId Id}'.\\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Specification#getName Name}'.\\n * \\n * \\n- * @return the meta object for the attribute 'Id'.\\n- * @see net.certware.intent.intentSpecification.Specification#getId()\\n+ * @return the meta object for the attribute 'Name'.\\n+ * @see net.certware.intent.intentSpecification.Specification#getName()\\n * @see #getSpecification()\\n * @generated\\n */\\n- EAttribute getSpecification_Id();\\n+ EAttribute getSpecification_Name();\\n \\n /**\\n * Returns the meta object for the containment reference list '{@link net.certware.intent.intentSpecification.Specification#getRefinements Refinements}'.\\n@@ -504,15 +644,15 @@ public interface IntentSpecificationPackage extends EPackage\\n EClass getRefinement();\\n \\n /**\\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getId Id}'.\\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getName Name}'.\\n * \\n * \\n- * @return the meta object for the attribute 'Id'.\\n- * @see net.certware.intent.intentSpecification.Refinement#getId()\\n+ * @return the meta object for the attribute 'Name'.\\n+ * @see net.certware.intent.intentSpecification.Refinement#getName()\\n * @see #getRefinement()\\n * @generated\\n */\\n- EAttribute getRefinement_Id();\\n+ EAttribute getRefinement_Name();\\n \\n /**\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Refinement#getDesc Desc}'.\\n@@ -547,26 +687,26 @@ public interface IntentSpecificationPackage extends EPackage\\n EClass getIntent();\\n \\n /**\\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getType Type}'.\\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.Intent#getType Type}'.\\n * \\n * \\n- * @return the meta object for the attribute 'Type'.\\n+ * @return the meta object for the containment reference 'Type'.\\n * @see net.certware.intent.intentSpecification.Intent#getType()\\n * @see #getIntent()\\n * @generated\\n */\\n- EAttribute getIntent_Type();\\n+ EReference getIntent_Type();\\n \\n /**\\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getId Id}'.\\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getName Name}'.\\n * \\n * \\n- * @return the meta object for the attribute 'Id'.\\n- * @see net.certware.intent.intentSpecification.Intent#getId()\\n+ * @return the meta object for the attribute 'Name'.\\n+ * @see net.certware.intent.intentSpecification.Intent#getName()\\n * @see #getIntent()\\n * @generated\\n */\\n- EAttribute getIntent_Id();\\n+ EAttribute getIntent_Name();\\n \\n /**\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Intent#getDesc Desc}'.\\n@@ -590,6 +730,27 @@ public interface IntentSpecificationPackage extends EPackage\\n */\\n EReference getIntent_Decompositions();\\n \\n+ /**\\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.IntentType Intent Type}'.\\n+ * \\n+ * \\n+ * @return the meta object for class 'Intent Type'.\\n+ * @see net.certware.intent.intentSpecification.IntentType\\n+ * @generated\\n+ */\\n+ EClass getIntentType();\\n+\\n+ /**\\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.IntentType#getTypeName Type Name}'.\\n+ * \\n+ * \\n+ * @return the meta object for the attribute 'Type Name'.\\n+ * @see net.certware.intent.intentSpecification.IntentType#getTypeName()\\n+ * @see #getIntentType()\\n+ * @generated\\n+ */\\n+ EAttribute getIntentType_TypeName();\\n+\\n /**\\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.Decomposition Decomposition}'.\\n * \\n@@ -601,26 +762,26 @@ public interface IntentSpecificationPackage extends EPackage\\n EClass getDecomposition();\\n \\n /**\\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}'.\\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.Decomposition#getType Type}'.\\n * \\n * \\n- * @return the meta object for the attribute 'Type'.\\n+ * @return the meta object for the containment reference 'Type'.\\n * @see net.certware.intent.intentSpecification.Decomposition#getType()\\n * @see #getDecomposition()\\n * @generated\\n */\\n- EAttribute getDecomposition_Type();\\n+ EReference getDecomposition_Type();\\n \\n /**\\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getId Id}'.\\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getName Name}'.\\n * \\n * \\n- * @return the meta object for the attribute 'Id'.\\n- * @see net.certware.intent.intentSpecification.Decomposition#getId()\\n+ * @return the meta object for the attribute 'Name'.\\n+ * @see net.certware.intent.intentSpecification.Decomposition#getName()\\n * @see #getDecomposition()\\n * @generated\\n */\\n- EAttribute getDecomposition_Id();\\n+ EAttribute getDecomposition_Name();\\n \\n /**\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.Decomposition#getDesc Desc}'.\\n@@ -666,6 +827,27 @@ public interface IntentSpecificationPackage extends EPackage\\n */\\n EReference getDecomposition_Items();\\n \\n+ /**\\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DecompositionType Decomposition Type}'.\\n+ * \\n+ * \\n+ * @return the meta object for class 'Decomposition Type'.\\n+ * @see net.certware.intent.intentSpecification.DecompositionType\\n+ * @generated\\n+ */\\n+ EClass getDecompositionType();\\n+\\n+ /**\\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DecompositionType#getTypeName Type Name}'.\\n+ * \\n+ * \\n+ * @return the meta object for the attribute 'Type Name'.\\n+ * @see net.certware.intent.intentSpecification.DecompositionType#getTypeName()\\n+ * @see #getDecompositionType()\\n+ * @generated\\n+ */\\n+ EAttribute getDecompositionType_TypeName();\\n+\\n /**\\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.Document Document}'.\\n * \\n@@ -687,6 +869,27 @@ public interface IntentSpecificationPackage extends EPackage\\n */\\n EReference getDocument_Entries();\\n \\n+ /**\\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DocItemType Doc Item Type}'.\\n+ * \\n+ * \\n+ * @return the meta object for class 'Doc Item Type'.\\n+ * @see net.certware.intent.intentSpecification.DocItemType\\n+ * @generated\\n+ */\\n+ EClass getDocItemType();\\n+\\n+ /**\\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItemType#getTypeName Type Name}'.\\n+ * \\n+ * \\n+ * @return the meta object for the attribute 'Type Name'.\\n+ * @see net.certware.intent.intentSpecification.DocItemType#getTypeName()\\n+ * @see #getDocItemType()\\n+ * @generated\\n+ */\\n+ EAttribute getDocItemType_TypeName();\\n+\\n /**\\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.DocItem Doc Item}'.\\n * \\n@@ -698,26 +901,26 @@ public interface IntentSpecificationPackage extends EPackage\\n EClass getDocItem();\\n \\n /**\\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getType Type}'.\\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.DocItem#getType Type}'.\\n * \\n * \\n- * @return the meta object for the attribute 'Type'.\\n+ * @return the meta object for the containment reference 'Type'.\\n * @see net.certware.intent.intentSpecification.DocItem#getType()\\n * @see #getDocItem()\\n * @generated\\n */\\n- EAttribute getDocItem_Type();\\n+ EReference getDocItem_Type();\\n \\n /**\\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getId Id}'.\\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getName Name}'.\\n * \\n * \\n- * @return the meta object for the attribute 'Id'.\\n- * @see net.certware.intent.intentSpecification.DocItem#getId()\\n+ * @return the meta object for the attribute 'Name'.\\n+ * @see net.certware.intent.intentSpecification.DocItem#getName()\\n * @see #getDocItem()\\n * @generated\\n */\\n- EAttribute getDocItem_Id();\\n+ EAttribute getDocItem_Name();\\n \\n /**\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.DocItem#getRef Ref}'.\\n@@ -730,6 +933,27 @@ public interface IntentSpecificationPackage extends EPackage\\n */\\n EAttribute getDocItem_Ref();\\n \\n+ /**\\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ModelType Model Type}'.\\n+ * \\n+ * \\n+ * @return the meta object for class 'Model Type'.\\n+ * @see net.certware.intent.intentSpecification.ModelType\\n+ * @generated\\n+ */\\n+ EClass getModelType();\\n+\\n+ /**\\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelType#getTypeName Type Name}'.\\n+ * \\n+ * \\n+ * @return the meta object for the attribute 'Type Name'.\\n+ * @see net.certware.intent.intentSpecification.ModelType#getTypeName()\\n+ * @see #getModelType()\\n+ * @generated\\n+ */\\n+ EAttribute getModelType_TypeName();\\n+\\n /**\\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ModelItem Model Item}'.\\n * \\n@@ -741,26 +965,26 @@ public interface IntentSpecificationPackage extends EPackage\\n EClass getModelItem();\\n \\n /**\\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}'.\\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}'.\\n * \\n * \\n- * @return the meta object for the attribute 'Type'.\\n+ * @return the meta object for the containment reference 'Type'.\\n * @see net.certware.intent.intentSpecification.ModelItem#getType()\\n * @see #getModelItem()\\n * @generated\\n */\\n- EAttribute getModelItem_Type();\\n+ EReference getModelItem_Type();\\n \\n /**\\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getId Id}'.\\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getName Name}'.\\n * \\n * \\n- * @return the meta object for the attribute 'Id'.\\n- * @see net.certware.intent.intentSpecification.ModelItem#getId()\\n+ * @return the meta object for the attribute 'Name'.\\n+ * @see net.certware.intent.intentSpecification.ModelItem#getName()\\n * @see #getModelItem()\\n * @generated\\n */\\n- EAttribute getModelItem_Id();\\n+ EAttribute getModelItem_Name();\\n \\n /**\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ModelItem#getDesc Desc}'.\\n@@ -773,6 +997,27 @@ public interface IntentSpecificationPackage extends EPackage\\n */\\n EAttribute getModelItem_Desc();\\n \\n+ /**\\n+ * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ListItemType List Item Type}'.\\n+ * \\n+ * \\n+ * @return the meta object for class 'List Item Type'.\\n+ * @see net.certware.intent.intentSpecification.ListItemType\\n+ * @generated\\n+ */\\n+ EClass getListItemType();\\n+\\n+ /**\\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItemType#getTypeName Type Name}'.\\n+ * \\n+ * \\n+ * @return the meta object for the attribute 'Type Name'.\\n+ * @see net.certware.intent.intentSpecification.ListItemType#getTypeName()\\n+ * @see #getListItemType()\\n+ * @generated\\n+ */\\n+ EAttribute getListItemType_TypeName();\\n+\\n /**\\n * Returns the meta object for class '{@link net.certware.intent.intentSpecification.ListItem List Item}'.\\n * \\n@@ -784,26 +1029,26 @@ public interface IntentSpecificationPackage extends EPackage\\n EClass getListItem();\\n \\n /**\\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getType Type}'.\\n+ * Returns the meta object for the containment reference '{@link net.certware.intent.intentSpecification.ListItem#getType Type}'.\\n * \\n * \\n- * @return the meta object for the attribute 'Type'.\\n+ * @return the meta object for the containment reference 'Type'.\\n * @see net.certware.intent.intentSpecification.ListItem#getType()\\n * @see #getListItem()\\n * @generated\\n */\\n- EAttribute getListItem_Type();\\n+ EReference getListItem_Type();\\n \\n /**\\n- * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getId Id}'.\\n+ * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getName Name}'.\\n * \\n * \\n- * @return the meta object for the attribute 'Id'.\\n- * @see net.certware.intent.intentSpecification.ListItem#getId()\\n+ * @return the meta object for the attribute 'Name'.\\n+ * @see net.certware.intent.intentSpecification.ListItem#getName()\\n * @see #getListItem()\\n * @generated\\n */\\n- EAttribute getListItem_Id();\\n+ EAttribute getListItem_Name();\\n \\n /**\\n * Returns the meta object for the attribute '{@link net.certware.intent.intentSpecification.ListItem#getDesc Desc}'.\\n@@ -883,12 +1128,12 @@ interface Literals\\n EClass SPECIFICATION = eINSTANCE.getSpecification();\\n \\n /**\\n- * The meta object literal for the 'Id' attribute feature.\\n+ * The meta object literal for the 'Name' attribute feature.\\n * \\n * \\n * @generated\\n */\\n- EAttribute SPECIFICATION__ID = eINSTANCE.getSpecification_Id();\\n+ EAttribute SPECIFICATION__NAME = eINSTANCE.getSpecification_Name();\\n \\n /**\\n * The meta object literal for the 'Refinements' containment reference list feature.\\n@@ -909,12 +1154,12 @@ interface Literals\\n EClass REFINEMENT = eINSTANCE.getRefinement();\\n \\n /**\\n- * The meta object literal for the 'Id' attribute feature.\\n+ * The meta object literal for the 'Name' attribute feature.\\n * \\n * \\n * @generated\\n */\\n- EAttribute REFINEMENT__ID = eINSTANCE.getRefinement_Id();\\n+ EAttribute REFINEMENT__NAME = eINSTANCE.getRefinement_Name();\\n \\n /**\\n * The meta object literal for the 'Desc' attribute feature.\\n@@ -943,20 +1188,20 @@ interface Literals\\n EClass INTENT = eINSTANCE.getIntent();\\n \\n /**\\n- * The meta object literal for the 'Type' attribute feature.\\n+ * The meta object literal for the 'Type' containment reference feature.\\n * \\n * \\n * @generated\\n */\\n- EAttribute INTENT__TYPE = eINSTANCE.getIntent_Type();\\n+ EReference INTENT__TYPE = eINSTANCE.getIntent_Type();\\n \\n /**\\n- * The meta object literal for the 'Id' attribute feature.\\n+ * The meta object literal for the 'Name' attribute feature.\\n * \\n * \\n * @generated\\n */\\n- EAttribute INTENT__ID = eINSTANCE.getIntent_Id();\\n+ EAttribute INTENT__NAME = eINSTANCE.getIntent_Name();\\n \\n /**\\n * The meta object literal for the 'Desc' attribute feature.\\n@@ -974,6 +1219,24 @@ interface Literals\\n */\\n EReference INTENT__DECOMPOSITIONS = eINSTANCE.getIntent_Decompositions();\\n \\n+ /**\\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.IntentTypeImpl Intent Type}' class.\\n+ * \\n+ * \\n+ * @see net.certware.intent.intentSpecification.impl.IntentTypeImpl\\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getIntentType()\\n+ * @generated\\n+ */\\n+ EClass INTENT_TYPE = eINSTANCE.getIntentType();\\n+\\n+ /**\\n+ * The meta object literal for the 'Type Name' attribute feature.\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ EAttribute INTENT_TYPE__TYPE_NAME = eINSTANCE.getIntentType_TypeName();\\n+\\n /**\\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DecompositionImpl Decomposition}' class.\\n * \\n@@ -985,20 +1248,20 @@ interface Literals\\n EClass DECOMPOSITION = eINSTANCE.getDecomposition();\\n \\n /**\\n- * The meta object literal for the 'Type' attribute feature.\\n+ * The meta object literal for the 'Type' containment reference feature.\\n * \\n * \\n * @generated\\n */\\n- EAttribute DECOMPOSITION__TYPE = eINSTANCE.getDecomposition_Type();\\n+ EReference DECOMPOSITION__TYPE = eINSTANCE.getDecomposition_Type();\\n \\n /**\\n- * The meta object literal for the 'Id' attribute feature.\\n+ * The meta object literal for the 'Name' attribute feature.\\n * \\n * \\n * @generated\\n */\\n- EAttribute DECOMPOSITION__ID = eINSTANCE.getDecomposition_Id();\\n+ EAttribute DECOMPOSITION__NAME = eINSTANCE.getDecomposition_Name();\\n \\n /**\\n * The meta object literal for the 'Desc' attribute feature.\\n@@ -1032,6 +1295,24 @@ interface Literals\\n */\\n EReference DECOMPOSITION__ITEMS = eINSTANCE.getDecomposition_Items();\\n \\n+ /**\\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DecompositionTypeImpl Decomposition Type}' class.\\n+ * \\n+ * \\n+ * @see net.certware.intent.intentSpecification.impl.DecompositionTypeImpl\\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDecompositionType()\\n+ * @generated\\n+ */\\n+ EClass DECOMPOSITION_TYPE = eINSTANCE.getDecompositionType();\\n+\\n+ /**\\n+ * The meta object literal for the 'Type Name' attribute feature.\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ EAttribute DECOMPOSITION_TYPE__TYPE_NAME = eINSTANCE.getDecompositionType_TypeName();\\n+\\n /**\\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DocumentImpl Document}' class.\\n * \\n@@ -1050,6 +1331,24 @@ interface Literals\\n */\\n EReference DOCUMENT__ENTRIES = eINSTANCE.getDocument_Entries();\\n \\n+ /**\\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DocItemTypeImpl Doc Item Type}' class.\\n+ * \\n+ * \\n+ * @see net.certware.intent.intentSpecification.impl.DocItemTypeImpl\\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getDocItemType()\\n+ * @generated\\n+ */\\n+ EClass DOC_ITEM_TYPE = eINSTANCE.getDocItemType();\\n+\\n+ /**\\n+ * The meta object literal for the 'Type Name' attribute feature.\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ EAttribute DOC_ITEM_TYPE__TYPE_NAME = eINSTANCE.getDocItemType_TypeName();\\n+\\n /**\\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.DocItemImpl Doc Item}' class.\\n * \\n@@ -1061,20 +1360,20 @@ interface Literals\\n EClass DOC_ITEM = eINSTANCE.getDocItem();\\n \\n /**\\n- * The meta object literal for the 'Type' attribute feature.\\n+ * The meta object literal for the 'Type' containment reference feature.\\n * \\n * \\n * @generated\\n */\\n- EAttribute DOC_ITEM__TYPE = eINSTANCE.getDocItem_Type();\\n+ EReference DOC_ITEM__TYPE = eINSTANCE.getDocItem_Type();\\n \\n /**\\n- * The meta object literal for the 'Id' attribute feature.\\n+ * The meta object literal for the 'Name' attribute feature.\\n * \\n * \\n * @generated\\n */\\n- EAttribute DOC_ITEM__ID = eINSTANCE.getDocItem_Id();\\n+ EAttribute DOC_ITEM__NAME = eINSTANCE.getDocItem_Name();\\n \\n /**\\n * The meta object literal for the 'Ref' attribute feature.\\n@@ -1084,6 +1383,24 @@ interface Literals\\n */\\n EAttribute DOC_ITEM__REF = eINSTANCE.getDocItem_Ref();\\n \\n+ /**\\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ModelTypeImpl Model Type}' class.\\n+ * \\n+ * \\n+ * @see net.certware.intent.intentSpecification.impl.ModelTypeImpl\\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getModelType()\\n+ * @generated\\n+ */\\n+ EClass MODEL_TYPE = eINSTANCE.getModelType();\\n+\\n+ /**\\n+ * The meta object literal for the 'Type Name' attribute feature.\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ EAttribute MODEL_TYPE__TYPE_NAME = eINSTANCE.getModelType_TypeName();\\n+\\n /**\\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ModelItemImpl Model Item}' class.\\n * \\n@@ -1095,20 +1412,20 @@ interface Literals\\n EClass MODEL_ITEM = eINSTANCE.getModelItem();\\n \\n /**\\n- * The meta object literal for the 'Type' attribute feature.\\n+ * The meta object literal for the 'Type' containment reference feature.\\n * \\n * \\n * @generated\\n */\\n- EAttribute MODEL_ITEM__TYPE = eINSTANCE.getModelItem_Type();\\n+ EReference MODEL_ITEM__TYPE = eINSTANCE.getModelItem_Type();\\n \\n /**\\n- * The meta object literal for the 'Id' attribute feature.\\n+ * The meta object literal for the 'Name' attribute feature.\\n * \\n * \\n * @generated\\n */\\n- EAttribute MODEL_ITEM__ID = eINSTANCE.getModelItem_Id();\\n+ EAttribute MODEL_ITEM__NAME = eINSTANCE.getModelItem_Name();\\n \\n /**\\n * The meta object literal for the 'Desc' attribute feature.\\n@@ -1118,6 +1435,24 @@ interface Literals\\n */\\n EAttribute MODEL_ITEM__DESC = eINSTANCE.getModelItem_Desc();\\n \\n+ /**\\n+ * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ListItemTypeImpl List Item Type}' class.\\n+ * \\n+ * \\n+ * @see net.certware.intent.intentSpecification.impl.ListItemTypeImpl\\n+ * @see net.certware.intent.intentSpecification.impl.IntentSpecificationPackageImpl#getListItemType()\\n+ * @generated\\n+ */\\n+ EClass LIST_ITEM_TYPE = eINSTANCE.getListItemType();\\n+\\n+ /**\\n+ * The meta object literal for the 'Type Name' attribute feature.\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ EAttribute LIST_ITEM_TYPE__TYPE_NAME = eINSTANCE.getListItemType_TypeName();\\n+\\n /**\\n * The meta object literal for the '{@link net.certware.intent.intentSpecification.impl.ListItemImpl List Item}' class.\\n * \\n@@ -1129,20 +1464,20 @@ interface Literals\\n EClass LIST_ITEM = eINSTANCE.getListItem();\\n \\n /**\\n- * The meta object literal for the 'Type' attribute feature.\\n+ * The meta object literal for the 'Type' containment reference feature.\\n * \\n * \\n * @generated\\n */\\n- EAttribute LIST_ITEM__TYPE = eINSTANCE.getListItem_Type();\\n+ EReference LIST_ITEM__TYPE = eINSTANCE.getListItem_Type();\\n \\n /**\\n- * The meta object literal for the 'Id' attribute feature.\\n+ * The meta object literal for the 'Name' attribute feature.\\n * \\n * \\n * @generated\\n */\\n- EAttribute LIST_ITEM__ID = eINSTANCE.getListItem_Id();\\n+ EAttribute LIST_ITEM__NAME = eINSTANCE.getListItem_Name();\\n \\n /**\\n * The meta object literal for the 'Desc' attribute feature.\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FIntentSpecificationPackage.java\",\n \"sha\": \"fa6f0420fb0406fd2ff002cc9dae4f7f37d79ce5\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 20,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FListItem.java\",\n \"changes\": 40,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FListItem.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 20,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/ListItem.java\",\n \"new_code\": \" *
            • {@link net.certware.intent.intentSpecification.ListItem#getName Name}
              • \\n * Returns the value of the 'Type' containment reference.\\n * If the meaning of the 'Type' containment reference isn't clear,\\n * @return the value of the 'Type' containment reference.\\n * @see #setType(ListItemType)\\n * @model containment=\\\"true\\\"\\n ListItemType getType();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getType Type}' containment reference.\\n * @param value the new value of the 'Type' containment reference.\\n void setType(ListItemType value);\\n * Returns the value of the 'Name' attribute.\\n * If the meaning of the 'Name' attribute isn't clear,\\n * @return the value of the 'Name' attribute.\\n * @see #setName(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Name()\\n String getName();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getName Name}' attribute.\\n * @param value the new value of the 'Name' attribute.\\n * @see #getName()\\n void setName(String value);\",\n \"new_methods\": [],\n \"old_code\": \" *
            • {@link net.certware.intent.intentSpecification.ListItem#getId Id}
              • \\n * Returns the value of the 'Type' attribute.\\n * If the meaning of the 'Type' attribute isn't clear,\\n * @return the value of the 'Type' attribute.\\n * @see #setType(String)\\n * @model\\n String getType();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getType Type}' attribute.\\n * @param value the new value of the 'Type' attribute.\\n void setType(String value);\\n * Returns the value of the 'Id' attribute.\\n * If the meaning of the 'Id' attribute isn't clear,\\n * @return the value of the 'Id' attribute.\\n * @see #setId(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Id()\\n String getId();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getId Id}' attribute.\\n * @param value the new value of the 'Id' attribute.\\n * @see #getId()\\n void setId(String value);\",\n \"old_methods\": [],\n \"patch\": \"@@ -15,7 +15,7 @@\\n * The following features are supported:\\n *
                \\n *
              • {@link net.certware.intent.intentSpecification.ListItem#getType Type}
                • \\n- *
              • {@link net.certware.intent.intentSpecification.ListItem#getId Id}
                • \\n+ *
              • {@link net.certware.intent.intentSpecification.ListItem#getName Name}
                • \\n *
              • {@link net.certware.intent.intentSpecification.ListItem#getDesc Desc}
                • \\n *
              • {@link net.certware.intent.intentSpecification.ListItem#getDocReferences Doc References}
                • \\n *
              • {@link net.certware.intent.intentSpecification.ListItem#getItemReferences Item References}
                • \\n@@ -30,56 +30,56 @@\\n public interface ListItem extends EObject\\n {\\n /**\\n- * Returns the value of the 'Type' attribute.\\n+ * Returns the value of the 'Type' containment reference.\\n * \\n *

                \\n- * If the meaning of the 'Type' attribute isn't clear,\\n+ * If the meaning of the 'Type' containment reference isn't clear,\\n * there really should be more of a description here...\\n *

                \\n * \\n- * @return the value of the 'Type' attribute.\\n- * @see #setType(String)\\n+ * @return the value of the 'Type' containment reference.\\n+ * @see #setType(ListItemType)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Type()\\n- * @model\\n+ * @model containment=\\\"true\\\"\\n * @generated\\n */\\n- String getType();\\n+ ListItemType getType();\\n \\n /**\\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getType Type}' attribute.\\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getType Type}' containment reference.\\n * \\n * \\n- * @param value the new value of the 'Type' attribute.\\n+ * @param value the new value of the 'Type' containment reference.\\n * @see #getType()\\n * @generated\\n */\\n- void setType(String value);\\n+ void setType(ListItemType value);\\n \\n /**\\n- * Returns the value of the 'Id' attribute.\\n+ * Returns the value of the 'Name' attribute.\\n * \\n *

                \\n- * If the meaning of the 'Id' attribute isn't clear,\\n+ * If the meaning of the 'Name' attribute isn't clear,\\n * there really should be more of a description here...\\n *

                \\n * \\n- * @return the value of the 'Id' attribute.\\n- * @see #setId(String)\\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Id()\\n+ * @return the value of the 'Name' attribute.\\n+ * @see #setName(String)\\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getListItem_Name()\\n * @model\\n * @generated\\n */\\n- String getId();\\n+ String getName();\\n \\n /**\\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getId Id}' attribute.\\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.ListItem#getName Name}' attribute.\\n * \\n * \\n- * @param value the new value of the 'Id' attribute.\\n- * @see #getId()\\n+ * @param value the new value of the 'Name' attribute.\\n+ * @see #getName()\\n * @generated\\n */\\n- void setId(String value);\\n+ void setName(String value);\\n \\n /**\\n * Returns the value of the 'Desc' attribute.\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FListItem.java\",\n \"sha\": \"1e59d53484b55c601b11970d6803d0cc0e0f9204\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 20,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FModelItem.java\",\n \"changes\": 40,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FModelItem.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 20,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/ModelItem.java\",\n \"new_code\": \" *
              • {@link net.certware.intent.intentSpecification.ModelItem#getName Name}
                • \\n * Returns the value of the 'Type' containment reference.\\n * If the meaning of the 'Type' containment reference isn't clear,\\n * @return the value of the 'Type' containment reference.\\n * @see #setType(ModelType)\\n * @model containment=\\\"true\\\"\\n ModelType getType();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}' containment reference.\\n * @param value the new value of the 'Type' containment reference.\\n void setType(ModelType value);\\n * Returns the value of the 'Name' attribute.\\n * If the meaning of the 'Name' attribute isn't clear,\\n * @return the value of the 'Name' attribute.\\n * @see #setName(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Name()\\n String getName();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getName Name}' attribute.\\n * @param value the new value of the 'Name' attribute.\\n * @see #getName()\\n void setName(String value);\",\n \"new_methods\": [],\n \"old_code\": \" *
              • {@link net.certware.intent.intentSpecification.ModelItem#getId Id}
                • \\n * Returns the value of the 'Type' attribute.\\n * If the meaning of the 'Type' attribute isn't clear,\\n * @return the value of the 'Type' attribute.\\n * @see #setType(String)\\n * @model\\n String getType();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}' attribute.\\n * @param value the new value of the 'Type' attribute.\\n void setType(String value);\\n * Returns the value of the 'Id' attribute.\\n * If the meaning of the 'Id' attribute isn't clear,\\n * @return the value of the 'Id' attribute.\\n * @see #setId(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Id()\\n String getId();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getId Id}' attribute.\\n * @param value the new value of the 'Id' attribute.\\n * @see #getId()\\n void setId(String value);\",\n \"old_methods\": [],\n \"patch\": \"@@ -13,7 +13,7 @@\\n * The following features are supported:\\n *
                  \\n *
                • {@link net.certware.intent.intentSpecification.ModelItem#getType Type}
                  • \\n- *
                • {@link net.certware.intent.intentSpecification.ModelItem#getId Id}
                  • \\n+ *
                • {@link net.certware.intent.intentSpecification.ModelItem#getName Name}
                  • \\n *
                • {@link net.certware.intent.intentSpecification.ModelItem#getDesc Desc}
                  • \\n *
                \\n *

                \\n@@ -25,56 +25,56 @@\\n public interface ModelItem extends EObject\\n {\\n /**\\n- * Returns the value of the 'Type' attribute.\\n+ * Returns the value of the 'Type' containment reference.\\n * \\n *

                \\n- * If the meaning of the 'Type' attribute isn't clear,\\n+ * If the meaning of the 'Type' containment reference isn't clear,\\n * there really should be more of a description here...\\n *

                \\n * \\n- * @return the value of the 'Type' attribute.\\n- * @see #setType(String)\\n+ * @return the value of the 'Type' containment reference.\\n+ * @see #setType(ModelType)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Type()\\n- * @model\\n+ * @model containment=\\\"true\\\"\\n * @generated\\n */\\n- String getType();\\n+ ModelType getType();\\n \\n /**\\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}' attribute.\\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getType Type}' containment reference.\\n * \\n * \\n- * @param value the new value of the 'Type' attribute.\\n+ * @param value the new value of the 'Type' containment reference.\\n * @see #getType()\\n * @generated\\n */\\n- void setType(String value);\\n+ void setType(ModelType value);\\n \\n /**\\n- * Returns the value of the 'Id' attribute.\\n+ * Returns the value of the 'Name' attribute.\\n * \\n *

                \\n- * If the meaning of the 'Id' attribute isn't clear,\\n+ * If the meaning of the 'Name' attribute isn't clear,\\n * there really should be more of a description here...\\n *

                \\n * \\n- * @return the value of the 'Id' attribute.\\n- * @see #setId(String)\\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Id()\\n+ * @return the value of the 'Name' attribute.\\n+ * @see #setName(String)\\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getModelItem_Name()\\n * @model\\n * @generated\\n */\\n- String getId();\\n+ String getName();\\n \\n /**\\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getId Id}' attribute.\\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.ModelItem#getName Name}' attribute.\\n * \\n * \\n- * @param value the new value of the 'Id' attribute.\\n- * @see #getId()\\n+ * @param value the new value of the 'Name' attribute.\\n+ * @see #getName()\\n * @generated\\n */\\n- void setId(String value);\\n+ void setName(String value);\\n \\n /**\\n * Returns the value of the 'Desc' attribute.\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FModelItem.java\",\n \"sha\": \"6515c20f33eaa74279f6ee4750ff83d794b16a3e\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 11,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FRefinement.java\",\n \"changes\": 22,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FRefinement.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 11,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/Refinement.java\",\n \"new_code\": \" *
              • {@link net.certware.intent.intentSpecification.Refinement#getName Name}
                • \\n * Returns the value of the 'Name' attribute.\\n * If the meaning of the 'Name' attribute isn't clear,\\n * @return the value of the 'Name' attribute.\\n * @see #setName(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getRefinement_Name()\\n String getName();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Refinement#getName Name}' attribute.\\n * @param value the new value of the 'Name' attribute.\\n * @see #getName()\\n void setName(String value);\",\n \"new_methods\": [],\n \"old_code\": \" *
              • {@link net.certware.intent.intentSpecification.Refinement#getId Id}
                • \\n * Returns the value of the 'Id' attribute.\\n * If the meaning of the 'Id' attribute isn't clear,\\n * @return the value of the 'Id' attribute.\\n * @see #setId(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getRefinement_Id()\\n String getId();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Refinement#getId Id}' attribute.\\n * @param value the new value of the 'Id' attribute.\\n * @see #getId()\\n void setId(String value);\",\n \"old_methods\": [],\n \"patch\": \"@@ -14,7 +14,7 @@\\n *

                \\n * The following features are supported:\\n *

                  \\n- *
                • {@link net.certware.intent.intentSpecification.Refinement#getId Id}
                  • \\n+ *
                • {@link net.certware.intent.intentSpecification.Refinement#getName Name}
                  • \\n *
                • {@link net.certware.intent.intentSpecification.Refinement#getDesc Desc}
                  • \\n *
                • {@link net.certware.intent.intentSpecification.Refinement#getIntents Intents}
                  • \\n *
                \\n@@ -27,30 +27,30 @@\\n public interface Refinement extends EObject\\n {\\n /**\\n- * Returns the value of the 'Id' attribute.\\n+ * Returns the value of the 'Name' attribute.\\n * \\n *

                \\n- * If the meaning of the 'Id' attribute isn't clear,\\n+ * If the meaning of the 'Name' attribute isn't clear,\\n * there really should be more of a description here...\\n *

                \\n * \\n- * @return the value of the 'Id' attribute.\\n- * @see #setId(String)\\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getRefinement_Id()\\n+ * @return the value of the 'Name' attribute.\\n+ * @see #setName(String)\\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getRefinement_Name()\\n * @model\\n * @generated\\n */\\n- String getId();\\n+ String getName();\\n \\n /**\\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Refinement#getId Id}' attribute.\\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Refinement#getName Name}' attribute.\\n * \\n * \\n- * @param value the new value of the 'Id' attribute.\\n- * @see #getId()\\n+ * @param value the new value of the 'Name' attribute.\\n+ * @see #getName()\\n * @generated\\n */\\n- void setId(String value);\\n+ void setName(String value);\\n \\n /**\\n * Returns the value of the 'Desc' attribute.\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FRefinement.java\",\n \"sha\": \"1d9d3af033b6e5d4df49bc08cac78021b388aa7b\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 11,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FSpecification.java\",\n \"changes\": 22,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FSpecification.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 11,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/Specification.java\",\n \"new_code\": \" *
              • {@link net.certware.intent.intentSpecification.Specification#getName Name}
                • \\n * Returns the value of the 'Name' attribute.\\n * If the meaning of the 'Name' attribute isn't clear,\\n * @return the value of the 'Name' attribute.\\n * @see #setName(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getSpecification_Name()\\n String getName();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Specification#getName Name}' attribute.\\n * @param value the new value of the 'Name' attribute.\\n * @see #getName()\\n void setName(String value);\",\n \"new_methods\": [],\n \"old_code\": \" *
              • {@link net.certware.intent.intentSpecification.Specification#getId Id}
                • \\n * Returns the value of the 'Id' attribute.\\n * If the meaning of the 'Id' attribute isn't clear,\\n * @return the value of the 'Id' attribute.\\n * @see #setId(String)\\n * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getSpecification_Id()\\n String getId();\\n * Sets the value of the '{@link net.certware.intent.intentSpecification.Specification#getId Id}' attribute.\\n * @param value the new value of the 'Id' attribute.\\n * @see #getId()\\n void setId(String value);\",\n \"old_methods\": [],\n \"patch\": \"@@ -14,7 +14,7 @@\\n *

                \\n * The following features are supported:\\n *

                  \\n- *
                • {@link net.certware.intent.intentSpecification.Specification#getId Id}
                  • \\n+ *
                • {@link net.certware.intent.intentSpecification.Specification#getName Name}
                  • \\n *
                • {@link net.certware.intent.intentSpecification.Specification#getRefinements Refinements}
                  • \\n *
                \\n *

                \\n@@ -26,30 +26,30 @@\\n public interface Specification extends EObject\\n {\\n /**\\n- * Returns the value of the 'Id' attribute.\\n+ * Returns the value of the 'Name' attribute.\\n * \\n *

                \\n- * If the meaning of the 'Id' attribute isn't clear,\\n+ * If the meaning of the 'Name' attribute isn't clear,\\n * there really should be more of a description here...\\n *

                \\n * \\n- * @return the value of the 'Id' attribute.\\n- * @see #setId(String)\\n- * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getSpecification_Id()\\n+ * @return the value of the 'Name' attribute.\\n+ * @see #setName(String)\\n+ * @see net.certware.intent.intentSpecification.IntentSpecificationPackage#getSpecification_Name()\\n * @model\\n * @generated\\n */\\n- String getId();\\n+ String getName();\\n \\n /**\\n- * Sets the value of the '{@link net.certware.intent.intentSpecification.Specification#getId Id}' attribute.\\n+ * Sets the value of the '{@link net.certware.intent.intentSpecification.Specification#getName Name}' attribute.\\n * \\n * \\n- * @param value the new value of the 'Id' attribute.\\n- * @see #getId()\\n+ * @param value the new value of the 'Name' attribute.\\n+ * @see #getName()\\n * @generated\\n */\\n- void setId(String value);\\n+ void setName(String value);\\n \\n /**\\n * Returns the value of the 'Refinements' containment reference list.\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2FSpecification.java\",\n \"sha\": \"71f6a8f6d515198d0585dd974691752bbbc83c76\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 60,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDecompositionImpl.java\",\n \"changes\": 104,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDecompositionImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 44,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/DecompositionImpl.java\",\n \"new_code\": \"import net.certware.intent.intentSpecification.DecompositionType;\\n *
              • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getName Name}
                • \\n * The cached value of the '{@link #getType() Type}' containment reference.\\n protected DecompositionType type;\\n * The default value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected static final String NAME_EDEFAULT = null;\\n * The cached value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected String name = NAME_EDEFAULT;\\n public DecompositionType getType()\\n public NotificationChain basicSetType(DecompositionType newType, NotificationChain msgs)\\n DecompositionType oldType = type;\\n {\\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, oldType, newType);\\n if (msgs == null) msgs = notification; else msgs.add(notification);\\n }\\n return msgs;\\n public void setType(DecompositionType newType)\\n if (newType != type)\\n {\\n NotificationChain msgs = null;\\n if (type != null)\\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DECOMPOSITION__TYPE, null, msgs);\\n if (newType != null)\\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DECOMPOSITION__TYPE, null, msgs);\\n msgs = basicSetType(newType, msgs);\\n if (msgs != null) msgs.dispatch();\\n }\\n else if (eNotificationRequired())\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, newType, newType));\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public String getName()\\n {\\n return name;\\n public void setName(String newName)\\n String oldName = name;\\n name = newName;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__NAME, oldName, name));\\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\\n return basicSetType(null, msgs);\\n case IntentSpecificationPackage.DECOMPOSITION__NAME:\\n return getName();\\n setType((DecompositionType)newValue);\\n case IntentSpecificationPackage.DECOMPOSITION__NAME:\\n setName((String)newValue);\\n setType((DecompositionType)null);\\n case IntentSpecificationPackage.DECOMPOSITION__NAME:\\n setName(NAME_EDEFAULT);\\n return type != null;\\n case IntentSpecificationPackage.DECOMPOSITION__NAME:\\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n result.append(\\\" (name: \\\");\\n result.append(name);\",\n \"new_methods\": [],\n \"old_code\": \" *
              • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getId Id}
                • \\n * The default value of the '{@link #getType() Type}' attribute.\\n protected static final String TYPE_EDEFAULT = null;\\n * The cached value of the '{@link #getType() Type}' attribute.\\n * @see #getType()\\n protected String type = TYPE_EDEFAULT;\\n * The default value of the '{@link #getId() Id}' attribute.\\n * @see #getId()\\n protected static final String ID_EDEFAULT = null;\\n\\n /**\\n * The cached value of the '{@link #getId() Id}' attribute.\\n * \\n * \\n * @see #getId()\\n * @generated\\n * @ordered\\n */\\n protected String id = ID_EDEFAULT;\\n public String getType()\\n public void setType(String newType)\\n String oldType = type;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, oldType, type));\\n public String getId()\\n return id;\\n public void setId(String newId)\\n String oldId = id;\\n id = newId;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__ID, oldId, id));\\n case IntentSpecificationPackage.DECOMPOSITION__ID:\\n return getId();\\n setType((String)newValue);\\n case IntentSpecificationPackage.DECOMPOSITION__ID:\\n setId((String)newValue);\\n setType(TYPE_EDEFAULT);\\n case IntentSpecificationPackage.DECOMPOSITION__ID:\\n setId(ID_EDEFAULT);\\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\\n case IntentSpecificationPackage.DECOMPOSITION__ID:\\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n result.append(\\\" (type: \\\");\\n result.append(type);\\n result.append(\\\", id: \\\");\\n result.append(id);\",\n \"old_methods\": [],\n \"patch\": \"@@ -5,6 +5,7 @@\\n import java.util.Collection;\\n \\n import net.certware.intent.intentSpecification.Decomposition;\\n+import net.certware.intent.intentSpecification.DecompositionType;\\n import net.certware.intent.intentSpecification.Document;\\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\\n import net.certware.intent.intentSpecification.ListItem;\\n@@ -32,7 +33,7 @@\\n * The following features are implemented:\\n *
                  \\n *
                • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getType Type}
                  • \\n- *
                • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getId Id}
                  • \\n+ *
                • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getName Name}
                  • \\n *
                • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getDesc Desc}
                  • \\n *
                • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getDocuments Documents}
                  • \\n *
                • {@link net.certware.intent.intentSpecification.impl.DecompositionImpl#getModels Models}
                  • \\n@@ -45,44 +46,34 @@\\n public class DecompositionImpl extends MinimalEObjectImpl.Container implements Decomposition\\n {\\n /**\\n- * The default value of the '{@link #getType() Type}' attribute.\\n+ * The cached value of the '{@link #getType() Type}' containment reference.\\n * \\n * \\n * @see #getType()\\n * @generated\\n * @ordered\\n */\\n- protected static final String TYPE_EDEFAULT = null;\\n+ protected DecompositionType type;\\n \\n /**\\n- * The cached value of the '{@link #getType() Type}' attribute.\\n+ * The default value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getType()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected String type = TYPE_EDEFAULT;\\n+ protected static final String NAME_EDEFAULT = null;\\n \\n /**\\n- * The default value of the '{@link #getId() Id}' attribute.\\n+ * The cached value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getId()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected static final String ID_EDEFAULT = null;\\n-\\n- /**\\n- * The cached value of the '{@link #getId() Id}' attribute.\\n- * \\n- * \\n- * @see #getId()\\n- * @generated\\n- * @ordered\\n- */\\n- protected String id = ID_EDEFAULT;\\n+ protected String name = NAME_EDEFAULT;\\n \\n /**\\n * The default value of the '{@link #getDesc() Desc}' attribute.\\n@@ -160,7 +151,7 @@ protected EClass eStaticClass()\\n * \\n * @generated\\n */\\n- public String getType()\\n+ public DecompositionType getType()\\n {\\n return type;\\n }\\n@@ -170,35 +161,60 @@ public String getType()\\n * \\n * @generated\\n */\\n- public void setType(String newType)\\n+ public NotificationChain basicSetType(DecompositionType newType, NotificationChain msgs)\\n {\\n- String oldType = type;\\n+ DecompositionType oldType = type;\\n type = newType;\\n if (eNotificationRequired())\\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, oldType, type));\\n+ {\\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, oldType, newType);\\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\\n+ }\\n+ return msgs;\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public String getId()\\n+ public void setType(DecompositionType newType)\\n {\\n- return id;\\n+ if (newType != type)\\n+ {\\n+ NotificationChain msgs = null;\\n+ if (type != null)\\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DECOMPOSITION__TYPE, null, msgs);\\n+ if (newType != null)\\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DECOMPOSITION__TYPE, null, msgs);\\n+ msgs = basicSetType(newType, msgs);\\n+ if (msgs != null) msgs.dispatch();\\n+ }\\n+ else if (eNotificationRequired())\\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__TYPE, newType, newType));\\n+ }\\n+\\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public String getName()\\n+ {\\n+ return name;\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public void setId(String newId)\\n+ public void setName(String newName)\\n {\\n- String oldId = id;\\n- id = newId;\\n+ String oldName = name;\\n+ name = newName;\\n if (eNotificationRequired())\\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__ID, oldId, id));\\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DECOMPOSITION__NAME, oldName, name));\\n }\\n \\n /**\\n@@ -276,6 +292,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,\\n {\\n switch (featureID)\\n {\\n+ case IntentSpecificationPackage.DECOMPOSITION__TYPE:\\n+ return basicSetType(null, msgs);\\n case IntentSpecificationPackage.DECOMPOSITION__DOCUMENTS:\\n return ((InternalEList)getDocuments()).basicRemove(otherEnd, msgs);\\n case IntentSpecificationPackage.DECOMPOSITION__MODELS:\\n@@ -298,8 +316,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\\n {\\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\\n return getType();\\n- case IntentSpecificationPackage.DECOMPOSITION__ID:\\n- return getId();\\n+ case IntentSpecificationPackage.DECOMPOSITION__NAME:\\n+ return getName();\\n case IntentSpecificationPackage.DECOMPOSITION__DESC:\\n return getDesc();\\n case IntentSpecificationPackage.DECOMPOSITION__DOCUMENTS:\\n@@ -324,10 +342,10 @@ public void eSet(int featureID, Object newValue)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\\n- setType((String)newValue);\\n+ setType((DecompositionType)newValue);\\n return;\\n- case IntentSpecificationPackage.DECOMPOSITION__ID:\\n- setId((String)newValue);\\n+ case IntentSpecificationPackage.DECOMPOSITION__NAME:\\n+ setName((String)newValue);\\n return;\\n case IntentSpecificationPackage.DECOMPOSITION__DESC:\\n setDesc((String)newValue);\\n@@ -359,10 +377,10 @@ public void eUnset(int featureID)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\\n- setType(TYPE_EDEFAULT);\\n+ setType((DecompositionType)null);\\n return;\\n- case IntentSpecificationPackage.DECOMPOSITION__ID:\\n- setId(ID_EDEFAULT);\\n+ case IntentSpecificationPackage.DECOMPOSITION__NAME:\\n+ setName(NAME_EDEFAULT);\\n return;\\n case IntentSpecificationPackage.DECOMPOSITION__DESC:\\n setDesc(DESC_EDEFAULT);\\n@@ -391,9 +409,9 @@ public boolean eIsSet(int featureID)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.DECOMPOSITION__TYPE:\\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\\n- case IntentSpecificationPackage.DECOMPOSITION__ID:\\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n+ return type != null;\\n+ case IntentSpecificationPackage.DECOMPOSITION__NAME:\\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n case IntentSpecificationPackage.DECOMPOSITION__DESC:\\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\\n case IntentSpecificationPackage.DECOMPOSITION__DOCUMENTS:\\n@@ -417,10 +435,8 @@ public String toString()\\n if (eIsProxy()) return super.toString();\\n \\n StringBuffer result = new StringBuffer(super.toString());\\n- result.append(\\\" (type: \\\");\\n- result.append(type);\\n- result.append(\\\", id: \\\");\\n- result.append(id);\\n+ result.append(\\\" (name: \\\");\\n+ result.append(name);\\n result.append(\\\", desc: \\\");\\n result.append(desc);\\n result.append(')');\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDecompositionImpl.java\",\n \"sha\": \"cc51c09add295af4f04cd7806970f3b2cde2d214\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 76,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDocItemImpl.java\",\n \"changes\": 120,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDocItemImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 44,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/DocItemImpl.java\",\n \"new_code\": \"import net.certware.intent.intentSpecification.DocItemType;\\nimport org.eclipse.emf.common.notify.NotificationChain;\\nimport org.eclipse.emf.ecore.InternalEObject;\\n *
                • {@link net.certware.intent.intentSpecification.impl.DocItemImpl#getName Name}
                  • \\n * The cached value of the '{@link #getType() Type}' containment reference.\\n protected DocItemType type;\\n * The default value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected static final String NAME_EDEFAULT = null;\\n * The cached value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected String name = NAME_EDEFAULT;\\n public DocItemType getType()\\n public NotificationChain basicSetType(DocItemType newType, NotificationChain msgs)\\n DocItemType oldType = type;\\n {\\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, oldType, newType);\\n if (msgs == null) msgs = notification; else msgs.add(notification);\\n }\\n return msgs;\\n public void setType(DocItemType newType)\\n if (newType != type)\\n {\\n NotificationChain msgs = null;\\n if (type != null)\\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DOC_ITEM__TYPE, null, msgs);\\n if (newType != null)\\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DOC_ITEM__TYPE, null, msgs);\\n msgs = basicSetType(newType, msgs);\\n if (msgs != null) msgs.dispatch();\\n }\\n else if (eNotificationRequired())\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, newType, newType));\\n public String getName()\\n return name;\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public void setName(String newName)\\n {\\n String oldName = name;\\n name = newName;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__NAME, oldName, name));\\n /**\\n * \\n * \\n * @generated\\n */\\n @Override\\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\\n {\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\\n return basicSetType(null, msgs);\\n }\\n return super.eInverseRemove(otherEnd, featureID, msgs);\\n }\\n\\n case IntentSpecificationPackage.DOC_ITEM__NAME:\\n return getName();\\n setType((DocItemType)newValue);\\n case IntentSpecificationPackage.DOC_ITEM__NAME:\\n setName((String)newValue);\\n setType((DocItemType)null);\\n case IntentSpecificationPackage.DOC_ITEM__NAME:\\n setName(NAME_EDEFAULT);\\n return type != null;\\n case IntentSpecificationPackage.DOC_ITEM__NAME:\\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n result.append(\\\" (name: \\\");\\n result.append(name);\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"String newName\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/DocItemImpl.java\",\n \"implementation\": \"String oldName = name;\\n name = newName;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__NAME, oldName, name));\\n /**\\n * \\n * \\n * @generated\\n */\\n @Override\\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\\n {\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\\n return basicSetType(null, msgs);\",\n \"signature\": \"void setName(String newName)\"\n }\n ],\n \"old_code\": \" *
                • {@link net.certware.intent.intentSpecification.impl.DocItemImpl#getId Id}
                  • \\n * The default value of the '{@link #getType() Type}' attribute.\\n protected static final String TYPE_EDEFAULT = null;\\n * The cached value of the '{@link #getType() Type}' attribute.\\n * @see #getType()\\n protected String type = TYPE_EDEFAULT;\\n * The default value of the '{@link #getId() Id}' attribute.\\n * @see #getId()\\n protected static final String ID_EDEFAULT = null;\\n\\n /**\\n * The cached value of the '{@link #getId() Id}' attribute.\\n * \\n * \\n * @see #getId()\\n * @generated\\n * @ordered\\n */\\n protected String id = ID_EDEFAULT;\\n public String getType()\\n public void setType(String newType)\\n String oldType = type;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, oldType, type));\\n public String getId()\\n return id;\\n public void setId(String newId)\\n String oldId = id;\\n id = newId;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__ID, oldId, id));\\n case IntentSpecificationPackage.DOC_ITEM__ID:\\n return getId();\\n setType((String)newValue);\\n case IntentSpecificationPackage.DOC_ITEM__ID:\\n setId((String)newValue);\\n setType(TYPE_EDEFAULT);\\n case IntentSpecificationPackage.DOC_ITEM__ID:\\n setId(ID_EDEFAULT);\\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\\n case IntentSpecificationPackage.DOC_ITEM__ID:\\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n result.append(\\\" (type: \\\");\\n result.append(type);\\n result.append(\\\", id: \\\");\\n result.append(id);\",\n \"old_methods\": [],\n \"patch\": \"@@ -3,11 +3,14 @@\\n package net.certware.intent.intentSpecification.impl;\\n \\n import net.certware.intent.intentSpecification.DocItem;\\n+import net.certware.intent.intentSpecification.DocItemType;\\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\\n \\n import org.eclipse.emf.common.notify.Notification;\\n+import org.eclipse.emf.common.notify.NotificationChain;\\n \\n import org.eclipse.emf.ecore.EClass;\\n+import org.eclipse.emf.ecore.InternalEObject;\\n \\n import org.eclipse.emf.ecore.impl.ENotificationImpl;\\n import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;\\n@@ -20,7 +23,7 @@\\n * The following features are implemented:\\n *
                    \\n *
                  • {@link net.certware.intent.intentSpecification.impl.DocItemImpl#getType Type}
                    • \\n- *
                  • {@link net.certware.intent.intentSpecification.impl.DocItemImpl#getId Id}
                    • \\n+ *
                  • {@link net.certware.intent.intentSpecification.impl.DocItemImpl#getName Name}
                    • \\n *
                  • {@link net.certware.intent.intentSpecification.impl.DocItemImpl#getRef Ref}
                    • \\n *
                  \\n *

                  \\n@@ -30,44 +33,34 @@\\n public class DocItemImpl extends MinimalEObjectImpl.Container implements DocItem\\n {\\n /**\\n- * The default value of the '{@link #getType() Type}' attribute.\\n+ * The cached value of the '{@link #getType() Type}' containment reference.\\n * \\n * \\n * @see #getType()\\n * @generated\\n * @ordered\\n */\\n- protected static final String TYPE_EDEFAULT = null;\\n+ protected DocItemType type;\\n \\n /**\\n- * The cached value of the '{@link #getType() Type}' attribute.\\n+ * The default value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getType()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected String type = TYPE_EDEFAULT;\\n+ protected static final String NAME_EDEFAULT = null;\\n \\n /**\\n- * The default value of the '{@link #getId() Id}' attribute.\\n+ * The cached value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getId()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected static final String ID_EDEFAULT = null;\\n-\\n- /**\\n- * The cached value of the '{@link #getId() Id}' attribute.\\n- * \\n- * \\n- * @see #getId()\\n- * @generated\\n- * @ordered\\n- */\\n- protected String id = ID_EDEFAULT;\\n+ protected String name = NAME_EDEFAULT;\\n \\n /**\\n * The default value of the '{@link #getRef() Ref}' attribute.\\n@@ -115,7 +108,7 @@ protected EClass eStaticClass()\\n * \\n * @generated\\n */\\n- public String getType()\\n+ public DocItemType getType()\\n {\\n return type;\\n }\\n@@ -125,35 +118,60 @@ public String getType()\\n * \\n * @generated\\n */\\n- public void setType(String newType)\\n+ public NotificationChain basicSetType(DocItemType newType, NotificationChain msgs)\\n {\\n- String oldType = type;\\n+ DocItemType oldType = type;\\n type = newType;\\n if (eNotificationRequired())\\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, oldType, type));\\n+ {\\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, oldType, newType);\\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\\n+ }\\n+ return msgs;\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public String getId()\\n+ public void setType(DocItemType newType)\\n {\\n- return id;\\n+ if (newType != type)\\n+ {\\n+ NotificationChain msgs = null;\\n+ if (type != null)\\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DOC_ITEM__TYPE, null, msgs);\\n+ if (newType != null)\\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.DOC_ITEM__TYPE, null, msgs);\\n+ msgs = basicSetType(newType, msgs);\\n+ if (msgs != null) msgs.dispatch();\\n+ }\\n+ else if (eNotificationRequired())\\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__TYPE, newType, newType));\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public void setId(String newId)\\n+ public String getName()\\n {\\n- String oldId = id;\\n- id = newId;\\n+ return name;\\n+ }\\n+\\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public void setName(String newName)\\n+ {\\n+ String oldName = name;\\n+ name = newName;\\n if (eNotificationRequired())\\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__ID, oldId, id));\\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__NAME, oldName, name));\\n }\\n \\n /**\\n@@ -179,6 +197,22 @@ public void setRef(String newRef)\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.DOC_ITEM__REF, oldRef, ref));\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ @Override\\n+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\\n+ {\\n+ switch (featureID)\\n+ {\\n+ case IntentSpecificationPackage.DOC_ITEM__TYPE:\\n+ return basicSetType(null, msgs);\\n+ }\\n+ return super.eInverseRemove(otherEnd, featureID, msgs);\\n+ }\\n+\\n /**\\n * \\n * \\n@@ -191,8 +225,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\\n {\\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\\n return getType();\\n- case IntentSpecificationPackage.DOC_ITEM__ID:\\n- return getId();\\n+ case IntentSpecificationPackage.DOC_ITEM__NAME:\\n+ return getName();\\n case IntentSpecificationPackage.DOC_ITEM__REF:\\n return getRef();\\n }\\n@@ -210,10 +244,10 @@ public void eSet(int featureID, Object newValue)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\\n- setType((String)newValue);\\n+ setType((DocItemType)newValue);\\n return;\\n- case IntentSpecificationPackage.DOC_ITEM__ID:\\n- setId((String)newValue);\\n+ case IntentSpecificationPackage.DOC_ITEM__NAME:\\n+ setName((String)newValue);\\n return;\\n case IntentSpecificationPackage.DOC_ITEM__REF:\\n setRef((String)newValue);\\n@@ -233,10 +267,10 @@ public void eUnset(int featureID)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\\n- setType(TYPE_EDEFAULT);\\n+ setType((DocItemType)null);\\n return;\\n- case IntentSpecificationPackage.DOC_ITEM__ID:\\n- setId(ID_EDEFAULT);\\n+ case IntentSpecificationPackage.DOC_ITEM__NAME:\\n+ setName(NAME_EDEFAULT);\\n return;\\n case IntentSpecificationPackage.DOC_ITEM__REF:\\n setRef(REF_EDEFAULT);\\n@@ -256,9 +290,9 @@ public boolean eIsSet(int featureID)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.DOC_ITEM__TYPE:\\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\\n- case IntentSpecificationPackage.DOC_ITEM__ID:\\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n+ return type != null;\\n+ case IntentSpecificationPackage.DOC_ITEM__NAME:\\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n case IntentSpecificationPackage.DOC_ITEM__REF:\\n return REF_EDEFAULT == null ? ref != null : !REF_EDEFAULT.equals(ref);\\n }\\n@@ -276,10 +310,8 @@ public String toString()\\n if (eIsProxy()) return super.toString();\\n \\n StringBuffer result = new StringBuffer(super.toString());\\n- result.append(\\\" (type: \\\");\\n- result.append(type);\\n- result.append(\\\", id: \\\");\\n- result.append(id);\\n+ result.append(\\\" (name: \\\");\\n+ result.append(name);\\n result.append(\\\", ref: \\\");\\n result.append(ref);\\n result.append(')');\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FDocItemImpl.java\",\n \"sha\": \"20e203b0e66bd479ef9ea74aea32e9acae72df48\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 60,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentImpl.java\",\n \"changes\": 104,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 44,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentImpl.java\",\n \"new_code\": \"import net.certware.intent.intentSpecification.IntentType;\\n *
                • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getName Name}
                  • \\n * The cached value of the '{@link #getType() Type}' containment reference.\\n protected IntentType type;\\n * The default value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected static final String NAME_EDEFAULT = null;\\n * The cached value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected String name = NAME_EDEFAULT;\\n public IntentType getType()\\n public NotificationChain basicSetType(IntentType newType, NotificationChain msgs)\\n IntentType oldType = type;\\n {\\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, oldType, newType);\\n if (msgs == null) msgs = notification; else msgs.add(notification);\\n }\\n return msgs;\\n public void setType(IntentType newType)\\n if (newType != type)\\n {\\n NotificationChain msgs = null;\\n if (type != null)\\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.INTENT__TYPE, null, msgs);\\n if (newType != null)\\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.INTENT__TYPE, null, msgs);\\n msgs = basicSetType(newType, msgs);\\n if (msgs != null) msgs.dispatch();\\n }\\n else if (eNotificationRequired())\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, newType, newType));\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public String getName()\\n {\\n return name;\\n public void setName(String newName)\\n String oldName = name;\\n name = newName;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__NAME, oldName, name));\\n case IntentSpecificationPackage.INTENT__TYPE:\\n return basicSetType(null, msgs);\\n case IntentSpecificationPackage.INTENT__NAME:\\n return getName();\\n setType((IntentType)newValue);\\n case IntentSpecificationPackage.INTENT__NAME:\\n setName((String)newValue);\\n setType((IntentType)null);\\n case IntentSpecificationPackage.INTENT__NAME:\\n setName(NAME_EDEFAULT);\\n return type != null;\\n case IntentSpecificationPackage.INTENT__NAME:\\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n result.append(\\\" (name: \\\");\\n result.append(name);\",\n \"new_methods\": [],\n \"old_code\": \" *
                • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getId Id}
                  • \\n * The default value of the '{@link #getType() Type}' attribute.\\n protected static final String TYPE_EDEFAULT = null;\\n * The cached value of the '{@link #getType() Type}' attribute.\\n * @see #getType()\\n protected String type = TYPE_EDEFAULT;\\n * The default value of the '{@link #getId() Id}' attribute.\\n * @see #getId()\\n protected static final String ID_EDEFAULT = null;\\n\\n /**\\n * The cached value of the '{@link #getId() Id}' attribute.\\n * \\n * \\n * @see #getId()\\n * @generated\\n * @ordered\\n */\\n protected String id = ID_EDEFAULT;\\n public String getType()\\n public void setType(String newType)\\n String oldType = type;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, oldType, type));\\n public String getId()\\n return id;\\n public void setId(String newId)\\n String oldId = id;\\n id = newId;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__ID, oldId, id));\\n case IntentSpecificationPackage.INTENT__ID:\\n return getId();\\n setType((String)newValue);\\n case IntentSpecificationPackage.INTENT__ID:\\n setId((String)newValue);\\n setType(TYPE_EDEFAULT);\\n case IntentSpecificationPackage.INTENT__ID:\\n setId(ID_EDEFAULT);\\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\\n case IntentSpecificationPackage.INTENT__ID:\\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n result.append(\\\" (type: \\\");\\n result.append(type);\\n result.append(\\\", id: \\\");\\n result.append(id);\",\n \"old_methods\": [],\n \"patch\": \"@@ -7,6 +7,7 @@\\n import net.certware.intent.intentSpecification.Decomposition;\\n import net.certware.intent.intentSpecification.Intent;\\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\\n+import net.certware.intent.intentSpecification.IntentType;\\n \\n import org.eclipse.emf.common.notify.Notification;\\n import org.eclipse.emf.common.notify.NotificationChain;\\n@@ -30,7 +31,7 @@\\n * The following features are implemented:\\n *
                    \\n *
                  • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getType Type}
                    • \\n- *
                  • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getId Id}
                    • \\n+ *
                  • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getName Name}
                    • \\n *
                  • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getDesc Desc}
                    • \\n *
                  • {@link net.certware.intent.intentSpecification.impl.IntentImpl#getDecompositions Decompositions}
                    • \\n *
                  \\n@@ -41,44 +42,34 @@\\n public class IntentImpl extends MinimalEObjectImpl.Container implements Intent\\n {\\n /**\\n- * The default value of the '{@link #getType() Type}' attribute.\\n+ * The cached value of the '{@link #getType() Type}' containment reference.\\n * \\n * \\n * @see #getType()\\n * @generated\\n * @ordered\\n */\\n- protected static final String TYPE_EDEFAULT = null;\\n+ protected IntentType type;\\n \\n /**\\n- * The cached value of the '{@link #getType() Type}' attribute.\\n+ * The default value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getType()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected String type = TYPE_EDEFAULT;\\n+ protected static final String NAME_EDEFAULT = null;\\n \\n /**\\n- * The default value of the '{@link #getId() Id}' attribute.\\n+ * The cached value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getId()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected static final String ID_EDEFAULT = null;\\n-\\n- /**\\n- * The cached value of the '{@link #getId() Id}' attribute.\\n- * \\n- * \\n- * @see #getId()\\n- * @generated\\n- * @ordered\\n- */\\n- protected String id = ID_EDEFAULT;\\n+ protected String name = NAME_EDEFAULT;\\n \\n /**\\n * The default value of the '{@link #getDesc() Desc}' attribute.\\n@@ -136,7 +127,7 @@ protected EClass eStaticClass()\\n * \\n * @generated\\n */\\n- public String getType()\\n+ public IntentType getType()\\n {\\n return type;\\n }\\n@@ -146,35 +137,60 @@ public String getType()\\n * \\n * @generated\\n */\\n- public void setType(String newType)\\n+ public NotificationChain basicSetType(IntentType newType, NotificationChain msgs)\\n {\\n- String oldType = type;\\n+ IntentType oldType = type;\\n type = newType;\\n if (eNotificationRequired())\\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, oldType, type));\\n+ {\\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, oldType, newType);\\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\\n+ }\\n+ return msgs;\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public String getId()\\n+ public void setType(IntentType newType)\\n {\\n- return id;\\n+ if (newType != type)\\n+ {\\n+ NotificationChain msgs = null;\\n+ if (type != null)\\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.INTENT__TYPE, null, msgs);\\n+ if (newType != null)\\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.INTENT__TYPE, null, msgs);\\n+ msgs = basicSetType(newType, msgs);\\n+ if (msgs != null) msgs.dispatch();\\n+ }\\n+ else if (eNotificationRequired())\\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__TYPE, newType, newType));\\n+ }\\n+\\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public String getName()\\n+ {\\n+ return name;\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public void setId(String newId)\\n+ public void setName(String newName)\\n {\\n- String oldId = id;\\n- id = newId;\\n+ String oldName = name;\\n+ name = newName;\\n if (eNotificationRequired())\\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__ID, oldId, id));\\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.INTENT__NAME, oldName, name));\\n }\\n \\n /**\\n@@ -224,6 +240,8 @@ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID,\\n {\\n switch (featureID)\\n {\\n+ case IntentSpecificationPackage.INTENT__TYPE:\\n+ return basicSetType(null, msgs);\\n case IntentSpecificationPackage.INTENT__DECOMPOSITIONS:\\n return ((InternalEList)getDecompositions()).basicRemove(otherEnd, msgs);\\n }\\n@@ -242,8 +260,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\\n {\\n case IntentSpecificationPackage.INTENT__TYPE:\\n return getType();\\n- case IntentSpecificationPackage.INTENT__ID:\\n- return getId();\\n+ case IntentSpecificationPackage.INTENT__NAME:\\n+ return getName();\\n case IntentSpecificationPackage.INTENT__DESC:\\n return getDesc();\\n case IntentSpecificationPackage.INTENT__DECOMPOSITIONS:\\n@@ -264,10 +282,10 @@ public void eSet(int featureID, Object newValue)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.INTENT__TYPE:\\n- setType((String)newValue);\\n+ setType((IntentType)newValue);\\n return;\\n- case IntentSpecificationPackage.INTENT__ID:\\n- setId((String)newValue);\\n+ case IntentSpecificationPackage.INTENT__NAME:\\n+ setName((String)newValue);\\n return;\\n case IntentSpecificationPackage.INTENT__DESC:\\n setDesc((String)newValue);\\n@@ -291,10 +309,10 @@ public void eUnset(int featureID)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.INTENT__TYPE:\\n- setType(TYPE_EDEFAULT);\\n+ setType((IntentType)null);\\n return;\\n- case IntentSpecificationPackage.INTENT__ID:\\n- setId(ID_EDEFAULT);\\n+ case IntentSpecificationPackage.INTENT__NAME:\\n+ setName(NAME_EDEFAULT);\\n return;\\n case IntentSpecificationPackage.INTENT__DESC:\\n setDesc(DESC_EDEFAULT);\\n@@ -317,9 +335,9 @@ public boolean eIsSet(int featureID)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.INTENT__TYPE:\\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\\n- case IntentSpecificationPackage.INTENT__ID:\\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n+ return type != null;\\n+ case IntentSpecificationPackage.INTENT__NAME:\\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n case IntentSpecificationPackage.INTENT__DESC:\\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\\n case IntentSpecificationPackage.INTENT__DECOMPOSITIONS:\\n@@ -339,10 +357,8 @@ public String toString()\\n if (eIsProxy()) return super.toString();\\n \\n StringBuffer result = new StringBuffer(super.toString());\\n- result.append(\\\" (type: \\\");\\n- result.append(type);\\n- result.append(\\\", id: \\\");\\n- result.append(id);\\n+ result.append(\\\" (name: \\\");\\n+ result.append(name);\\n result.append(\\\", desc: \\\");\\n result.append(desc);\\n result.append(')');\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentImpl.java\",\n \"sha\": \"813aa2e46c32953c6e4544ed666b1e9a1ab2d54a\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 60,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationFactoryImpl.java\",\n \"changes\": 60,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationFactoryImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 0,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java\",\n \"new_code\": \" case IntentSpecificationPackage.INTENT_TYPE: return createIntentType();\\n case IntentSpecificationPackage.DECOMPOSITION_TYPE: return createDecompositionType();\\n case IntentSpecificationPackage.DOC_ITEM_TYPE: return createDocItemType();\\n case IntentSpecificationPackage.MODEL_TYPE: return createModelType();\\n case IntentSpecificationPackage.LIST_ITEM_TYPE: return createListItemType();\\n /**\\n * \\n * \\n * @generated\\n */\\n public IntentType createIntentType()\\n {\\n IntentTypeImpl intentType = new IntentTypeImpl();\\n return intentType;\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public DecompositionType createDecompositionType()\\n {\\n DecompositionTypeImpl decompositionType = new DecompositionTypeImpl();\\n return decompositionType;\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public DocItemType createDocItemType()\\n {\\n DocItemTypeImpl docItemType = new DocItemTypeImpl();\\n return docItemType;\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public ModelType createModelType()\\n {\\n ModelTypeImpl modelType = new ModelTypeImpl();\\n return modelType;\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public ListItemType createListItemType()\\n {\\n ListItemTypeImpl listItemType = new ListItemTypeImpl();\\n return listItemType;\\n }\\n\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java\",\n \"implementation\": \"IntentTypeImpl intentType = new IntentTypeImpl();\\n return intentType;\",\n \"signature\": \"IntentType createIntentType()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java\",\n \"implementation\": \"DecompositionTypeImpl decompositionType = new DecompositionTypeImpl();\\n return decompositionType;\",\n \"signature\": \"DecompositionType createDecompositionType()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java\",\n \"implementation\": \"DocItemTypeImpl docItemType = new DocItemTypeImpl();\\n return docItemType;\",\n \"signature\": \"DocItemType createDocItemType()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java\",\n \"implementation\": \"ModelTypeImpl modelType = new ModelTypeImpl();\\n return modelType;\",\n \"signature\": \"ModelType createModelType()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationFactoryImpl.java\",\n \"implementation\": \"ListItemTypeImpl listItemType = new ListItemTypeImpl();\\n return listItemType;\",\n \"signature\": \"ListItemType createListItemType()\"\n }\n ],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -67,10 +67,15 @@ public EObject create(EClass eClass)\\n case IntentSpecificationPackage.SPECIFICATION: return createSpecification();\\n case IntentSpecificationPackage.REFINEMENT: return createRefinement();\\n case IntentSpecificationPackage.INTENT: return createIntent();\\n+ case IntentSpecificationPackage.INTENT_TYPE: return createIntentType();\\n case IntentSpecificationPackage.DECOMPOSITION: return createDecomposition();\\n+ case IntentSpecificationPackage.DECOMPOSITION_TYPE: return createDecompositionType();\\n case IntentSpecificationPackage.DOCUMENT: return createDocument();\\n+ case IntentSpecificationPackage.DOC_ITEM_TYPE: return createDocItemType();\\n case IntentSpecificationPackage.DOC_ITEM: return createDocItem();\\n+ case IntentSpecificationPackage.MODEL_TYPE: return createModelType();\\n case IntentSpecificationPackage.MODEL_ITEM: return createModelItem();\\n+ case IntentSpecificationPackage.LIST_ITEM_TYPE: return createListItemType();\\n case IntentSpecificationPackage.LIST_ITEM: return createListItem();\\n default:\\n throw new IllegalArgumentException(\\\"The class '\\\" + eClass.getName() + \\\"' is not a valid classifier\\\");\\n@@ -110,6 +115,17 @@ public Intent createIntent()\\n return intent;\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public IntentType createIntentType()\\n+ {\\n+ IntentTypeImpl intentType = new IntentTypeImpl();\\n+ return intentType;\\n+ }\\n+\\n /**\\n * \\n * \\n@@ -121,6 +137,17 @@ public Decomposition createDecomposition()\\n return decomposition;\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public DecompositionType createDecompositionType()\\n+ {\\n+ DecompositionTypeImpl decompositionType = new DecompositionTypeImpl();\\n+ return decompositionType;\\n+ }\\n+\\n /**\\n * \\n * \\n@@ -132,6 +159,17 @@ public Document createDocument()\\n return document;\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public DocItemType createDocItemType()\\n+ {\\n+ DocItemTypeImpl docItemType = new DocItemTypeImpl();\\n+ return docItemType;\\n+ }\\n+\\n /**\\n * \\n * \\n@@ -143,6 +181,17 @@ public DocItem createDocItem()\\n return docItem;\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public ModelType createModelType()\\n+ {\\n+ ModelTypeImpl modelType = new ModelTypeImpl();\\n+ return modelType;\\n+ }\\n+\\n /**\\n * \\n * \\n@@ -154,6 +203,17 @@ public ModelItem createModelItem()\\n return modelItem;\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public ListItemType createListItemType()\\n+ {\\n+ ListItemTypeImpl listItemType = new ListItemTypeImpl();\\n+ return listItemType;\\n+ }\\n+\\n /**\\n * \\n * \",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationFactoryImpl.java\",\n \"sha\": \"24275f91258f97f53208287f491554c5ac732981\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 211,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationPackageImpl.java\",\n \"changes\": 252,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationPackageImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 41,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java\",\n \"new_code\": \"import net.certware.intent.intentSpecification.DecompositionType;\\nimport net.certware.intent.intentSpecification.DocItemType;\\nimport net.certware.intent.intentSpecification.IntentType;\\nimport net.certware.intent.intentSpecification.ListItemType;\\nimport net.certware.intent.intentSpecification.ModelType;\\n /**\\n * \\n * \\n * @generated\\n */\\n private EClass intentTypeEClass = null;\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n private EClass decompositionTypeEClass = null;\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n private EClass docItemTypeEClass = null;\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n private EClass modelTypeEClass = null;\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n private EClass listItemTypeEClass = null;\\n\\n public EAttribute getSpecification_Name()\\n public EAttribute getRefinement_Name()\\n public EReference getIntent_Type()\\n return (EReference)intentEClass.getEStructuralFeatures().get(0);\\n public EAttribute getIntent_Name()\\n /**\\n * \\n * \\n * @generated\\n */\\n public EClass getIntentType()\\n {\\n return intentTypeEClass;\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public EAttribute getIntentType_TypeName()\\n {\\n return (EAttribute)intentTypeEClass.getEStructuralFeatures().get(0);\\n }\\n\\n public EReference getDecomposition_Type()\\n return (EReference)decompositionEClass.getEStructuralFeatures().get(0);\\n public EAttribute getDecomposition_Name()\\n /**\\n * \\n * \\n * @generated\\n */\\n public EClass getDecompositionType()\\n {\\n return decompositionTypeEClass;\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public EAttribute getDecompositionType_TypeName()\\n {\\n return (EAttribute)decompositionTypeEClass.getEStructuralFeatures().get(0);\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public EClass getDocItemType()\\n {\\n return docItemTypeEClass;\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public EAttribute getDocItemType_TypeName()\\n {\\n return (EAttribute)docItemTypeEClass.getEStructuralFeatures().get(0);\\n }\\n\\n public EReference getDocItem_Type()\\n return (EReference)docItemEClass.getEStructuralFeatures().get(0);\\n public EAttribute getDocItem_Name()\\n /**\\n * \\n * \\n * @generated\\n */\\n public EClass getModelType()\\n {\\n return modelTypeEClass;\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public EAttribute getModelType_TypeName()\\n {\\n return (EAttribute)modelTypeEClass.getEStructuralFeatures().get(0);\\n }\\n\\n public EReference getModelItem_Type()\\n return (EReference)modelItemEClass.getEStructuralFeatures().get(0);\\n public EAttribute getModelItem_Name()\\n /**\\n * \\n * \\n * @generated\\n */\\n public EClass getListItemType()\\n {\\n return listItemTypeEClass;\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public EAttribute getListItemType_TypeName()\\n {\\n return (EAttribute)listItemTypeEClass.getEStructuralFeatures().get(0);\\n }\\n\\n public EReference getListItem_Type()\\n return (EReference)listItemEClass.getEStructuralFeatures().get(0);\\n public EAttribute getListItem_Name()\\n createEAttribute(specificationEClass, SPECIFICATION__NAME);\\n createEAttribute(refinementEClass, REFINEMENT__NAME);\\n createEReference(intentEClass, INTENT__TYPE);\\n createEAttribute(intentEClass, INTENT__NAME);\\n intentTypeEClass = createEClass(INTENT_TYPE);\\n createEAttribute(intentTypeEClass, INTENT_TYPE__TYPE_NAME);\\n\\n createEReference(decompositionEClass, DECOMPOSITION__TYPE);\\n createEAttribute(decompositionEClass, DECOMPOSITION__NAME);\\n decompositionTypeEClass = createEClass(DECOMPOSITION_TYPE);\\n createEAttribute(decompositionTypeEClass, DECOMPOSITION_TYPE__TYPE_NAME);\\n\\n docItemTypeEClass = createEClass(DOC_ITEM_TYPE);\\n createEAttribute(docItemTypeEClass, DOC_ITEM_TYPE__TYPE_NAME);\\n\\n createEReference(docItemEClass, DOC_ITEM__TYPE);\\n createEAttribute(docItemEClass, DOC_ITEM__NAME);\\n modelTypeEClass = createEClass(MODEL_TYPE);\\n createEAttribute(modelTypeEClass, MODEL_TYPE__TYPE_NAME);\\n\\n createEReference(modelItemEClass, MODEL_ITEM__TYPE);\\n createEAttribute(modelItemEClass, MODEL_ITEM__NAME);\\n listItemTypeEClass = createEClass(LIST_ITEM_TYPE);\\n createEAttribute(listItemTypeEClass, LIST_ITEM_TYPE__TYPE_NAME);\\n\\n createEReference(listItemEClass, LIST_ITEM__TYPE);\\n createEAttribute(listItemEClass, LIST_ITEM__NAME);\\n initEAttribute(getSpecification_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getRefinement_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEReference(getIntent_Type(), this.getIntentType(), null, \\\"type\\\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getIntent_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEClass(intentTypeEClass, IntentType.class, \\\"IntentType\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n initEAttribute(getIntentType_TypeName(), ecorePackage.getEString(), \\\"typeName\\\", null, 0, 1, IntentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\n initEReference(getDecomposition_Type(), this.getDecompositionType(), null, \\\"type\\\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getDecomposition_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEClass(decompositionTypeEClass, DecompositionType.class, \\\"DecompositionType\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n initEAttribute(getDecompositionType_TypeName(), ecorePackage.getEString(), \\\"typeName\\\", null, 0, 1, DecompositionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\n initEClass(docItemTypeEClass, DocItemType.class, \\\"DocItemType\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n initEAttribute(getDocItemType_TypeName(), ecorePackage.getEString(), \\\"typeName\\\", null, 0, 1, DocItemType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\n initEReference(getDocItem_Type(), this.getDocItemType(), null, \\\"type\\\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getDocItem_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEClass(modelTypeEClass, ModelType.class, \\\"ModelType\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n initEAttribute(getModelType_TypeName(), ecorePackage.getEString(), \\\"typeName\\\", null, 0, 1, ModelType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\n initEReference(getModelItem_Type(), this.getModelType(), null, \\\"type\\\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getModelItem_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEClass(listItemTypeEClass, ListItemType.class, \\\"ListItemType\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n initEAttribute(getListItemType_TypeName(), ecorePackage.getEString(), \\\"typeName\\\", null, 0, 1, ListItemType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n\\n initEReference(getListItem_Type(), this.getListItemType(), null, \\\"type\\\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getListItem_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java\",\n \"implementation\": \"return intentTypeEClass;\",\n \"signature\": \"EClass getIntentType()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java\",\n \"implementation\": \"return (EAttribute)intentTypeEClass.getEStructuralFeatures().get(0);\",\n \"signature\": \"EAttribute getIntentType_TypeName()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java\",\n \"implementation\": \"return decompositionTypeEClass;\",\n \"signature\": \"EClass getDecompositionType()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java\",\n \"implementation\": \"return (EAttribute)decompositionTypeEClass.getEStructuralFeatures().get(0);\",\n \"signature\": \"EAttribute getDecompositionType_TypeName()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java\",\n \"implementation\": \"return docItemTypeEClass;\",\n \"signature\": \"EClass getDocItemType()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java\",\n \"implementation\": \"return (EAttribute)docItemTypeEClass.getEStructuralFeatures().get(0);\",\n \"signature\": \"EAttribute getDocItemType_TypeName()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java\",\n \"implementation\": \"return modelTypeEClass;\",\n \"signature\": \"EClass getModelType()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java\",\n \"implementation\": \"return (EAttribute)modelTypeEClass.getEStructuralFeatures().get(0);\",\n \"signature\": \"EAttribute getModelType_TypeName()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java\",\n \"implementation\": \"return listItemTypeEClass;\",\n \"signature\": \"EClass getListItemType()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/IntentSpecificationPackageImpl.java\",\n \"implementation\": \"return (EAttribute)listItemTypeEClass.getEStructuralFeatures().get(0);\",\n \"signature\": \"EAttribute getListItemType_TypeName()\"\n }\n ],\n \"old_code\": \" public EAttribute getSpecification_Id()\\n public EAttribute getRefinement_Id()\\n public EAttribute getIntent_Type()\\n return (EAttribute)intentEClass.getEStructuralFeatures().get(0);\\n public EAttribute getIntent_Id()\\n public EAttribute getDecomposition_Type()\\n return (EAttribute)decompositionEClass.getEStructuralFeatures().get(0);\\n public EAttribute getDecomposition_Id()\\n public EAttribute getDocItem_Type()\\n return (EAttribute)docItemEClass.getEStructuralFeatures().get(0);\\n public EAttribute getDocItem_Id()\\n public EAttribute getModelItem_Type()\\n return (EAttribute)modelItemEClass.getEStructuralFeatures().get(0);\\n public EAttribute getModelItem_Id()\\n public EAttribute getListItem_Type()\\n return (EAttribute)listItemEClass.getEStructuralFeatures().get(0);\\n public EAttribute getListItem_Id()\\n createEAttribute(specificationEClass, SPECIFICATION__ID);\\n createEAttribute(refinementEClass, REFINEMENT__ID);\\n createEAttribute(intentEClass, INTENT__TYPE);\\n createEAttribute(intentEClass, INTENT__ID);\\n createEAttribute(decompositionEClass, DECOMPOSITION__TYPE);\\n createEAttribute(decompositionEClass, DECOMPOSITION__ID);\\n createEAttribute(docItemEClass, DOC_ITEM__TYPE);\\n createEAttribute(docItemEClass, DOC_ITEM__ID);\\n createEAttribute(modelItemEClass, MODEL_ITEM__TYPE);\\n createEAttribute(modelItemEClass, MODEL_ITEM__ID);\\n createEAttribute(listItemEClass, LIST_ITEM__TYPE);\\n createEAttribute(listItemEClass, LIST_ITEM__ID);\\n initEAttribute(getSpecification_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getRefinement_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getIntent_Type(), ecorePackage.getEString(), \\\"type\\\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getIntent_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getDecomposition_Type(), ecorePackage.getEString(), \\\"type\\\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getDecomposition_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getDocItem_Type(), ecorePackage.getEString(), \\\"type\\\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getDocItem_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getModelItem_Type(), ecorePackage.getEString(), \\\"type\\\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getModelItem_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getListItem_Type(), ecorePackage.getEString(), \\\"type\\\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getListItem_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\",\n \"old_methods\": [],\n \"patch\": \"@@ -3,13 +3,18 @@\\n package net.certware.intent.intentSpecification.impl;\\n \\n import net.certware.intent.intentSpecification.Decomposition;\\n+import net.certware.intent.intentSpecification.DecompositionType;\\n import net.certware.intent.intentSpecification.DocItem;\\n+import net.certware.intent.intentSpecification.DocItemType;\\n import net.certware.intent.intentSpecification.Document;\\n import net.certware.intent.intentSpecification.Intent;\\n import net.certware.intent.intentSpecification.IntentSpecificationFactory;\\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\\n+import net.certware.intent.intentSpecification.IntentType;\\n import net.certware.intent.intentSpecification.ListItem;\\n+import net.certware.intent.intentSpecification.ListItemType;\\n import net.certware.intent.intentSpecification.ModelItem;\\n+import net.certware.intent.intentSpecification.ModelType;\\n import net.certware.intent.intentSpecification.Refinement;\\n import net.certware.intent.intentSpecification.Specification;\\n \\n@@ -49,34 +54,69 @@ public class IntentSpecificationPackageImpl extends EPackageImpl implements Inte\\n */\\n private EClass intentEClass = null;\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ private EClass intentTypeEClass = null;\\n+\\n /**\\n * \\n * \\n * @generated\\n */\\n private EClass decompositionEClass = null;\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ private EClass decompositionTypeEClass = null;\\n+\\n /**\\n * \\n * \\n * @generated\\n */\\n private EClass documentEClass = null;\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ private EClass docItemTypeEClass = null;\\n+\\n /**\\n * \\n * \\n * @generated\\n */\\n private EClass docItemEClass = null;\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ private EClass modelTypeEClass = null;\\n+\\n /**\\n * \\n * \\n * @generated\\n */\\n private EClass modelItemEClass = null;\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ private EClass listItemTypeEClass = null;\\n+\\n /**\\n * \\n * \\n@@ -162,7 +202,7 @@ public EClass getSpecification()\\n * \\n * @generated\\n */\\n- public EAttribute getSpecification_Id()\\n+ public EAttribute getSpecification_Name()\\n {\\n return (EAttribute)specificationEClass.getEStructuralFeatures().get(0);\\n }\\n@@ -192,7 +232,7 @@ public EClass getRefinement()\\n * \\n * @generated\\n */\\n- public EAttribute getRefinement_Id()\\n+ public EAttribute getRefinement_Name()\\n {\\n return (EAttribute)refinementEClass.getEStructuralFeatures().get(0);\\n }\\n@@ -232,17 +272,17 @@ public EClass getIntent()\\n * \\n * @generated\\n */\\n- public EAttribute getIntent_Type()\\n+ public EReference getIntent_Type()\\n {\\n- return (EAttribute)intentEClass.getEStructuralFeatures().get(0);\\n+ return (EReference)intentEClass.getEStructuralFeatures().get(0);\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public EAttribute getIntent_Id()\\n+ public EAttribute getIntent_Name()\\n {\\n return (EAttribute)intentEClass.getEStructuralFeatures().get(1);\\n }\\n@@ -267,6 +307,26 @@ public EReference getIntent_Decompositions()\\n return (EReference)intentEClass.getEStructuralFeatures().get(3);\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public EClass getIntentType()\\n+ {\\n+ return intentTypeEClass;\\n+ }\\n+\\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public EAttribute getIntentType_TypeName()\\n+ {\\n+ return (EAttribute)intentTypeEClass.getEStructuralFeatures().get(0);\\n+ }\\n+\\n /**\\n * \\n * \\n@@ -282,17 +342,17 @@ public EClass getDecomposition()\\n * \\n * @generated\\n */\\n- public EAttribute getDecomposition_Type()\\n+ public EReference getDecomposition_Type()\\n {\\n- return (EAttribute)decompositionEClass.getEStructuralFeatures().get(0);\\n+ return (EReference)decompositionEClass.getEStructuralFeatures().get(0);\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public EAttribute getDecomposition_Id()\\n+ public EAttribute getDecomposition_Name()\\n {\\n return (EAttribute)decompositionEClass.getEStructuralFeatures().get(1);\\n }\\n@@ -337,6 +397,26 @@ public EReference getDecomposition_Items()\\n return (EReference)decompositionEClass.getEStructuralFeatures().get(5);\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public EClass getDecompositionType()\\n+ {\\n+ return decompositionTypeEClass;\\n+ }\\n+\\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public EAttribute getDecompositionType_TypeName()\\n+ {\\n+ return (EAttribute)decompositionTypeEClass.getEStructuralFeatures().get(0);\\n+ }\\n+\\n /**\\n * \\n * \\n@@ -357,6 +437,26 @@ public EReference getDocument_Entries()\\n return (EReference)documentEClass.getEStructuralFeatures().get(0);\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public EClass getDocItemType()\\n+ {\\n+ return docItemTypeEClass;\\n+ }\\n+\\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public EAttribute getDocItemType_TypeName()\\n+ {\\n+ return (EAttribute)docItemTypeEClass.getEStructuralFeatures().get(0);\\n+ }\\n+\\n /**\\n * \\n * \\n@@ -372,17 +472,17 @@ public EClass getDocItem()\\n * \\n * @generated\\n */\\n- public EAttribute getDocItem_Type()\\n+ public EReference getDocItem_Type()\\n {\\n- return (EAttribute)docItemEClass.getEStructuralFeatures().get(0);\\n+ return (EReference)docItemEClass.getEStructuralFeatures().get(0);\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public EAttribute getDocItem_Id()\\n+ public EAttribute getDocItem_Name()\\n {\\n return (EAttribute)docItemEClass.getEStructuralFeatures().get(1);\\n }\\n@@ -397,6 +497,26 @@ public EAttribute getDocItem_Ref()\\n return (EAttribute)docItemEClass.getEStructuralFeatures().get(2);\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public EClass getModelType()\\n+ {\\n+ return modelTypeEClass;\\n+ }\\n+\\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public EAttribute getModelType_TypeName()\\n+ {\\n+ return (EAttribute)modelTypeEClass.getEStructuralFeatures().get(0);\\n+ }\\n+\\n /**\\n * \\n * \\n@@ -412,17 +532,17 @@ public EClass getModelItem()\\n * \\n * @generated\\n */\\n- public EAttribute getModelItem_Type()\\n+ public EReference getModelItem_Type()\\n {\\n- return (EAttribute)modelItemEClass.getEStructuralFeatures().get(0);\\n+ return (EReference)modelItemEClass.getEStructuralFeatures().get(0);\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public EAttribute getModelItem_Id()\\n+ public EAttribute getModelItem_Name()\\n {\\n return (EAttribute)modelItemEClass.getEStructuralFeatures().get(1);\\n }\\n@@ -437,6 +557,26 @@ public EAttribute getModelItem_Desc()\\n return (EAttribute)modelItemEClass.getEStructuralFeatures().get(2);\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public EClass getListItemType()\\n+ {\\n+ return listItemTypeEClass;\\n+ }\\n+\\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public EAttribute getListItemType_TypeName()\\n+ {\\n+ return (EAttribute)listItemTypeEClass.getEStructuralFeatures().get(0);\\n+ }\\n+\\n /**\\n * \\n * \\n@@ -452,17 +592,17 @@ public EClass getListItem()\\n * \\n * @generated\\n */\\n- public EAttribute getListItem_Type()\\n+ public EReference getListItem_Type()\\n {\\n- return (EAttribute)listItemEClass.getEStructuralFeatures().get(0);\\n+ return (EReference)listItemEClass.getEStructuralFeatures().get(0);\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public EAttribute getListItem_Id()\\n+ public EAttribute getListItem_Name()\\n {\\n return (EAttribute)listItemEClass.getEStructuralFeatures().get(1);\\n }\\n@@ -538,44 +678,59 @@ public void createPackageContents()\\n \\n // Create classes and their features\\n specificationEClass = createEClass(SPECIFICATION);\\n- createEAttribute(specificationEClass, SPECIFICATION__ID);\\n+ createEAttribute(specificationEClass, SPECIFICATION__NAME);\\n createEReference(specificationEClass, SPECIFICATION__REFINEMENTS);\\n \\n refinementEClass = createEClass(REFINEMENT);\\n- createEAttribute(refinementEClass, REFINEMENT__ID);\\n+ createEAttribute(refinementEClass, REFINEMENT__NAME);\\n createEAttribute(refinementEClass, REFINEMENT__DESC);\\n createEReference(refinementEClass, REFINEMENT__INTENTS);\\n \\n intentEClass = createEClass(INTENT);\\n- createEAttribute(intentEClass, INTENT__TYPE);\\n- createEAttribute(intentEClass, INTENT__ID);\\n+ createEReference(intentEClass, INTENT__TYPE);\\n+ createEAttribute(intentEClass, INTENT__NAME);\\n createEAttribute(intentEClass, INTENT__DESC);\\n createEReference(intentEClass, INTENT__DECOMPOSITIONS);\\n \\n+ intentTypeEClass = createEClass(INTENT_TYPE);\\n+ createEAttribute(intentTypeEClass, INTENT_TYPE__TYPE_NAME);\\n+\\n decompositionEClass = createEClass(DECOMPOSITION);\\n- createEAttribute(decompositionEClass, DECOMPOSITION__TYPE);\\n- createEAttribute(decompositionEClass, DECOMPOSITION__ID);\\n+ createEReference(decompositionEClass, DECOMPOSITION__TYPE);\\n+ createEAttribute(decompositionEClass, DECOMPOSITION__NAME);\\n createEAttribute(decompositionEClass, DECOMPOSITION__DESC);\\n createEReference(decompositionEClass, DECOMPOSITION__DOCUMENTS);\\n createEReference(decompositionEClass, DECOMPOSITION__MODELS);\\n createEReference(decompositionEClass, DECOMPOSITION__ITEMS);\\n \\n+ decompositionTypeEClass = createEClass(DECOMPOSITION_TYPE);\\n+ createEAttribute(decompositionTypeEClass, DECOMPOSITION_TYPE__TYPE_NAME);\\n+\\n documentEClass = createEClass(DOCUMENT);\\n createEReference(documentEClass, DOCUMENT__ENTRIES);\\n \\n+ docItemTypeEClass = createEClass(DOC_ITEM_TYPE);\\n+ createEAttribute(docItemTypeEClass, DOC_ITEM_TYPE__TYPE_NAME);\\n+\\n docItemEClass = createEClass(DOC_ITEM);\\n- createEAttribute(docItemEClass, DOC_ITEM__TYPE);\\n- createEAttribute(docItemEClass, DOC_ITEM__ID);\\n+ createEReference(docItemEClass, DOC_ITEM__TYPE);\\n+ createEAttribute(docItemEClass, DOC_ITEM__NAME);\\n createEAttribute(docItemEClass, DOC_ITEM__REF);\\n \\n+ modelTypeEClass = createEClass(MODEL_TYPE);\\n+ createEAttribute(modelTypeEClass, MODEL_TYPE__TYPE_NAME);\\n+\\n modelItemEClass = createEClass(MODEL_ITEM);\\n- createEAttribute(modelItemEClass, MODEL_ITEM__TYPE);\\n- createEAttribute(modelItemEClass, MODEL_ITEM__ID);\\n+ createEReference(modelItemEClass, MODEL_ITEM__TYPE);\\n+ createEAttribute(modelItemEClass, MODEL_ITEM__NAME);\\n createEAttribute(modelItemEClass, MODEL_ITEM__DESC);\\n \\n+ listItemTypeEClass = createEClass(LIST_ITEM_TYPE);\\n+ createEAttribute(listItemTypeEClass, LIST_ITEM_TYPE__TYPE_NAME);\\n+\\n listItemEClass = createEClass(LIST_ITEM);\\n- createEAttribute(listItemEClass, LIST_ITEM__TYPE);\\n- createEAttribute(listItemEClass, LIST_ITEM__ID);\\n+ createEReference(listItemEClass, LIST_ITEM__TYPE);\\n+ createEAttribute(listItemEClass, LIST_ITEM__NAME);\\n createEAttribute(listItemEClass, LIST_ITEM__DESC);\\n createEReference(listItemEClass, LIST_ITEM__DOC_REFERENCES);\\n createEReference(listItemEClass, LIST_ITEM__ITEM_REFERENCES);\\n@@ -614,44 +769,59 @@ public void initializePackageContents()\\n \\n // Initialize classes and features; add operations and parameters\\n initEClass(specificationEClass, Specification.class, \\\"Specification\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n- initEAttribute(getSpecification_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+ initEAttribute(getSpecification_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEReference(getSpecification_Refinements(), this.getRefinement(), null, \\\"refinements\\\", null, 0, -1, Specification.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\n initEClass(refinementEClass, Refinement.class, \\\"Refinement\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n- initEAttribute(getRefinement_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+ initEAttribute(getRefinement_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getRefinement_Desc(), ecorePackage.getEString(), \\\"desc\\\", null, 0, 1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEReference(getRefinement_Intents(), this.getIntent(), null, \\\"intents\\\", null, 0, -1, Refinement.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\n initEClass(intentEClass, Intent.class, \\\"Intent\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n- initEAttribute(getIntent_Type(), ecorePackage.getEString(), \\\"type\\\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n- initEAttribute(getIntent_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+ initEReference(getIntent_Type(), this.getIntentType(), null, \\\"type\\\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+ initEAttribute(getIntent_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getIntent_Desc(), ecorePackage.getEString(), \\\"desc\\\", null, 0, 1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEReference(getIntent_Decompositions(), this.getDecomposition(), null, \\\"decompositions\\\", null, 0, -1, Intent.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\n+ initEClass(intentTypeEClass, IntentType.class, \\\"IntentType\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n+ initEAttribute(getIntentType_TypeName(), ecorePackage.getEString(), \\\"typeName\\\", null, 0, 1, IntentType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+\\n initEClass(decompositionEClass, Decomposition.class, \\\"Decomposition\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n- initEAttribute(getDecomposition_Type(), ecorePackage.getEString(), \\\"type\\\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n- initEAttribute(getDecomposition_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+ initEReference(getDecomposition_Type(), this.getDecompositionType(), null, \\\"type\\\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+ initEAttribute(getDecomposition_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getDecomposition_Desc(), ecorePackage.getEString(), \\\"desc\\\", null, 0, 1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEReference(getDecomposition_Documents(), this.getDocument(), null, \\\"documents\\\", null, 0, -1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEReference(getDecomposition_Models(), this.getModelItem(), null, \\\"models\\\", null, 0, -1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEReference(getDecomposition_Items(), this.getListItem(), null, \\\"items\\\", null, 0, -1, Decomposition.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\n+ initEClass(decompositionTypeEClass, DecompositionType.class, \\\"DecompositionType\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n+ initEAttribute(getDecompositionType_TypeName(), ecorePackage.getEString(), \\\"typeName\\\", null, 0, 1, DecompositionType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+\\n initEClass(documentEClass, Document.class, \\\"Document\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n initEReference(getDocument_Entries(), this.getDocItem(), null, \\\"entries\\\", null, 0, -1, Document.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\n+ initEClass(docItemTypeEClass, DocItemType.class, \\\"DocItemType\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n+ initEAttribute(getDocItemType_TypeName(), ecorePackage.getEString(), \\\"typeName\\\", null, 0, 1, DocItemType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+\\n initEClass(docItemEClass, DocItem.class, \\\"DocItem\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n- initEAttribute(getDocItem_Type(), ecorePackage.getEString(), \\\"type\\\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n- initEAttribute(getDocItem_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+ initEReference(getDocItem_Type(), this.getDocItemType(), null, \\\"type\\\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+ initEAttribute(getDocItem_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getDocItem_Ref(), ecorePackage.getEString(), \\\"ref\\\", null, 0, 1, DocItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\n+ initEClass(modelTypeEClass, ModelType.class, \\\"ModelType\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n+ initEAttribute(getModelType_TypeName(), ecorePackage.getEString(), \\\"typeName\\\", null, 0, 1, ModelType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+\\n initEClass(modelItemEClass, ModelItem.class, \\\"ModelItem\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n- initEAttribute(getModelItem_Type(), ecorePackage.getEString(), \\\"type\\\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n- initEAttribute(getModelItem_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+ initEReference(getModelItem_Type(), this.getModelType(), null, \\\"type\\\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+ initEAttribute(getModelItem_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getModelItem_Desc(), ecorePackage.getEString(), \\\"desc\\\", null, 0, 1, ModelItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n \\n+ initEClass(listItemTypeEClass, ListItemType.class, \\\"ListItemType\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n+ initEAttribute(getListItemType_TypeName(), ecorePackage.getEString(), \\\"typeName\\\", null, 0, 1, ListItemType.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+\\n initEClass(listItemEClass, ListItem.class, \\\"ListItem\\\", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);\\n- initEAttribute(getListItem_Type(), ecorePackage.getEString(), \\\"type\\\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n- initEAttribute(getListItem_Id(), ecorePackage.getEString(), \\\"id\\\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+ initEReference(getListItem_Type(), this.getListItemType(), null, \\\"type\\\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n+ initEAttribute(getListItem_Name(), ecorePackage.getEString(), \\\"name\\\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEAttribute(getListItem_Desc(), ecorePackage.getEString(), \\\"desc\\\", null, 0, 1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEReference(getListItem_DocReferences(), this.getDocItem(), null, \\\"docReferences\\\", null, 0, -1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\\n initEReference(getListItem_ItemReferences(), this.getListItem(), null, \\\"itemReferences\\\", null, 0, -1, ListItem.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_COMPOSITE, IS_RESOLVE_PROXIES, !IS_UNSETTABLE, !IS_UNIQUE, !IS_DERIVED, IS_ORDERED);\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FIntentSpecificationPackageImpl.java\",\n \"sha\": \"455a952bd8cbfc8bbcdcc1466c675c7e4a0a33c8\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 76,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FListItemImpl.java\",\n \"changes\": 120,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FListItemImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 44,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/ListItemImpl.java\",\n \"new_code\": \"import net.certware.intent.intentSpecification.ListItemType;\\nimport org.eclipse.emf.common.notify.NotificationChain;\\nimport org.eclipse.emf.ecore.InternalEObject;\\n *
                • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getName Name}
                  • \\n * The cached value of the '{@link #getType() Type}' containment reference.\\n protected ListItemType type;\\n * The default value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected static final String NAME_EDEFAULT = null;\\n * The cached value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected String name = NAME_EDEFAULT;\\n public ListItemType getType()\\n public NotificationChain basicSetType(ListItemType newType, NotificationChain msgs)\\n ListItemType oldType = type;\\n {\\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, oldType, newType);\\n if (msgs == null) msgs = notification; else msgs.add(notification);\\n }\\n return msgs;\\n public void setType(ListItemType newType)\\n if (newType != type)\\n {\\n NotificationChain msgs = null;\\n if (type != null)\\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.LIST_ITEM__TYPE, null, msgs);\\n if (newType != null)\\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.LIST_ITEM__TYPE, null, msgs);\\n msgs = basicSetType(newType, msgs);\\n if (msgs != null) msgs.dispatch();\\n }\\n else if (eNotificationRequired())\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, newType, newType));\\n public String getName()\\n return name;\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public void setName(String newName)\\n {\\n String oldName = name;\\n name = newName;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__NAME, oldName, name));\\n /**\\n * \\n * \\n * @generated\\n */\\n @Override\\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\\n {\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\\n return basicSetType(null, msgs);\\n }\\n return super.eInverseRemove(otherEnd, featureID, msgs);\\n }\\n\\n case IntentSpecificationPackage.LIST_ITEM__NAME:\\n return getName();\\n setType((ListItemType)newValue);\\n case IntentSpecificationPackage.LIST_ITEM__NAME:\\n setName((String)newValue);\\n setType((ListItemType)null);\\n case IntentSpecificationPackage.LIST_ITEM__NAME:\\n setName(NAME_EDEFAULT);\\n return type != null;\\n case IntentSpecificationPackage.LIST_ITEM__NAME:\\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n result.append(\\\" (name: \\\");\\n result.append(name);\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"String newName\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/ListItemImpl.java\",\n \"implementation\": \"String oldName = name;\\n name = newName;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__NAME, oldName, name));\\n /**\\n * \\n * \\n * @generated\\n */\\n @Override\\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\\n {\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\\n return basicSetType(null, msgs);\",\n \"signature\": \"void setName(String newName)\"\n }\n ],\n \"old_code\": \" *
                • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getId Id}
                  • \\n * The default value of the '{@link #getType() Type}' attribute.\\n protected static final String TYPE_EDEFAULT = null;\\n * The cached value of the '{@link #getType() Type}' attribute.\\n * @see #getType()\\n protected String type = TYPE_EDEFAULT;\\n * The default value of the '{@link #getId() Id}' attribute.\\n * @see #getId()\\n protected static final String ID_EDEFAULT = null;\\n\\n /**\\n * The cached value of the '{@link #getId() Id}' attribute.\\n * \\n * \\n * @see #getId()\\n * @generated\\n * @ordered\\n */\\n protected String id = ID_EDEFAULT;\\n public String getType()\\n public void setType(String newType)\\n String oldType = type;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, oldType, type));\\n public String getId()\\n return id;\\n public void setId(String newId)\\n String oldId = id;\\n id = newId;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__ID, oldId, id));\\n case IntentSpecificationPackage.LIST_ITEM__ID:\\n return getId();\\n setType((String)newValue);\\n case IntentSpecificationPackage.LIST_ITEM__ID:\\n setId((String)newValue);\\n setType(TYPE_EDEFAULT);\\n case IntentSpecificationPackage.LIST_ITEM__ID:\\n setId(ID_EDEFAULT);\\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\\n case IntentSpecificationPackage.LIST_ITEM__ID:\\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n result.append(\\\" (type: \\\");\\n result.append(type);\\n result.append(\\\", id: \\\");\\n result.append(id);\",\n \"old_methods\": [],\n \"patch\": \"@@ -7,13 +7,16 @@\\n import net.certware.intent.intentSpecification.DocItem;\\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\\n import net.certware.intent.intentSpecification.ListItem;\\n+import net.certware.intent.intentSpecification.ListItemType;\\n import net.certware.intent.intentSpecification.ModelItem;\\n \\n import org.eclipse.emf.common.notify.Notification;\\n+import org.eclipse.emf.common.notify.NotificationChain;\\n \\n import org.eclipse.emf.common.util.EList;\\n \\n import org.eclipse.emf.ecore.EClass;\\n+import org.eclipse.emf.ecore.InternalEObject;\\n \\n import org.eclipse.emf.ecore.impl.ENotificationImpl;\\n import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;\\n@@ -28,7 +31,7 @@\\n * The following features are implemented:\\n *
                    \\n *
                  • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getType Type}
                    • \\n- *
                  • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getId Id}
                    • \\n+ *
                  • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getName Name}
                    • \\n *
                  • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getDesc Desc}
                    • \\n *
                  • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getDocReferences Doc References}
                    • \\n *
                  • {@link net.certware.intent.intentSpecification.impl.ListItemImpl#getItemReferences Item References}
                    • \\n@@ -41,44 +44,34 @@\\n public class ListItemImpl extends MinimalEObjectImpl.Container implements ListItem\\n {\\n /**\\n- * The default value of the '{@link #getType() Type}' attribute.\\n+ * The cached value of the '{@link #getType() Type}' containment reference.\\n * \\n * \\n * @see #getType()\\n * @generated\\n * @ordered\\n */\\n- protected static final String TYPE_EDEFAULT = null;\\n+ protected ListItemType type;\\n \\n /**\\n- * The cached value of the '{@link #getType() Type}' attribute.\\n+ * The default value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getType()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected String type = TYPE_EDEFAULT;\\n+ protected static final String NAME_EDEFAULT = null;\\n \\n /**\\n- * The default value of the '{@link #getId() Id}' attribute.\\n+ * The cached value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getId()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected static final String ID_EDEFAULT = null;\\n-\\n- /**\\n- * The cached value of the '{@link #getId() Id}' attribute.\\n- * \\n- * \\n- * @see #getId()\\n- * @generated\\n- * @ordered\\n- */\\n- protected String id = ID_EDEFAULT;\\n+ protected String name = NAME_EDEFAULT;\\n \\n /**\\n * The default value of the '{@link #getDesc() Desc}' attribute.\\n@@ -156,7 +149,7 @@ protected EClass eStaticClass()\\n * \\n * @generated\\n */\\n- public String getType()\\n+ public ListItemType getType()\\n {\\n return type;\\n }\\n@@ -166,35 +159,60 @@ public String getType()\\n * \\n * @generated\\n */\\n- public void setType(String newType)\\n+ public NotificationChain basicSetType(ListItemType newType, NotificationChain msgs)\\n {\\n- String oldType = type;\\n+ ListItemType oldType = type;\\n type = newType;\\n if (eNotificationRequired())\\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, oldType, type));\\n+ {\\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, oldType, newType);\\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\\n+ }\\n+ return msgs;\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public String getId()\\n+ public void setType(ListItemType newType)\\n {\\n- return id;\\n+ if (newType != type)\\n+ {\\n+ NotificationChain msgs = null;\\n+ if (type != null)\\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.LIST_ITEM__TYPE, null, msgs);\\n+ if (newType != null)\\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.LIST_ITEM__TYPE, null, msgs);\\n+ msgs = basicSetType(newType, msgs);\\n+ if (msgs != null) msgs.dispatch();\\n+ }\\n+ else if (eNotificationRequired())\\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__TYPE, newType, newType));\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public void setId(String newId)\\n+ public String getName()\\n {\\n- String oldId = id;\\n- id = newId;\\n+ return name;\\n+ }\\n+\\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public void setName(String newName)\\n+ {\\n+ String oldName = name;\\n+ name = newName;\\n if (eNotificationRequired())\\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__ID, oldId, id));\\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.LIST_ITEM__NAME, oldName, name));\\n }\\n \\n /**\\n@@ -262,6 +280,22 @@ public EList getModelReferences()\\n return modelReferences;\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ @Override\\n+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\\n+ {\\n+ switch (featureID)\\n+ {\\n+ case IntentSpecificationPackage.LIST_ITEM__TYPE:\\n+ return basicSetType(null, msgs);\\n+ }\\n+ return super.eInverseRemove(otherEnd, featureID, msgs);\\n+ }\\n+\\n /**\\n * \\n * \\n@@ -274,8 +308,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\\n {\\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\\n return getType();\\n- case IntentSpecificationPackage.LIST_ITEM__ID:\\n- return getId();\\n+ case IntentSpecificationPackage.LIST_ITEM__NAME:\\n+ return getName();\\n case IntentSpecificationPackage.LIST_ITEM__DESC:\\n return getDesc();\\n case IntentSpecificationPackage.LIST_ITEM__DOC_REFERENCES:\\n@@ -300,10 +334,10 @@ public void eSet(int featureID, Object newValue)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\\n- setType((String)newValue);\\n+ setType((ListItemType)newValue);\\n return;\\n- case IntentSpecificationPackage.LIST_ITEM__ID:\\n- setId((String)newValue);\\n+ case IntentSpecificationPackage.LIST_ITEM__NAME:\\n+ setName((String)newValue);\\n return;\\n case IntentSpecificationPackage.LIST_ITEM__DESC:\\n setDesc((String)newValue);\\n@@ -335,10 +369,10 @@ public void eUnset(int featureID)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\\n- setType(TYPE_EDEFAULT);\\n+ setType((ListItemType)null);\\n return;\\n- case IntentSpecificationPackage.LIST_ITEM__ID:\\n- setId(ID_EDEFAULT);\\n+ case IntentSpecificationPackage.LIST_ITEM__NAME:\\n+ setName(NAME_EDEFAULT);\\n return;\\n case IntentSpecificationPackage.LIST_ITEM__DESC:\\n setDesc(DESC_EDEFAULT);\\n@@ -367,9 +401,9 @@ public boolean eIsSet(int featureID)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.LIST_ITEM__TYPE:\\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\\n- case IntentSpecificationPackage.LIST_ITEM__ID:\\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n+ return type != null;\\n+ case IntentSpecificationPackage.LIST_ITEM__NAME:\\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n case IntentSpecificationPackage.LIST_ITEM__DESC:\\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\\n case IntentSpecificationPackage.LIST_ITEM__DOC_REFERENCES:\\n@@ -393,10 +427,8 @@ public String toString()\\n if (eIsProxy()) return super.toString();\\n \\n StringBuffer result = new StringBuffer(super.toString());\\n- result.append(\\\" (type: \\\");\\n- result.append(type);\\n- result.append(\\\", id: \\\");\\n- result.append(id);\\n+ result.append(\\\" (name: \\\");\\n+ result.append(name);\\n result.append(\\\", desc: \\\");\\n result.append(desc);\\n result.append(')');\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FListItemImpl.java\",\n \"sha\": \"b011062cede0f011e0295663d0bfd8364accc9ce\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 76,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FModelItemImpl.java\",\n \"changes\": 120,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FModelItemImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 44,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/ModelItemImpl.java\",\n \"new_code\": \"import net.certware.intent.intentSpecification.ModelType;\\nimport org.eclipse.emf.common.notify.NotificationChain;\\nimport org.eclipse.emf.ecore.InternalEObject;\\n *
                  • {@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getName Name}
                    • \\n * The cached value of the '{@link #getType() Type}' containment reference.\\n protected ModelType type;\\n * The default value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected static final String NAME_EDEFAULT = null;\\n * The cached value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected String name = NAME_EDEFAULT;\\n public ModelType getType()\\n public NotificationChain basicSetType(ModelType newType, NotificationChain msgs)\\n ModelType oldType = type;\\n {\\n ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, oldType, newType);\\n if (msgs == null) msgs = notification; else msgs.add(notification);\\n }\\n return msgs;\\n public void setType(ModelType newType)\\n if (newType != type)\\n {\\n NotificationChain msgs = null;\\n if (type != null)\\n msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.MODEL_ITEM__TYPE, null, msgs);\\n if (newType != null)\\n msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.MODEL_ITEM__TYPE, null, msgs);\\n msgs = basicSetType(newType, msgs);\\n if (msgs != null) msgs.dispatch();\\n }\\n else if (eNotificationRequired())\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, newType, newType));\\n public String getName()\\n return name;\\n }\\n\\n /**\\n * \\n * \\n * @generated\\n */\\n public void setName(String newName)\\n {\\n String oldName = name;\\n name = newName;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__NAME, oldName, name));\\n /**\\n * \\n * \\n * @generated\\n */\\n @Override\\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\\n {\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\\n return basicSetType(null, msgs);\\n }\\n return super.eInverseRemove(otherEnd, featureID, msgs);\\n }\\n\\n case IntentSpecificationPackage.MODEL_ITEM__NAME:\\n return getName();\\n setType((ModelType)newValue);\\n case IntentSpecificationPackage.MODEL_ITEM__NAME:\\n setName((String)newValue);\\n setType((ModelType)null);\\n case IntentSpecificationPackage.MODEL_ITEM__NAME:\\n setName(NAME_EDEFAULT);\\n return type != null;\\n case IntentSpecificationPackage.MODEL_ITEM__NAME:\\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n result.append(\\\" (name: \\\");\\n result.append(name);\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"String newName\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/ModelItemImpl.java\",\n \"implementation\": \"String oldName = name;\\n name = newName;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__NAME, oldName, name));\\n /**\\n * \\n * \\n * @generated\\n */\\n @Override\\n public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\\n {\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\\n return basicSetType(null, msgs);\",\n \"signature\": \"void setName(String newName)\"\n }\n ],\n \"old_code\": \" *
                  • {@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getId Id}
                    • \\n * The default value of the '{@link #getType() Type}' attribute.\\n protected static final String TYPE_EDEFAULT = null;\\n * The cached value of the '{@link #getType() Type}' attribute.\\n * @see #getType()\\n protected String type = TYPE_EDEFAULT;\\n * The default value of the '{@link #getId() Id}' attribute.\\n * @see #getId()\\n protected static final String ID_EDEFAULT = null;\\n\\n /**\\n * The cached value of the '{@link #getId() Id}' attribute.\\n * \\n * \\n * @see #getId()\\n * @generated\\n * @ordered\\n */\\n protected String id = ID_EDEFAULT;\\n public String getType()\\n public void setType(String newType)\\n String oldType = type;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, oldType, type));\\n public String getId()\\n return id;\\n public void setId(String newId)\\n String oldId = id;\\n id = newId;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__ID, oldId, id));\\n case IntentSpecificationPackage.MODEL_ITEM__ID:\\n return getId();\\n setType((String)newValue);\\n case IntentSpecificationPackage.MODEL_ITEM__ID:\\n setId((String)newValue);\\n setType(TYPE_EDEFAULT);\\n case IntentSpecificationPackage.MODEL_ITEM__ID:\\n setId(ID_EDEFAULT);\\n return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\\n case IntentSpecificationPackage.MODEL_ITEM__ID:\\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n result.append(\\\" (type: \\\");\\n result.append(type);\\n result.append(\\\", id: \\\");\\n result.append(id);\",\n \"old_methods\": [],\n \"patch\": \"@@ -4,10 +4,13 @@\\n \\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\\n import net.certware.intent.intentSpecification.ModelItem;\\n+import net.certware.intent.intentSpecification.ModelType;\\n \\n import org.eclipse.emf.common.notify.Notification;\\n+import org.eclipse.emf.common.notify.NotificationChain;\\n \\n import org.eclipse.emf.ecore.EClass;\\n+import org.eclipse.emf.ecore.InternalEObject;\\n \\n import org.eclipse.emf.ecore.impl.ENotificationImpl;\\n import org.eclipse.emf.ecore.impl.MinimalEObjectImpl;\\n@@ -20,7 +23,7 @@\\n * The following features are implemented:\\n *
                      \\n *
                    • {@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getType Type}
                      • \\n- *
                    • {@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getId Id}
                      • \\n+ *
                    • {@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getName Name}
                      • \\n *
                    • {@link net.certware.intent.intentSpecification.impl.ModelItemImpl#getDesc Desc}
                      • \\n *
                    \\n *

                    \\n@@ -30,44 +33,34 @@\\n public class ModelItemImpl extends MinimalEObjectImpl.Container implements ModelItem\\n {\\n /**\\n- * The default value of the '{@link #getType() Type}' attribute.\\n+ * The cached value of the '{@link #getType() Type}' containment reference.\\n * \\n * \\n * @see #getType()\\n * @generated\\n * @ordered\\n */\\n- protected static final String TYPE_EDEFAULT = null;\\n+ protected ModelType type;\\n \\n /**\\n- * The cached value of the '{@link #getType() Type}' attribute.\\n+ * The default value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getType()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected String type = TYPE_EDEFAULT;\\n+ protected static final String NAME_EDEFAULT = null;\\n \\n /**\\n- * The default value of the '{@link #getId() Id}' attribute.\\n+ * The cached value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getId()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected static final String ID_EDEFAULT = null;\\n-\\n- /**\\n- * The cached value of the '{@link #getId() Id}' attribute.\\n- * \\n- * \\n- * @see #getId()\\n- * @generated\\n- * @ordered\\n- */\\n- protected String id = ID_EDEFAULT;\\n+ protected String name = NAME_EDEFAULT;\\n \\n /**\\n * The default value of the '{@link #getDesc() Desc}' attribute.\\n@@ -115,7 +108,7 @@ protected EClass eStaticClass()\\n * \\n * @generated\\n */\\n- public String getType()\\n+ public ModelType getType()\\n {\\n return type;\\n }\\n@@ -125,35 +118,60 @@ public String getType()\\n * \\n * @generated\\n */\\n- public void setType(String newType)\\n+ public NotificationChain basicSetType(ModelType newType, NotificationChain msgs)\\n {\\n- String oldType = type;\\n+ ModelType oldType = type;\\n type = newType;\\n if (eNotificationRequired())\\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, oldType, type));\\n+ {\\n+ ENotificationImpl notification = new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, oldType, newType);\\n+ if (msgs == null) msgs = notification; else msgs.add(notification);\\n+ }\\n+ return msgs;\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public String getId()\\n+ public void setType(ModelType newType)\\n {\\n- return id;\\n+ if (newType != type)\\n+ {\\n+ NotificationChain msgs = null;\\n+ if (type != null)\\n+ msgs = ((InternalEObject)type).eInverseRemove(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.MODEL_ITEM__TYPE, null, msgs);\\n+ if (newType != null)\\n+ msgs = ((InternalEObject)newType).eInverseAdd(this, EOPPOSITE_FEATURE_BASE - IntentSpecificationPackage.MODEL_ITEM__TYPE, null, msgs);\\n+ msgs = basicSetType(newType, msgs);\\n+ if (msgs != null) msgs.dispatch();\\n+ }\\n+ else if (eNotificationRequired())\\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__TYPE, newType, newType));\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public void setId(String newId)\\n+ public String getName()\\n {\\n- String oldId = id;\\n- id = newId;\\n+ return name;\\n+ }\\n+\\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ public void setName(String newName)\\n+ {\\n+ String oldName = name;\\n+ name = newName;\\n if (eNotificationRequired())\\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__ID, oldId, id));\\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__NAME, oldName, name));\\n }\\n \\n /**\\n@@ -179,6 +197,22 @@ public void setDesc(String newDesc)\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.MODEL_ITEM__DESC, oldDesc, desc));\\n }\\n \\n+ /**\\n+ * \\n+ * \\n+ * @generated\\n+ */\\n+ @Override\\n+ public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs)\\n+ {\\n+ switch (featureID)\\n+ {\\n+ case IntentSpecificationPackage.MODEL_ITEM__TYPE:\\n+ return basicSetType(null, msgs);\\n+ }\\n+ return super.eInverseRemove(otherEnd, featureID, msgs);\\n+ }\\n+\\n /**\\n * \\n * \\n@@ -191,8 +225,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\\n {\\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\\n return getType();\\n- case IntentSpecificationPackage.MODEL_ITEM__ID:\\n- return getId();\\n+ case IntentSpecificationPackage.MODEL_ITEM__NAME:\\n+ return getName();\\n case IntentSpecificationPackage.MODEL_ITEM__DESC:\\n return getDesc();\\n }\\n@@ -210,10 +244,10 @@ public void eSet(int featureID, Object newValue)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\\n- setType((String)newValue);\\n+ setType((ModelType)newValue);\\n return;\\n- case IntentSpecificationPackage.MODEL_ITEM__ID:\\n- setId((String)newValue);\\n+ case IntentSpecificationPackage.MODEL_ITEM__NAME:\\n+ setName((String)newValue);\\n return;\\n case IntentSpecificationPackage.MODEL_ITEM__DESC:\\n setDesc((String)newValue);\\n@@ -233,10 +267,10 @@ public void eUnset(int featureID)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\\n- setType(TYPE_EDEFAULT);\\n+ setType((ModelType)null);\\n return;\\n- case IntentSpecificationPackage.MODEL_ITEM__ID:\\n- setId(ID_EDEFAULT);\\n+ case IntentSpecificationPackage.MODEL_ITEM__NAME:\\n+ setName(NAME_EDEFAULT);\\n return;\\n case IntentSpecificationPackage.MODEL_ITEM__DESC:\\n setDesc(DESC_EDEFAULT);\\n@@ -256,9 +290,9 @@ public boolean eIsSet(int featureID)\\n switch (featureID)\\n {\\n case IntentSpecificationPackage.MODEL_ITEM__TYPE:\\n- return TYPE_EDEFAULT == null ? type != null : !TYPE_EDEFAULT.equals(type);\\n- case IntentSpecificationPackage.MODEL_ITEM__ID:\\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n+ return type != null;\\n+ case IntentSpecificationPackage.MODEL_ITEM__NAME:\\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n case IntentSpecificationPackage.MODEL_ITEM__DESC:\\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\\n }\\n@@ -276,10 +310,8 @@ public String toString()\\n if (eIsProxy()) return super.toString();\\n \\n StringBuffer result = new StringBuffer(super.toString());\\n- result.append(\\\" (type: \\\");\\n- result.append(type);\\n- result.append(\\\", id: \\\");\\n- result.append(id);\\n+ result.append(\\\" (name: \\\");\\n+ result.append(name);\\n result.append(\\\", desc: \\\");\\n result.append(desc);\\n result.append(')');\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FModelItemImpl.java\",\n \"sha\": \"c0633e50b5bed3611fcaa98d14cba868062e886c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 23,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FRefinementImpl.java\",\n \"changes\": 46,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FRefinementImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 23,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/RefinementImpl.java\",\n \"new_code\": \" *
                  • {@link net.certware.intent.intentSpecification.impl.RefinementImpl#getName Name}
                    • \\n * The default value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected static final String NAME_EDEFAULT = null;\\n * The cached value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected String name = NAME_EDEFAULT;\\n public String getName()\\n return name;\\n public void setName(String newName)\\n String oldName = name;\\n name = newName;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.REFINEMENT__NAME, oldName, name));\\n case IntentSpecificationPackage.REFINEMENT__NAME:\\n return getName();\\n case IntentSpecificationPackage.REFINEMENT__NAME:\\n setName((String)newValue);\\n case IntentSpecificationPackage.REFINEMENT__NAME:\\n setName(NAME_EDEFAULT);\\n case IntentSpecificationPackage.REFINEMENT__NAME:\\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n result.append(\\\" (name: \\\");\\n result.append(name);\",\n \"new_methods\": [],\n \"old_code\": \" *
                  • {@link net.certware.intent.intentSpecification.impl.RefinementImpl#getId Id}
                    • \\n * The default value of the '{@link #getId() Id}' attribute.\\n * @see #getId()\\n protected static final String ID_EDEFAULT = null;\\n * The cached value of the '{@link #getId() Id}' attribute.\\n * @see #getId()\\n protected String id = ID_EDEFAULT;\\n public String getId()\\n return id;\\n public void setId(String newId)\\n String oldId = id;\\n id = newId;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.REFINEMENT__ID, oldId, id));\\n case IntentSpecificationPackage.REFINEMENT__ID:\\n return getId();\\n case IntentSpecificationPackage.REFINEMENT__ID:\\n setId((String)newValue);\\n case IntentSpecificationPackage.REFINEMENT__ID:\\n setId(ID_EDEFAULT);\\n case IntentSpecificationPackage.REFINEMENT__ID:\\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n result.append(\\\" (id: \\\");\\n result.append(id);\",\n \"old_methods\": [],\n \"patch\": \"@@ -29,7 +29,7 @@\\n *

                    \\n * The following features are implemented:\\n *

                      \\n- *
                    • {@link net.certware.intent.intentSpecification.impl.RefinementImpl#getId Id}
                      • \\n+ *
                    • {@link net.certware.intent.intentSpecification.impl.RefinementImpl#getName Name}
                      • \\n *
                    • {@link net.certware.intent.intentSpecification.impl.RefinementImpl#getDesc Desc}
                      • \\n *
                    • {@link net.certware.intent.intentSpecification.impl.RefinementImpl#getIntents Intents}
                      • \\n *
                    \\n@@ -40,24 +40,24 @@\\n public class RefinementImpl extends MinimalEObjectImpl.Container implements Refinement\\n {\\n /**\\n- * The default value of the '{@link #getId() Id}' attribute.\\n+ * The default value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getId()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected static final String ID_EDEFAULT = null;\\n+ protected static final String NAME_EDEFAULT = null;\\n \\n /**\\n- * The cached value of the '{@link #getId() Id}' attribute.\\n+ * The cached value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getId()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected String id = ID_EDEFAULT;\\n+ protected String name = NAME_EDEFAULT;\\n \\n /**\\n * The default value of the '{@link #getDesc() Desc}' attribute.\\n@@ -115,22 +115,22 @@ protected EClass eStaticClass()\\n * \\n * @generated\\n */\\n- public String getId()\\n+ public String getName()\\n {\\n- return id;\\n+ return name;\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public void setId(String newId)\\n+ public void setName(String newName)\\n {\\n- String oldId = id;\\n- id = newId;\\n+ String oldName = name;\\n+ name = newName;\\n if (eNotificationRequired())\\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.REFINEMENT__ID, oldId, id));\\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.REFINEMENT__NAME, oldName, name));\\n }\\n \\n /**\\n@@ -196,8 +196,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\\n {\\n switch (featureID)\\n {\\n- case IntentSpecificationPackage.REFINEMENT__ID:\\n- return getId();\\n+ case IntentSpecificationPackage.REFINEMENT__NAME:\\n+ return getName();\\n case IntentSpecificationPackage.REFINEMENT__DESC:\\n return getDesc();\\n case IntentSpecificationPackage.REFINEMENT__INTENTS:\\n@@ -217,8 +217,8 @@ public void eSet(int featureID, Object newValue)\\n {\\n switch (featureID)\\n {\\n- case IntentSpecificationPackage.REFINEMENT__ID:\\n- setId((String)newValue);\\n+ case IntentSpecificationPackage.REFINEMENT__NAME:\\n+ setName((String)newValue);\\n return;\\n case IntentSpecificationPackage.REFINEMENT__DESC:\\n setDesc((String)newValue);\\n@@ -241,8 +241,8 @@ public void eUnset(int featureID)\\n {\\n switch (featureID)\\n {\\n- case IntentSpecificationPackage.REFINEMENT__ID:\\n- setId(ID_EDEFAULT);\\n+ case IntentSpecificationPackage.REFINEMENT__NAME:\\n+ setName(NAME_EDEFAULT);\\n return;\\n case IntentSpecificationPackage.REFINEMENT__DESC:\\n setDesc(DESC_EDEFAULT);\\n@@ -264,8 +264,8 @@ public boolean eIsSet(int featureID)\\n {\\n switch (featureID)\\n {\\n- case IntentSpecificationPackage.REFINEMENT__ID:\\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n+ case IntentSpecificationPackage.REFINEMENT__NAME:\\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n case IntentSpecificationPackage.REFINEMENT__DESC:\\n return DESC_EDEFAULT == null ? desc != null : !DESC_EDEFAULT.equals(desc);\\n case IntentSpecificationPackage.REFINEMENT__INTENTS:\\n@@ -285,8 +285,8 @@ public String toString()\\n if (eIsProxy()) return super.toString();\\n \\n StringBuffer result = new StringBuffer(super.toString());\\n- result.append(\\\" (id: \\\");\\n- result.append(id);\\n+ result.append(\\\" (name: \\\");\\n+ result.append(name);\\n result.append(\\\", desc: \\\");\\n result.append(desc);\\n result.append(')');\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FRefinementImpl.java\",\n \"sha\": \"5107d573c7e32b4b2e475b9928f8d96a17a7036b\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 23,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FSpecificationImpl.java\",\n \"changes\": 46,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FSpecificationImpl.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 23,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/impl/SpecificationImpl.java\",\n \"new_code\": \" *
                  • {@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getName Name}
                    • \\n * The default value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected static final String NAME_EDEFAULT = null;\\n * The cached value of the '{@link #getName() Name}' attribute.\\n * @see #getName()\\n protected String name = NAME_EDEFAULT;\\n public String getName()\\n return name;\\n public void setName(String newName)\\n String oldName = name;\\n name = newName;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.SPECIFICATION__NAME, oldName, name));\\n case IntentSpecificationPackage.SPECIFICATION__NAME:\\n return getName();\\n case IntentSpecificationPackage.SPECIFICATION__NAME:\\n setName((String)newValue);\\n case IntentSpecificationPackage.SPECIFICATION__NAME:\\n setName(NAME_EDEFAULT);\\n case IntentSpecificationPackage.SPECIFICATION__NAME:\\n return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n result.append(\\\" (name: \\\");\\n result.append(name);\",\n \"new_methods\": [],\n \"old_code\": \" *
                  • {@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getId Id}
                    • \\n * The default value of the '{@link #getId() Id}' attribute.\\n * @see #getId()\\n protected static final String ID_EDEFAULT = null;\\n * The cached value of the '{@link #getId() Id}' attribute.\\n * @see #getId()\\n protected String id = ID_EDEFAULT;\\n public String getId()\\n return id;\\n public void setId(String newId)\\n String oldId = id;\\n id = newId;\\n eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.SPECIFICATION__ID, oldId, id));\\n case IntentSpecificationPackage.SPECIFICATION__ID:\\n return getId();\\n case IntentSpecificationPackage.SPECIFICATION__ID:\\n setId((String)newValue);\\n case IntentSpecificationPackage.SPECIFICATION__ID:\\n setId(ID_EDEFAULT);\\n case IntentSpecificationPackage.SPECIFICATION__ID:\\n return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n result.append(\\\" (id: \\\");\\n result.append(id);\",\n \"old_methods\": [],\n \"patch\": \"@@ -29,7 +29,7 @@\\n *

                    \\n * The following features are implemented:\\n *

                      \\n- *
                    • {@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getId Id}
                      • \\n+ *
                    • {@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getName Name}
                      • \\n *
                    • {@link net.certware.intent.intentSpecification.impl.SpecificationImpl#getRefinements Refinements}
                      • \\n *
                    \\n *

                    \\n@@ -39,24 +39,24 @@\\n public class SpecificationImpl extends MinimalEObjectImpl.Container implements Specification\\n {\\n /**\\n- * The default value of the '{@link #getId() Id}' attribute.\\n+ * The default value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getId()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected static final String ID_EDEFAULT = null;\\n+ protected static final String NAME_EDEFAULT = null;\\n \\n /**\\n- * The cached value of the '{@link #getId() Id}' attribute.\\n+ * The cached value of the '{@link #getName() Name}' attribute.\\n * \\n * \\n- * @see #getId()\\n+ * @see #getName()\\n * @generated\\n * @ordered\\n */\\n- protected String id = ID_EDEFAULT;\\n+ protected String name = NAME_EDEFAULT;\\n \\n /**\\n * The cached value of the '{@link #getRefinements() Refinements}' containment reference list.\\n@@ -94,22 +94,22 @@ protected EClass eStaticClass()\\n * \\n * @generated\\n */\\n- public String getId()\\n+ public String getName()\\n {\\n- return id;\\n+ return name;\\n }\\n \\n /**\\n * \\n * \\n * @generated\\n */\\n- public void setId(String newId)\\n+ public void setName(String newName)\\n {\\n- String oldId = id;\\n- id = newId;\\n+ String oldName = name;\\n+ name = newName;\\n if (eNotificationRequired())\\n- eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.SPECIFICATION__ID, oldId, id));\\n+ eNotify(new ENotificationImpl(this, Notification.SET, IntentSpecificationPackage.SPECIFICATION__NAME, oldName, name));\\n }\\n \\n /**\\n@@ -152,8 +152,8 @@ public Object eGet(int featureID, boolean resolve, boolean coreType)\\n {\\n switch (featureID)\\n {\\n- case IntentSpecificationPackage.SPECIFICATION__ID:\\n- return getId();\\n+ case IntentSpecificationPackage.SPECIFICATION__NAME:\\n+ return getName();\\n case IntentSpecificationPackage.SPECIFICATION__REFINEMENTS:\\n return getRefinements();\\n }\\n@@ -171,8 +171,8 @@ public void eSet(int featureID, Object newValue)\\n {\\n switch (featureID)\\n {\\n- case IntentSpecificationPackage.SPECIFICATION__ID:\\n- setId((String)newValue);\\n+ case IntentSpecificationPackage.SPECIFICATION__NAME:\\n+ setName((String)newValue);\\n return;\\n case IntentSpecificationPackage.SPECIFICATION__REFINEMENTS:\\n getRefinements().clear();\\n@@ -192,8 +192,8 @@ public void eUnset(int featureID)\\n {\\n switch (featureID)\\n {\\n- case IntentSpecificationPackage.SPECIFICATION__ID:\\n- setId(ID_EDEFAULT);\\n+ case IntentSpecificationPackage.SPECIFICATION__NAME:\\n+ setName(NAME_EDEFAULT);\\n return;\\n case IntentSpecificationPackage.SPECIFICATION__REFINEMENTS:\\n getRefinements().clear();\\n@@ -212,8 +212,8 @@ public boolean eIsSet(int featureID)\\n {\\n switch (featureID)\\n {\\n- case IntentSpecificationPackage.SPECIFICATION__ID:\\n- return ID_EDEFAULT == null ? id != null : !ID_EDEFAULT.equals(id);\\n+ case IntentSpecificationPackage.SPECIFICATION__NAME:\\n+ return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);\\n case IntentSpecificationPackage.SPECIFICATION__REFINEMENTS:\\n return refinements != null && !refinements.isEmpty();\\n }\\n@@ -231,8 +231,8 @@ public String toString()\\n if (eIsProxy()) return super.toString();\\n \\n StringBuffer result = new StringBuffer(super.toString());\\n- result.append(\\\" (id: \\\");\\n- result.append(id);\\n+ result.append(\\\" (name: \\\");\\n+ result.append(name);\\n result.append(')');\\n return result.toString();\\n }\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Fimpl%2FSpecificationImpl.java\",\n \"sha\": \"c19705d70f6549194180c1051334d1903555d07f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 100,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationAdapterFactory.java\",\n \"changes\": 100,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationAdapterFactory.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 0,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java\",\n \"new_code\": \" public Adapter caseIntentType(IntentType object)\\n {\\n return createIntentTypeAdapter();\\n }\\n @Override\\n public Adapter caseDecompositionType(DecompositionType object)\\n {\\n return createDecompositionTypeAdapter();\\n }\\n @Override\\n public Adapter caseDocItemType(DocItemType object)\\n {\\n return createDocItemTypeAdapter();\\n }\\n @Override\\n public Adapter caseModelType(ModelType object)\\n {\\n return createModelTypeAdapter();\\n }\\n @Override\\n public Adapter caseListItemType(ListItemType object)\\n {\\n return createListItemTypeAdapter();\\n }\\n @Override\\n /**\\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.IntentType Intent Type}'.\\n * \\n * This default implementation returns null so that we can easily ignore cases;\\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\\n * \\n * @return the new adapter.\\n * @see net.certware.intent.intentSpecification.IntentType\\n * @generated\\n */\\n public Adapter createIntentTypeAdapter()\\n {\\n return null;\\n }\\n\\n /**\\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DecompositionType Decomposition Type}'.\\n * \\n * This default implementation returns null so that we can easily ignore cases;\\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\\n * \\n * @return the new adapter.\\n * @see net.certware.intent.intentSpecification.DecompositionType\\n * @generated\\n */\\n public Adapter createDecompositionTypeAdapter()\\n {\\n return null;\\n }\\n\\n /**\\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DocItemType Doc Item Type}'.\\n * \\n * This default implementation returns null so that we can easily ignore cases;\\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\\n * \\n * @return the new adapter.\\n * @see net.certware.intent.intentSpecification.DocItemType\\n * @generated\\n */\\n public Adapter createDocItemTypeAdapter()\\n {\\n return null;\\n }\\n\\n /**\\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ModelType Model Type}'.\\n * \\n * This default implementation returns null so that we can easily ignore cases;\\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\\n * \\n * @return the new adapter.\\n * @see net.certware.intent.intentSpecification.ModelType\\n * @generated\\n */\\n public Adapter createModelTypeAdapter()\\n {\\n return null;\\n }\\n\\n /**\\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ListItemType List Item Type}'.\\n * \\n * This default implementation returns null so that we can easily ignore cases;\\n * it's useful to ignore a case when inheritance will catch all the cases anyway.\\n * \\n * @return the new adapter.\\n * @see net.certware.intent.intentSpecification.ListItemType\\n * @generated\\n */\\n public Adapter createListItemTypeAdapter()\\n {\\n return null;\\n }\\n\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"IntentType object\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java\",\n \"implementation\": \"return createIntentTypeAdapter();\",\n \"signature\": \"Adapter caseIntentType(IntentType object)\"\n },\n {\n \"arguments\": [\n \"DecompositionType object\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java\",\n \"implementation\": \"return createDecompositionTypeAdapter();\",\n \"signature\": \"Adapter caseDecompositionType(DecompositionType object)\"\n },\n {\n \"arguments\": [\n \"DocItemType object\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java\",\n \"implementation\": \"return createDocItemTypeAdapter();\",\n \"signature\": \"Adapter caseDocItemType(DocItemType object)\"\n },\n {\n \"arguments\": [\n \"ModelType object\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java\",\n \"implementation\": \"return createModelTypeAdapter();\",\n \"signature\": \"Adapter caseModelType(ModelType object)\"\n },\n {\n \"arguments\": [\n \"ListItemType object\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java\",\n \"implementation\": \"return createListItemTypeAdapter();\",\n \"signature\": \"Adapter caseListItemType(ListItemType object)\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"Adapter createIntentTypeAdapter()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"Adapter createDecompositionTypeAdapter()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"Adapter createDocItemTypeAdapter()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"Adapter createModelTypeAdapter()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationAdapterFactory.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"Adapter createListItemTypeAdapter()\"\n }\n ],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -90,26 +90,51 @@ public Adapter caseIntent(Intent object)\\n return createIntentAdapter();\\n }\\n @Override\\n+ public Adapter caseIntentType(IntentType object)\\n+ {\\n+ return createIntentTypeAdapter();\\n+ }\\n+ @Override\\n public Adapter caseDecomposition(Decomposition object)\\n {\\n return createDecompositionAdapter();\\n }\\n @Override\\n+ public Adapter caseDecompositionType(DecompositionType object)\\n+ {\\n+ return createDecompositionTypeAdapter();\\n+ }\\n+ @Override\\n public Adapter caseDocument(Document object)\\n {\\n return createDocumentAdapter();\\n }\\n @Override\\n+ public Adapter caseDocItemType(DocItemType object)\\n+ {\\n+ return createDocItemTypeAdapter();\\n+ }\\n+ @Override\\n public Adapter caseDocItem(DocItem object)\\n {\\n return createDocItemAdapter();\\n }\\n @Override\\n+ public Adapter caseModelType(ModelType object)\\n+ {\\n+ return createModelTypeAdapter();\\n+ }\\n+ @Override\\n public Adapter caseModelItem(ModelItem object)\\n {\\n return createModelItemAdapter();\\n }\\n @Override\\n+ public Adapter caseListItemType(ListItemType object)\\n+ {\\n+ return createListItemTypeAdapter();\\n+ }\\n+ @Override\\n public Adapter caseListItem(ListItem object)\\n {\\n return createListItemAdapter();\\n@@ -181,6 +206,21 @@ public Adapter createIntentAdapter()\\n return null;\\n }\\n \\n+ /**\\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.IntentType Intent Type}'.\\n+ * \\n+ * This default implementation returns null so that we can easily ignore cases;\\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\\n+ * \\n+ * @return the new adapter.\\n+ * @see net.certware.intent.intentSpecification.IntentType\\n+ * @generated\\n+ */\\n+ public Adapter createIntentTypeAdapter()\\n+ {\\n+ return null;\\n+ }\\n+\\n /**\\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.Decomposition Decomposition}'.\\n * \\n@@ -196,6 +236,21 @@ public Adapter createDecompositionAdapter()\\n return null;\\n }\\n \\n+ /**\\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DecompositionType Decomposition Type}'.\\n+ * \\n+ * This default implementation returns null so that we can easily ignore cases;\\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\\n+ * \\n+ * @return the new adapter.\\n+ * @see net.certware.intent.intentSpecification.DecompositionType\\n+ * @generated\\n+ */\\n+ public Adapter createDecompositionTypeAdapter()\\n+ {\\n+ return null;\\n+ }\\n+\\n /**\\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.Document Document}'.\\n * \\n@@ -211,6 +266,21 @@ public Adapter createDocumentAdapter()\\n return null;\\n }\\n \\n+ /**\\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DocItemType Doc Item Type}'.\\n+ * \\n+ * This default implementation returns null so that we can easily ignore cases;\\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\\n+ * \\n+ * @return the new adapter.\\n+ * @see net.certware.intent.intentSpecification.DocItemType\\n+ * @generated\\n+ */\\n+ public Adapter createDocItemTypeAdapter()\\n+ {\\n+ return null;\\n+ }\\n+\\n /**\\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.DocItem Doc Item}'.\\n * \\n@@ -226,6 +296,21 @@ public Adapter createDocItemAdapter()\\n return null;\\n }\\n \\n+ /**\\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ModelType Model Type}'.\\n+ * \\n+ * This default implementation returns null so that we can easily ignore cases;\\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\\n+ * \\n+ * @return the new adapter.\\n+ * @see net.certware.intent.intentSpecification.ModelType\\n+ * @generated\\n+ */\\n+ public Adapter createModelTypeAdapter()\\n+ {\\n+ return null;\\n+ }\\n+\\n /**\\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ModelItem Model Item}'.\\n * \\n@@ -241,6 +326,21 @@ public Adapter createModelItemAdapter()\\n return null;\\n }\\n \\n+ /**\\n+ * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ListItemType List Item Type}'.\\n+ * \\n+ * This default implementation returns null so that we can easily ignore cases;\\n+ * it's useful to ignore a case when inheritance will catch all the cases anyway.\\n+ * \\n+ * @return the new adapter.\\n+ * @see net.certware.intent.intentSpecification.ListItemType\\n+ * @generated\\n+ */\\n+ public Adapter createListItemTypeAdapter()\\n+ {\\n+ return null;\\n+ }\\n+\\n /**\\n * Creates a new adapter for an object of class '{@link net.certware.intent.intentSpecification.ListItem List Item}'.\\n * \",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationAdapterFactory.java\",\n \"sha\": \"51a62ac8fcdbac12985c2b6e26940aac8eab1f9c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 115,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationSwitch.java\",\n \"changes\": 115,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationSwitch.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 0,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java\",\n \"new_code\": \" case IntentSpecificationPackage.INTENT_TYPE:\\n {\\n IntentType intentType = (IntentType)theEObject;\\n T result = caseIntentType(intentType);\\n if (result == null) result = defaultCase(theEObject);\\n return result;\\n }\\n case IntentSpecificationPackage.DECOMPOSITION_TYPE:\\n {\\n DecompositionType decompositionType = (DecompositionType)theEObject;\\n T result = caseDecompositionType(decompositionType);\\n if (result == null) result = defaultCase(theEObject);\\n return result;\\n }\\n case IntentSpecificationPackage.DOC_ITEM_TYPE:\\n {\\n DocItemType docItemType = (DocItemType)theEObject;\\n T result = caseDocItemType(docItemType);\\n if (result == null) result = defaultCase(theEObject);\\n return result;\\n }\\n case IntentSpecificationPackage.MODEL_TYPE:\\n {\\n ModelType modelType = (ModelType)theEObject;\\n T result = caseModelType(modelType);\\n if (result == null) result = defaultCase(theEObject);\\n return result;\\n }\\n case IntentSpecificationPackage.LIST_ITEM_TYPE:\\n {\\n ListItemType listItemType = (ListItemType)theEObject;\\n T result = caseListItemType(listItemType);\\n if (result == null) result = defaultCase(theEObject);\\n return result;\\n }\\n /**\\n * Returns the result of interpreting the object as an instance of 'Intent Type'.\\n * \\n * This implementation returns null;\\n * returning a non-null result will terminate the switch.\\n * \\n * @param object the target of the switch.\\n * @return the result of interpreting the object as an instance of 'Intent Type'.\\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n * @generated\\n */\\n public T caseIntentType(IntentType object)\\n {\\n return null;\\n }\\n\\n /**\\n * Returns the result of interpreting the object as an instance of 'Decomposition Type'.\\n * \\n * This implementation returns null;\\n * returning a non-null result will terminate the switch.\\n * \\n * @param object the target of the switch.\\n * @return the result of interpreting the object as an instance of 'Decomposition Type'.\\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n * @generated\\n */\\n public T caseDecompositionType(DecompositionType object)\\n {\\n return null;\\n }\\n\\n /**\\n * Returns the result of interpreting the object as an instance of 'Doc Item Type'.\\n * \\n * This implementation returns null;\\n * returning a non-null result will terminate the switch.\\n * \\n * @param object the target of the switch.\\n * @return the result of interpreting the object as an instance of 'Doc Item Type'.\\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n * @generated\\n */\\n public T caseDocItemType(DocItemType object)\\n {\\n return null;\\n }\\n\\n /**\\n * Returns the result of interpreting the object as an instance of 'Model Type'.\\n * \\n * This implementation returns null;\\n * returning a non-null result will terminate the switch.\\n * \\n * @param object the target of the switch.\\n * @return the result of interpreting the object as an instance of 'Model Type'.\\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n * @generated\\n */\\n public T caseModelType(ModelType object)\\n {\\n return null;\\n }\\n\\n /**\\n * Returns the result of interpreting the object as an instance of 'List Item Type'.\\n * \\n * This implementation returns null;\\n * returning a non-null result will terminate the switch.\\n * \\n * @param object the target of the switch.\\n * @return the result of interpreting the object as an instance of 'List Item Type'.\\n * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n * @generated\\n */\\n public T caseListItemType(ListItemType object)\\n {\\n return null;\\n }\\n\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"IntentType object\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"T caseIntentType(IntentType object)\"\n },\n {\n \"arguments\": [\n \"DecompositionType object\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"T caseDecompositionType(DecompositionType object)\"\n },\n {\n \"arguments\": [\n \"DocItemType object\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"T caseDocItemType(DocItemType object)\"\n },\n {\n \"arguments\": [\n \"ModelType object\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"T caseModelType(ModelType object)\"\n },\n {\n \"arguments\": [\n \"ListItemType object\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/intentSpecification/util/IntentSpecificationSwitch.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"T caseListItemType(ListItemType object)\"\n }\n ],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -93,34 +93,69 @@ protected T doSwitch(int classifierID, EObject theEObject)\\n if (result == null) result = defaultCase(theEObject);\\n return result;\\n }\\n+ case IntentSpecificationPackage.INTENT_TYPE:\\n+ {\\n+ IntentType intentType = (IntentType)theEObject;\\n+ T result = caseIntentType(intentType);\\n+ if (result == null) result = defaultCase(theEObject);\\n+ return result;\\n+ }\\n case IntentSpecificationPackage.DECOMPOSITION:\\n {\\n Decomposition decomposition = (Decomposition)theEObject;\\n T result = caseDecomposition(decomposition);\\n if (result == null) result = defaultCase(theEObject);\\n return result;\\n }\\n+ case IntentSpecificationPackage.DECOMPOSITION_TYPE:\\n+ {\\n+ DecompositionType decompositionType = (DecompositionType)theEObject;\\n+ T result = caseDecompositionType(decompositionType);\\n+ if (result == null) result = defaultCase(theEObject);\\n+ return result;\\n+ }\\n case IntentSpecificationPackage.DOCUMENT:\\n {\\n Document document = (Document)theEObject;\\n T result = caseDocument(document);\\n if (result == null) result = defaultCase(theEObject);\\n return result;\\n }\\n+ case IntentSpecificationPackage.DOC_ITEM_TYPE:\\n+ {\\n+ DocItemType docItemType = (DocItemType)theEObject;\\n+ T result = caseDocItemType(docItemType);\\n+ if (result == null) result = defaultCase(theEObject);\\n+ return result;\\n+ }\\n case IntentSpecificationPackage.DOC_ITEM:\\n {\\n DocItem docItem = (DocItem)theEObject;\\n T result = caseDocItem(docItem);\\n if (result == null) result = defaultCase(theEObject);\\n return result;\\n }\\n+ case IntentSpecificationPackage.MODEL_TYPE:\\n+ {\\n+ ModelType modelType = (ModelType)theEObject;\\n+ T result = caseModelType(modelType);\\n+ if (result == null) result = defaultCase(theEObject);\\n+ return result;\\n+ }\\n case IntentSpecificationPackage.MODEL_ITEM:\\n {\\n ModelItem modelItem = (ModelItem)theEObject;\\n T result = caseModelItem(modelItem);\\n if (result == null) result = defaultCase(theEObject);\\n return result;\\n }\\n+ case IntentSpecificationPackage.LIST_ITEM_TYPE:\\n+ {\\n+ ListItemType listItemType = (ListItemType)theEObject;\\n+ T result = caseListItemType(listItemType);\\n+ if (result == null) result = defaultCase(theEObject);\\n+ return result;\\n+ }\\n case IntentSpecificationPackage.LIST_ITEM:\\n {\\n ListItem listItem = (ListItem)theEObject;\\n@@ -180,6 +215,22 @@ public T caseIntent(Intent object)\\n return null;\\n }\\n \\n+ /**\\n+ * Returns the result of interpreting the object as an instance of 'Intent Type'.\\n+ * \\n+ * This implementation returns null;\\n+ * returning a non-null result will terminate the switch.\\n+ * \\n+ * @param object the target of the switch.\\n+ * @return the result of interpreting the object as an instance of 'Intent Type'.\\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n+ * @generated\\n+ */\\n+ public T caseIntentType(IntentType object)\\n+ {\\n+ return null;\\n+ }\\n+\\n /**\\n * Returns the result of interpreting the object as an instance of 'Decomposition'.\\n * \\n@@ -196,6 +247,22 @@ public T caseDecomposition(Decomposition object)\\n return null;\\n }\\n \\n+ /**\\n+ * Returns the result of interpreting the object as an instance of 'Decomposition Type'.\\n+ * \\n+ * This implementation returns null;\\n+ * returning a non-null result will terminate the switch.\\n+ * \\n+ * @param object the target of the switch.\\n+ * @return the result of interpreting the object as an instance of 'Decomposition Type'.\\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n+ * @generated\\n+ */\\n+ public T caseDecompositionType(DecompositionType object)\\n+ {\\n+ return null;\\n+ }\\n+\\n /**\\n * Returns the result of interpreting the object as an instance of 'Document'.\\n * \\n@@ -212,6 +279,22 @@ public T caseDocument(Document object)\\n return null;\\n }\\n \\n+ /**\\n+ * Returns the result of interpreting the object as an instance of 'Doc Item Type'.\\n+ * \\n+ * This implementation returns null;\\n+ * returning a non-null result will terminate the switch.\\n+ * \\n+ * @param object the target of the switch.\\n+ * @return the result of interpreting the object as an instance of 'Doc Item Type'.\\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n+ * @generated\\n+ */\\n+ public T caseDocItemType(DocItemType object)\\n+ {\\n+ return null;\\n+ }\\n+\\n /**\\n * Returns the result of interpreting the object as an instance of 'Doc Item'.\\n * \\n@@ -228,6 +311,22 @@ public T caseDocItem(DocItem object)\\n return null;\\n }\\n \\n+ /**\\n+ * Returns the result of interpreting the object as an instance of 'Model Type'.\\n+ * \\n+ * This implementation returns null;\\n+ * returning a non-null result will terminate the switch.\\n+ * \\n+ * @param object the target of the switch.\\n+ * @return the result of interpreting the object as an instance of 'Model Type'.\\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n+ * @generated\\n+ */\\n+ public T caseModelType(ModelType object)\\n+ {\\n+ return null;\\n+ }\\n+\\n /**\\n * Returns the result of interpreting the object as an instance of 'Model Item'.\\n * \\n@@ -244,6 +343,22 @@ public T caseModelItem(ModelItem object)\\n return null;\\n }\\n \\n+ /**\\n+ * Returns the result of interpreting the object as an instance of 'List Item Type'.\\n+ * \\n+ * This implementation returns null;\\n+ * returning a non-null result will terminate the switch.\\n+ * \\n+ * @param object the target of the switch.\\n+ * @return the result of interpreting the object as an instance of 'List Item Type'.\\n+ * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)\\n+ * @generated\\n+ */\\n+ public T caseListItemType(ListItemType object)\\n+ {\\n+ return null;\\n+ }\\n+\\n /**\\n * Returns the result of interpreting the object as an instance of 'List Item'.\\n * \",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2FintentSpecification%2Futil%2FIntentSpecificationSwitch.java\",\n \"sha\": \"737b7f8b8e698aeb8ad2c8c40d2f06654663c646\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 338,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecification.g\",\n \"changes\": 501,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecification.g?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 163,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g\",\n \"new_code\": \"\\t\\tlv_name_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"name\\\",\\n \\t\\tlv_name_1_0, \\n\\t\\tlv_name_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"name\\\",\\n \\t\\tlv_name_1_0, \\n\\t\\tlv_name_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"name\\\",\\n \\t\\tlv_name_1_0, \\nentryRuleIntentType returns [EObject current=null] \\n\\t{ newCompositeNode(grammarAccess.getIntentTypeRule()); }\\n\\t { $current=$iv_ruleIntentType.current; } \\nruleIntentType returns [EObject current=null] \\n(\\n(\\n\\t\\tlv_typeName_0_1=\\t'basic' \\n newLeafNode(lv_typeName_0_1, grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_1, null);\\n\\t }\\n |\\t\\tlv_typeName_0_2=\\t'purpose' \\n newLeafNode(lv_typeName_0_2, grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_2, null);\\n\\t }\\n |\\t\\tlv_typeName_0_3=\\t'principles' \\n newLeafNode(lv_typeName_0_3, grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_3, null);\\n\\t }\\n |\\t\\tlv_typeName_0_4=\\t'models' \\n newLeafNode(lv_typeName_0_4, grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_4, null);\\n\\t }\\n |\\t\\tlv_typeName_0_5=\\t'design' \\n newLeafNode(lv_typeName_0_5, grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_5, null);\\n\\t }\\n |\\t\\tlv_typeName_0_6=\\t'implementation' \\n newLeafNode(lv_typeName_0_6, grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_6, null);\\n\\t }\\n |\\t\\tlv_typeName_0_7=\\t'operation' \\n newLeafNode(lv_typeName_0_7, grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_7, null);\\n\\t }\\n\\n\\n)\\n)\\n;\\n\\t\\tlv_name_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"name\\\",\\n \\t\\tlv_name_1_0, \\nentryRuleDecompositionType returns [EObject current=null] \\n\\t{ newCompositeNode(grammarAccess.getDecompositionTypeRule()); }\\n\\t { $current=$iv_ruleDecompositionType.current; } \\nruleDecompositionType returns [EObject current=null] \\n(\\n(\\n\\t\\tlv_typeName_0_1=\\t'environment' \\n newLeafNode(lv_typeName_0_1, grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_1, null);\\n\\t }\\n |\\t\\tlv_typeName_0_2=\\t'operator' \\n newLeafNode(lv_typeName_0_2, grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_2, null);\\n\\t }\\n |\\t\\tlv_typeName_0_3=\\t'system' \\n newLeafNode(lv_typeName_0_3, grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_3, null);\\n\\t }\\n |\\t\\tlv_typeName_0_4=\\t'verification' \\n newLeafNode(lv_typeName_0_4, grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_4, null);\\n\\t }\\n\\n)\\n\\n)\\n;\\nentryRuleDocItemType returns [EObject current=null] \\n\\t{ newCompositeNode(grammarAccess.getDocItemTypeRule()); }\\n\\t { $current=$iv_ruleDocItemType.current; } \\nruleDocItemType returns [EObject current=null] \\n(\\n(\\n\\t\\tlv_typeName_0_1=\\t'condition' \\n newLeafNode(lv_typeName_0_1, grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_1, null);\\n\\t }\\n |\\t\\tlv_typeName_0_2=\\t'figure' \\n newLeafNode(lv_typeName_0_2, grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_2, null);\\n\\t }\\n |\\t\\tlv_typeName_0_3=\\t'break' \\n newLeafNode(lv_typeName_0_3, grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_3, null);\\n\\t }\\n |\\t\\tlv_typeName_0_4=\\t'model' \\n newLeafNode(lv_typeName_0_4, grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_4, null);\\n\\t }\\n |\\t\\tlv_typeName_0_5=\\t'paragraph' \\n newLeafNode(lv_typeName_0_5, grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_5, null);\\n\\t }\\n |\\t\\tlv_typeName_0_6=\\t'section' \\n newLeafNode(lv_typeName_0_6, grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_6, null);\\n\\t }\\n |\\t\\tlv_typeName_0_7=\\t'table' \\n newLeafNode(lv_typeName_0_7, grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_7, null);\\n\\t }\\n\\n\\n)\\n)\\n;\\n\\t\\tlv_name_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"name\\\",\\n \\t\\tlv_name_1_0, \\nentryRuleModelType returns [EObject current=null] \\n\\t{ newCompositeNode(grammarAccess.getModelTypeRule()); }\\n\\t { $current=$iv_ruleModelType.current; } \\nruleModelType returns [EObject current=null] \\n(\\n(\\n\\t\\tlv_typeName_0_1=\\t'output' \\n newLeafNode(lv_typeName_0_1, grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getModelTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_1, null);\\n\\t }\\n |\\t\\tlv_typeName_0_2=\\t'mode' \\n newLeafNode(lv_typeName_0_2, grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getModelTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_2, null);\\n\\t }\\n |\\t\\tlv_typeName_0_3=\\t'state' \\n newLeafNode(lv_typeName_0_3, grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getModelTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_3, null);\\n\\t }\\n |\\t\\tlv_typeName_0_4=\\t'macro' \\n newLeafNode(lv_typeName_0_4, grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getModelTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_4, null);\\n\\t }\\n |\\t\\tlv_typeName_0_5=\\t'function' \\n newLeafNode(lv_typeName_0_5, grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getModelTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_5, null);\\n\\t }\\n |\\t\\tlv_typeName_0_6=\\t'input' \\n newLeafNode(lv_typeName_0_6, grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getModelTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_6, null);\\n\\t }\\n\\n\\n)\\n)\\n;\\n\\t\\tlv_name_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"name\\\",\\n \\t\\tlv_name_1_0, \\nentryRuleListItemType returns [EObject current=null] \\n\\t{ newCompositeNode(grammarAccess.getListItemTypeRule()); }\\n\\t { $current=$iv_ruleListItemType.current; } \\nruleListItemType returns [EObject current=null] \\n(\\n(\\n\\t\\tlv_typeName_0_1=\\t'requirement' \\n newLeafNode(lv_typeName_0_1, grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getListItemTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_1, null);\\n\\t }\\n |\\t\\tlv_typeName_0_2=\\t'goal' \\n newLeafNode(lv_typeName_0_2, grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getListItemTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_2, null);\\n\\t }\\n |\\t\\tlv_typeName_0_3=\\t'hazard' \\n newLeafNode(lv_typeName_0_3, grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getListItemTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_3, null);\\n\\t }\\n |\\t\\tlv_typeName_0_4=\\t'constraint' \\n newLeafNode(lv_typeName_0_4, grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3());\\n \\n\\t {\\n\\t if ($current==null) {\\n\\t $current = createModelElement(grammarAccess.getListItemTypeRule());\\n\\t }\\n \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_4, null);\\n\\t }\\n\\n\\n)\\n)\\n;\\n\\t\\tlv_name_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"name\\\",\\n \\t\\tlv_name_1_0, \\n)+\\totherlv_5='}' \\n)+\\totherlv_8=')' \\n)+\\totherlv_11=']' \",\n \"new_methods\": [],\n \"old_code\": \"\\t\\tlv_id_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"id\\\",\\n \\t\\tlv_id_1_0, \\n\\t\\tlv_id_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"id\\\",\\n \\t\\tlv_id_1_0, \\n\\t\\tlv_id_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"id\\\",\\n \\t\\tlv_id_1_0, \\nentryRuleIntentType returns [String current=null] \\n\\t{ newCompositeNode(grammarAccess.getIntentTypeRule()); } \\n\\t { $current=$iv_ruleIntentType.current.getText(); } \\nruleIntentType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \\n\\tkw='basic' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); \\n |\\n\\tkw='purpose' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); \\n |\\n\\tkw='principles' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); \\n |\\n\\tkw='models' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); \\n |\\n\\tkw='design' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); \\n |\\n\\tkw='implementation' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); \\n |\\n\\tkw='operation' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); \\n ;\\n\\t\\tlv_id_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"id\\\",\\n \\t\\tlv_id_1_0, \\nentryRuleDecompositionType returns [String current=null] \\n\\t{ newCompositeNode(grammarAccess.getDecompositionTypeRule()); } \\n\\t { $current=$iv_ruleDecompositionType.current.getText(); } \\nruleDecompositionType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \\n\\tkw='environment' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); \\n |\\n\\tkw='operator' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); \\n |\\n\\tkw='system' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); \\n |\\n\\tkw='verification' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); \\n ;\\nentryRuleDocItemType returns [String current=null] \\n\\t{ newCompositeNode(grammarAccess.getDocItemTypeRule()); } \\n\\t { $current=$iv_ruleDocItemType.current.getText(); } \\nruleDocItemType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \\n\\tkw='condition' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); \\n |\\n\\tkw='figure' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); \\n |\\n\\tkw='break' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); \\n |\\n\\tkw='model' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); \\n |\\n\\tkw='paragraph' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); \\n |\\n\\tkw='section' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); \\n |\\n\\tkw='table' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); \\n ;\\n\\t\\tlv_id_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"id\\\",\\n \\t\\tlv_id_1_0, \\nentryRuleModelType returns [String current=null] \\n\\t{ newCompositeNode(grammarAccess.getModelTypeRule()); } \\n\\t { $current=$iv_ruleModelType.current.getText(); } \\nruleModelType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \\n\\tkw='output' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getOutputKeyword_0()); \\n |\\n\\tkw='mode' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getModeKeyword_1()); \\n |\\n\\tkw='state' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getStateKeyword_2()); \\n |\\n\\tkw='macro' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getMacroKeyword_3()); \\n |\\n\\tkw='function' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); \\n |\\n\\tkw='input' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getModelTypeAccess().getInputKeyword_5()); \\n ;\\n\\t\\tlv_id_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"id\\\",\\n \\t\\tlv_id_1_0, \\nentryRuleListItemType returns [String current=null] \\n\\t{ newCompositeNode(grammarAccess.getListItemTypeRule()); } \\n\\t { $current=$iv_ruleListItemType.current.getText(); } \\nruleListItemType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \\n\\tkw='requirement' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); \\n |\\n\\tkw='goal' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); \\n |\\n\\tkw='hazard' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); \\n |\\n\\tkw='constraint' \\n $current.merge(kw);\\n newLeafNode(kw, grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); \\n ;\\n\\t\\tlv_id_1_0=RULE_ID\\n\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); \\n \\t\\t\\t\\\"id\\\",\\n \\t\\tlv_id_1_0, \\n)*\\totherlv_5='}' \\n)*\\totherlv_8=')' \\n)*\\totherlv_11=']' \",\n \"old_methods\": [],\n \"patch\": \"@@ -83,18 +83,18 @@ ruleSpecification returns [EObject current=null]\\n }\\n (\\n (\\n-\\t\\tlv_id_1_0=RULE_ID\\n+\\t\\tlv_name_1_0=RULE_ID\\n \\t\\t{\\n-\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getSpecificationAccess().getIdIDTerminalRuleCall_1_0()); \\n+\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getSpecificationAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t}\\n \\t\\t{\\n \\t if ($current==null) {\\n \\t $current = createModelElement(grammarAccess.getSpecificationRule());\\n \\t }\\n \\t\\tsetWithLastConsumed(\\n \\t\\t\\t$current, \\n- \\t\\t\\t\\\"id\\\",\\n- \\t\\tlv_id_1_0, \\n+ \\t\\t\\t\\\"name\\\",\\n+ \\t\\tlv_name_1_0, \\n \\t\\t\\\"ID\\\");\\n \\t }\\n \\n@@ -144,18 +144,18 @@ ruleRefinement returns [EObject current=null]\\n }\\n (\\n (\\n-\\t\\tlv_id_1_0=RULE_ID\\n+\\t\\tlv_name_1_0=RULE_ID\\n \\t\\t{\\n-\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getRefinementAccess().getIdIDTerminalRuleCall_1_0()); \\n+\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getRefinementAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t}\\n \\t\\t{\\n \\t if ($current==null) {\\n \\t $current = createModelElement(grammarAccess.getRefinementRule());\\n \\t }\\n \\t\\tsetWithLastConsumed(\\n \\t\\t\\t$current, \\n- \\t\\t\\t\\\"id\\\",\\n- \\t\\tlv_id_1_0, \\n+ \\t\\t\\t\\\"name\\\",\\n+ \\t\\tlv_name_1_0, \\n \\t\\t\\\"ID\\\");\\n \\t }\\n \\n@@ -237,18 +237,18 @@ ruleIntent returns [EObject current=null]\\n )\\n )(\\n (\\n-\\t\\tlv_id_1_0=RULE_ID\\n+\\t\\tlv_name_1_0=RULE_ID\\n \\t\\t{\\n-\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getIntentAccess().getIdIDTerminalRuleCall_1_0()); \\n+\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getIntentAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t}\\n \\t\\t{\\n \\t if ($current==null) {\\n \\t $current = createModelElement(grammarAccess.getIntentRule());\\n \\t }\\n \\t\\tsetWithLastConsumed(\\n \\t\\t\\t$current, \\n- \\t\\t\\t\\\"id\\\",\\n- \\t\\tlv_id_1_0, \\n+ \\t\\t\\t\\\"name\\\",\\n+ \\t\\tlv_name_1_0, \\n \\t\\t\\\"ID\\\");\\n \\t }\\n \\n@@ -297,69 +297,111 @@ ruleIntent returns [EObject current=null]\\n \\n \\n // Entry rule entryRuleIntentType\\n-entryRuleIntentType returns [String current=null] \\n+entryRuleIntentType returns [EObject current=null] \\n \\t:\\n-\\t{ newCompositeNode(grammarAccess.getIntentTypeRule()); } \\n+\\t{ newCompositeNode(grammarAccess.getIntentTypeRule()); }\\n \\t iv_ruleIntentType=ruleIntentType \\n-\\t { $current=$iv_ruleIntentType.current.getText(); } \\n+\\t { $current=$iv_ruleIntentType.current; } \\n \\t EOF \\n ;\\n \\n // Rule IntentType\\n-ruleIntentType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \\n+ruleIntentType returns [EObject current=null] \\n @init { enterRule(); \\n }\\n @after { leaveRule(); }:\\n (\\n-\\tkw='basic' \\n+(\\n+(\\n+\\t\\tlv_typeName_0_1=\\t'basic' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getBasicKeyword_0()); \\n+ newLeafNode(lv_typeName_0_1, grammarAccess.getIntentTypeAccess().getTypeNameBasicKeyword_0_0());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_1, null);\\n+\\t }\\n \\n- |\\n-\\tkw='purpose' \\n+ |\\t\\tlv_typeName_0_2=\\t'purpose' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getPurposeKeyword_1()); \\n+ newLeafNode(lv_typeName_0_2, grammarAccess.getIntentTypeAccess().getTypeNamePurposeKeyword_0_1());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_2, null);\\n+\\t }\\n \\n- |\\n-\\tkw='principles' \\n+ |\\t\\tlv_typeName_0_3=\\t'principles' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getPrinciplesKeyword_2()); \\n+ newLeafNode(lv_typeName_0_3, grammarAccess.getIntentTypeAccess().getTypeNamePrinciplesKeyword_0_2());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_3, null);\\n+\\t }\\n \\n- |\\n-\\tkw='models' \\n+ |\\t\\tlv_typeName_0_4=\\t'models' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getModelsKeyword_3()); \\n+ newLeafNode(lv_typeName_0_4, grammarAccess.getIntentTypeAccess().getTypeNameModelsKeyword_0_3());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_4, null);\\n+\\t }\\n \\n- |\\n-\\tkw='design' \\n+ |\\t\\tlv_typeName_0_5=\\t'design' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getDesignKeyword_4()); \\n+ newLeafNode(lv_typeName_0_5, grammarAccess.getIntentTypeAccess().getTypeNameDesignKeyword_0_4());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_5, null);\\n+\\t }\\n \\n- |\\n-\\tkw='implementation' \\n+ |\\t\\tlv_typeName_0_6=\\t'implementation' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getImplementationKeyword_5()); \\n+ newLeafNode(lv_typeName_0_6, grammarAccess.getIntentTypeAccess().getTypeNameImplementationKeyword_0_5());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_6, null);\\n+\\t }\\n \\n- |\\n-\\tkw='operation' \\n+ |\\t\\tlv_typeName_0_7=\\t'operation' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getIntentTypeAccess().getOperationKeyword_6()); \\n+ newLeafNode(lv_typeName_0_7, grammarAccess.getIntentTypeAccess().getTypeNameOperationKeyword_0_6());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getIntentTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_7, null);\\n+\\t }\\n+\\n )\\n- ;\\n+\\n+)\\n+)\\n+;\\n \\n \\n \\n@@ -399,18 +441,18 @@ ruleDecomposition returns [EObject current=null]\\n )\\n )(\\n (\\n-\\t\\tlv_id_1_0=RULE_ID\\n+\\t\\tlv_name_1_0=RULE_ID\\n \\t\\t{\\n-\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getDecompositionAccess().getIdIDTerminalRuleCall_1_0()); \\n+\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getDecompositionAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t}\\n \\t\\t{\\n \\t if ($current==null) {\\n \\t $current = createModelElement(grammarAccess.getDecompositionRule());\\n \\t }\\n \\t\\tsetWithLastConsumed(\\n \\t\\t\\t$current, \\n- \\t\\t\\t\\\"id\\\",\\n- \\t\\tlv_id_1_0, \\n+ \\t\\t\\t\\\"name\\\",\\n+ \\t\\tlv_name_1_0, \\n \\t\\t\\\"ID\\\");\\n \\t }\\n \\n@@ -519,48 +561,75 @@ ruleDecomposition returns [EObject current=null]\\n \\n \\n // Entry rule entryRuleDecompositionType\\n-entryRuleDecompositionType returns [String current=null] \\n+entryRuleDecompositionType returns [EObject current=null] \\n \\t:\\n-\\t{ newCompositeNode(grammarAccess.getDecompositionTypeRule()); } \\n+\\t{ newCompositeNode(grammarAccess.getDecompositionTypeRule()); }\\n \\t iv_ruleDecompositionType=ruleDecompositionType \\n-\\t { $current=$iv_ruleDecompositionType.current.getText(); } \\n+\\t { $current=$iv_ruleDecompositionType.current; } \\n \\t EOF \\n ;\\n \\n // Rule DecompositionType\\n-ruleDecompositionType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \\n+ruleDecompositionType returns [EObject current=null] \\n @init { enterRule(); \\n }\\n @after { leaveRule(); }:\\n (\\n-\\tkw='environment' \\n+(\\n+(\\n+\\t\\tlv_typeName_0_1=\\t'environment' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getEnvironmentKeyword_0()); \\n+ newLeafNode(lv_typeName_0_1, grammarAccess.getDecompositionTypeAccess().getTypeNameEnvironmentKeyword_0_0());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_1, null);\\n+\\t }\\n \\n- |\\n-\\tkw='operator' \\n+ |\\t\\tlv_typeName_0_2=\\t'operator' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getOperatorKeyword_1()); \\n+ newLeafNode(lv_typeName_0_2, grammarAccess.getDecompositionTypeAccess().getTypeNameOperatorKeyword_0_1());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_2, null);\\n+\\t }\\n \\n- |\\n-\\tkw='system' \\n+ |\\t\\tlv_typeName_0_3=\\t'system' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getSystemKeyword_2()); \\n+ newLeafNode(lv_typeName_0_3, grammarAccess.getDecompositionTypeAccess().getTypeNameSystemKeyword_0_2());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_3, null);\\n+\\t }\\n \\n- |\\n-\\tkw='verification' \\n+ |\\t\\tlv_typeName_0_4=\\t'verification' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getDecompositionTypeAccess().getVerificationKeyword_3()); \\n+ newLeafNode(lv_typeName_0_4, grammarAccess.getDecompositionTypeAccess().getTypeNameVerificationKeyword_0_3());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getDecompositionTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_4, null);\\n+\\t }\\n+\\n+)\\n+\\n )\\n- ;\\n+)\\n+;\\n \\n \\n \\n@@ -614,69 +683,111 @@ ruleDocument returns [EObject current=null]\\n \\n \\n // Entry rule entryRuleDocItemType\\n-entryRuleDocItemType returns [String current=null] \\n+entryRuleDocItemType returns [EObject current=null] \\n \\t:\\n-\\t{ newCompositeNode(grammarAccess.getDocItemTypeRule()); } \\n+\\t{ newCompositeNode(grammarAccess.getDocItemTypeRule()); }\\n \\t iv_ruleDocItemType=ruleDocItemType \\n-\\t { $current=$iv_ruleDocItemType.current.getText(); } \\n+\\t { $current=$iv_ruleDocItemType.current; } \\n \\t EOF \\n ;\\n \\n // Rule DocItemType\\n-ruleDocItemType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \\n+ruleDocItemType returns [EObject current=null] \\n @init { enterRule(); \\n }\\n @after { leaveRule(); }:\\n (\\n-\\tkw='condition' \\n+(\\n+(\\n+\\t\\tlv_typeName_0_1=\\t'condition' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getConditionKeyword_0()); \\n+ newLeafNode(lv_typeName_0_1, grammarAccess.getDocItemTypeAccess().getTypeNameConditionKeyword_0_0());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_1, null);\\n+\\t }\\n \\n- |\\n-\\tkw='figure' \\n+ |\\t\\tlv_typeName_0_2=\\t'figure' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getFigureKeyword_1()); \\n+ newLeafNode(lv_typeName_0_2, grammarAccess.getDocItemTypeAccess().getTypeNameFigureKeyword_0_1());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_2, null);\\n+\\t }\\n \\n- |\\n-\\tkw='break' \\n+ |\\t\\tlv_typeName_0_3=\\t'break' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getBreakKeyword_2()); \\n+ newLeafNode(lv_typeName_0_3, grammarAccess.getDocItemTypeAccess().getTypeNameBreakKeyword_0_2());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_3, null);\\n+\\t }\\n \\n- |\\n-\\tkw='model' \\n+ |\\t\\tlv_typeName_0_4=\\t'model' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getModelKeyword_3()); \\n+ newLeafNode(lv_typeName_0_4, grammarAccess.getDocItemTypeAccess().getTypeNameModelKeyword_0_3());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_4, null);\\n+\\t }\\n \\n- |\\n-\\tkw='paragraph' \\n+ |\\t\\tlv_typeName_0_5=\\t'paragraph' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getParagraphKeyword_4()); \\n+ newLeafNode(lv_typeName_0_5, grammarAccess.getDocItemTypeAccess().getTypeNameParagraphKeyword_0_4());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_5, null);\\n+\\t }\\n \\n- |\\n-\\tkw='section' \\n+ |\\t\\tlv_typeName_0_6=\\t'section' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getSectionKeyword_5()); \\n+ newLeafNode(lv_typeName_0_6, grammarAccess.getDocItemTypeAccess().getTypeNameSectionKeyword_0_5());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_6, null);\\n+\\t }\\n \\n- |\\n-\\tkw='table' \\n+ |\\t\\tlv_typeName_0_7=\\t'table' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getDocItemTypeAccess().getTableKeyword_6()); \\n+ newLeafNode(lv_typeName_0_7, grammarAccess.getDocItemTypeAccess().getTypeNameTableKeyword_0_6());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getDocItemTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_7, null);\\n+\\t }\\n+\\n )\\n- ;\\n+\\n+)\\n+)\\n+;\\n \\n \\n \\n@@ -716,18 +827,18 @@ ruleDocItem returns [EObject current=null]\\n )\\n )(\\n (\\n-\\t\\tlv_id_1_0=RULE_ID\\n+\\t\\tlv_name_1_0=RULE_ID\\n \\t\\t{\\n-\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0()); \\n+\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t}\\n \\t\\t{\\n \\t if ($current==null) {\\n \\t $current = createModelElement(grammarAccess.getDocItemRule());\\n \\t }\\n \\t\\tsetWithLastConsumed(\\n \\t\\t\\t$current, \\n- \\t\\t\\t\\\"id\\\",\\n- \\t\\tlv_id_1_0, \\n+ \\t\\t\\t\\\"name\\\",\\n+ \\t\\tlv_name_1_0, \\n \\t\\t\\\"ID\\\");\\n \\t }\\n \\n@@ -762,62 +873,99 @@ ruleDocItem returns [EObject current=null]\\n \\n \\n // Entry rule entryRuleModelType\\n-entryRuleModelType returns [String current=null] \\n+entryRuleModelType returns [EObject current=null] \\n \\t:\\n-\\t{ newCompositeNode(grammarAccess.getModelTypeRule()); } \\n+\\t{ newCompositeNode(grammarAccess.getModelTypeRule()); }\\n \\t iv_ruleModelType=ruleModelType \\n-\\t { $current=$iv_ruleModelType.current.getText(); } \\n+\\t { $current=$iv_ruleModelType.current; } \\n \\t EOF \\n ;\\n \\n // Rule ModelType\\n-ruleModelType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \\n+ruleModelType returns [EObject current=null] \\n @init { enterRule(); \\n }\\n @after { leaveRule(); }:\\n (\\n-\\tkw='output' \\n+(\\n+(\\n+\\t\\tlv_typeName_0_1=\\t'output' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getOutputKeyword_0()); \\n+ newLeafNode(lv_typeName_0_1, grammarAccess.getModelTypeAccess().getTypeNameOutputKeyword_0_0());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getModelTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_1, null);\\n+\\t }\\n \\n- |\\n-\\tkw='mode' \\n+ |\\t\\tlv_typeName_0_2=\\t'mode' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getModeKeyword_1()); \\n+ newLeafNode(lv_typeName_0_2, grammarAccess.getModelTypeAccess().getTypeNameModeKeyword_0_1());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getModelTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_2, null);\\n+\\t }\\n \\n- |\\n-\\tkw='state' \\n+ |\\t\\tlv_typeName_0_3=\\t'state' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getStateKeyword_2()); \\n+ newLeafNode(lv_typeName_0_3, grammarAccess.getModelTypeAccess().getTypeNameStateKeyword_0_2());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getModelTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_3, null);\\n+\\t }\\n \\n- |\\n-\\tkw='macro' \\n+ |\\t\\tlv_typeName_0_4=\\t'macro' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getMacroKeyword_3()); \\n+ newLeafNode(lv_typeName_0_4, grammarAccess.getModelTypeAccess().getTypeNameMacroKeyword_0_3());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getModelTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_4, null);\\n+\\t }\\n \\n- |\\n-\\tkw='function' \\n+ |\\t\\tlv_typeName_0_5=\\t'function' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getFunctionKeyword_4()); \\n+ newLeafNode(lv_typeName_0_5, grammarAccess.getModelTypeAccess().getTypeNameFunctionKeyword_0_4());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getModelTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_5, null);\\n+\\t }\\n \\n- |\\n-\\tkw='input' \\n+ |\\t\\tlv_typeName_0_6=\\t'input' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getModelTypeAccess().getInputKeyword_5()); \\n+ newLeafNode(lv_typeName_0_6, grammarAccess.getModelTypeAccess().getTypeNameInputKeyword_0_5());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getModelTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_6, null);\\n+\\t }\\n+\\n )\\n- ;\\n+\\n+)\\n+)\\n+;\\n \\n \\n \\n@@ -857,18 +1005,18 @@ ruleModelItem returns [EObject current=null]\\n )\\n )(\\n (\\n-\\t\\tlv_id_1_0=RULE_ID\\n+\\t\\tlv_name_1_0=RULE_ID\\n \\t\\t{\\n-\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0()); \\n+\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t}\\n \\t\\t{\\n \\t if ($current==null) {\\n \\t $current = createModelElement(grammarAccess.getModelItemRule());\\n \\t }\\n \\t\\tsetWithLastConsumed(\\n \\t\\t\\t$current, \\n- \\t\\t\\t\\\"id\\\",\\n- \\t\\tlv_id_1_0, \\n+ \\t\\t\\t\\\"name\\\",\\n+ \\t\\tlv_name_1_0, \\n \\t\\t\\\"ID\\\");\\n \\t }\\n \\n@@ -903,48 +1051,75 @@ ruleModelItem returns [EObject current=null]\\n \\n \\n // Entry rule entryRuleListItemType\\n-entryRuleListItemType returns [String current=null] \\n+entryRuleListItemType returns [EObject current=null] \\n \\t:\\n-\\t{ newCompositeNode(grammarAccess.getListItemTypeRule()); } \\n+\\t{ newCompositeNode(grammarAccess.getListItemTypeRule()); }\\n \\t iv_ruleListItemType=ruleListItemType \\n-\\t { $current=$iv_ruleListItemType.current.getText(); } \\n+\\t { $current=$iv_ruleListItemType.current; } \\n \\t EOF \\n ;\\n \\n // Rule ListItemType\\n-ruleListItemType returns [AntlrDatatypeRuleToken current=new AntlrDatatypeRuleToken()] \\n+ruleListItemType returns [EObject current=null] \\n @init { enterRule(); \\n }\\n @after { leaveRule(); }:\\n (\\n-\\tkw='requirement' \\n+(\\n+(\\n+\\t\\tlv_typeName_0_1=\\t'requirement' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getListItemTypeAccess().getRequirementKeyword_0()); \\n+ newLeafNode(lv_typeName_0_1, grammarAccess.getListItemTypeAccess().getTypeNameRequirementKeyword_0_0());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getListItemTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_1, null);\\n+\\t }\\n \\n- |\\n-\\tkw='goal' \\n+ |\\t\\tlv_typeName_0_2=\\t'goal' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getListItemTypeAccess().getGoalKeyword_1()); \\n+ newLeafNode(lv_typeName_0_2, grammarAccess.getListItemTypeAccess().getTypeNameGoalKeyword_0_1());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getListItemTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_2, null);\\n+\\t }\\n \\n- |\\n-\\tkw='hazard' \\n+ |\\t\\tlv_typeName_0_3=\\t'hazard' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getListItemTypeAccess().getHazardKeyword_2()); \\n+ newLeafNode(lv_typeName_0_3, grammarAccess.getListItemTypeAccess().getTypeNameHazardKeyword_0_2());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getListItemTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_3, null);\\n+\\t }\\n \\n- |\\n-\\tkw='constraint' \\n+ |\\t\\tlv_typeName_0_4=\\t'constraint' \\n {\\n- $current.merge(kw);\\n- newLeafNode(kw, grammarAccess.getListItemTypeAccess().getConstraintKeyword_3()); \\n+ newLeafNode(lv_typeName_0_4, grammarAccess.getListItemTypeAccess().getTypeNameConstraintKeyword_0_3());\\n }\\n+ \\n+\\t {\\n+\\t if ($current==null) {\\n+\\t $current = createModelElement(grammarAccess.getListItemTypeRule());\\n+\\t }\\n+ \\t\\tsetWithLastConsumed($current, \\\"typeName\\\", lv_typeName_0_4, null);\\n+\\t }\\n+\\n )\\n- ;\\n+\\n+)\\n+)\\n+;\\n \\n \\n \\n@@ -984,18 +1159,18 @@ ruleListItem returns [EObject current=null]\\n )\\n )(\\n (\\n-\\t\\tlv_id_1_0=RULE_ID\\n+\\t\\tlv_name_1_0=RULE_ID\\n \\t\\t{\\n-\\t\\t\\tnewLeafNode(lv_id_1_0, grammarAccess.getListItemAccess().getIdIDTerminalRuleCall_1_0()); \\n+\\t\\t\\tnewLeafNode(lv_name_1_0, grammarAccess.getListItemAccess().getNameIDTerminalRuleCall_1_0()); \\n \\t\\t}\\n \\t\\t{\\n \\t if ($current==null) {\\n \\t $current = createModelElement(grammarAccess.getListItemRule());\\n \\t }\\n \\t\\tsetWithLastConsumed(\\n \\t\\t\\t$current, \\n- \\t\\t\\t\\\"id\\\",\\n- \\t\\tlv_id_1_0, \\n+ \\t\\t\\t\\\"name\\\",\\n+ \\t\\tlv_name_1_0, \\n \\t\\t\\\"ID\\\");\\n \\t }\\n \\n@@ -1035,7 +1210,7 @@ ruleListItem returns [EObject current=null]\\n \\t}\\n \\n )\\n-)*\\totherlv_5='}' \\n+)+\\totherlv_5='}' \\n {\\n \\tnewLeafNode(otherlv_5, grammarAccess.getListItemAccess().getRightCurlyBracketKeyword_3_2());\\n }\\n@@ -1056,7 +1231,7 @@ ruleListItem returns [EObject current=null]\\n \\t}\\n \\n )\\n-)*\\totherlv_8=')' \\n+)+\\totherlv_8=')' \\n {\\n \\tnewLeafNode(otherlv_8, grammarAccess.getListItemAccess().getRightParenthesisKeyword_4_2());\\n }\\n@@ -1077,7 +1252,7 @@ ruleListItem returns [EObject current=null]\\n \\t}\\n \\n )\\n-)*\\totherlv_11=']' \\n+)+\\totherlv_11=']' \\n {\\n \\tnewLeafNode(otherlv_11, grammarAccess.getListItemAccess().getRightSquareBracketKeyword_5_2());\\n }\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecification.g\",\n \"sha\": \"4fc8eaa413792493d9f6a86fe2901598cd519e9d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 37,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java\",\n \"changes\": 74,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 37,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecificationLexer.java\",\n \"new_code\": \" // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: ( '^' )?\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: '^'\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:10: ( ( '0' .. '9' )+ )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:12: ( '0' .. '9' )+\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:12: ( '0' .. '9' )+\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:13: '0' .. '9'\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:13: ( ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' ) )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:16: '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"'\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:20: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )*\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:21: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:66: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:86: '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\''\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:91: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )*\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:92: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:137: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:19: '/*' ( options {greedy=false; } : . )* '*/'\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:24: ( options {greedy=false; } : . )*\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:52: .\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:17: ( '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )? )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:19: '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:24: (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )*\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:24: ~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:40: ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: ( '\\\\\\\\r' )? '\\\\\\\\n'\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: ( '\\\\\\\\r' )?\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: '\\\\\\\\r'\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:9: ( ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+ )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1282:16: ( . )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1282:18: .\",\n \"new_methods\": [],\n \"old_code\": \" // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: ( '^' )?\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: '^'\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:10: ( ( '0' .. '9' )+ )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:12: ( '0' .. '9' )+\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:12: ( '0' .. '9' )+\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:13: '0' .. '9'\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:13: ( ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' ) )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:16: '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"'\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:20: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )*\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:21: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:66: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:86: '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\''\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:91: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )*\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:92: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:137: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:19: '/*' ( options {greedy=false; } : . )* '*/'\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:24: ( options {greedy=false; } : . )*\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:52: .\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:17: ( '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )? )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:19: '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:24: (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )*\\n \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:24: ~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:40: ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: ( '\\\\\\\\r' )? '\\\\\\\\n'\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: ( '\\\\\\\\r' )?\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: '\\\\\\\\r'\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:9: ( ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+ )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1107:16: ( . )\\n // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1107:18: .\",\n \"old_methods\": [],\n \"patch\": \"@@ -846,10 +846,10 @@ public final void mRULE_ID() throws RecognitionException {\\n try {\\n int _type = RULE_ID;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:9: ( ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )* )\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: ( '^' )? ( 'a' .. 'z' | 'A' .. 'Z' | '_' ) ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n {\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: ( '^' )?\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: ( '^' )?\\n int alt1=2;\\n int LA1_0 = input.LA(1);\\n \\n@@ -858,7 +858,7 @@ public final void mRULE_ID() throws RecognitionException {\\n }\\n switch (alt1) {\\n case 1 :\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:11: '^'\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:11: '^'\\n {\\n match('^'); \\n \\n@@ -876,7 +876,7 @@ public final void mRULE_ID() throws RecognitionException {\\n recover(mse);\\n throw mse;}\\n \\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1095:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1270:40: ( 'a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9' )*\\n loop2:\\n do {\\n int alt2=2;\\n@@ -925,10 +925,10 @@ public final void mRULE_INT() throws RecognitionException {\\n try {\\n int _type = RULE_INT;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:10: ( ( '0' .. '9' )+ )\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:12: ( '0' .. '9' )+\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:10: ( ( '0' .. '9' )+ )\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:12: ( '0' .. '9' )+\\n {\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:12: ( '0' .. '9' )+\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:12: ( '0' .. '9' )+\\n int cnt3=0;\\n loop3:\\n do {\\n@@ -942,7 +942,7 @@ public final void mRULE_INT() throws RecognitionException {\\n \\n switch (alt3) {\\n \\tcase 1 :\\n- \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1097:13: '0' .. '9'\\n+ \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1272:13: '0' .. '9'\\n \\t {\\n \\t matchRange('0','9'); \\n \\n@@ -974,10 +974,10 @@ public final void mRULE_STRING() throws RecognitionException {\\n try {\\n int _type = RULE_STRING;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:13: ( ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' ) )\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:13: ( ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' ) )\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n {\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:15: ( '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"' | '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\'' )\\n int alt6=2;\\n int LA6_0 = input.LA(1);\\n \\n@@ -995,10 +995,10 @@ else if ( (LA6_0=='\\\\'') ) {\\n }\\n switch (alt6) {\\n case 1 :\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:16: '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"'\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:16: '\\\\\\\"' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )* '\\\\\\\"'\\n {\\n match('\\\\\\\"'); \\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:20: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )*\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:20: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) ) )*\\n loop4:\\n do {\\n int alt4=3;\\n@@ -1014,7 +1014,7 @@ else if ( ((LA4_0>='\\\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\\n \\n switch (alt4) {\\n \\tcase 1 :\\n- \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:21: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n+ \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:21: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n \\t {\\n \\t match('\\\\\\\\'); \\n \\t if ( input.LA(1)=='\\\\\\\"'||input.LA(1)=='\\\\''||input.LA(1)=='\\\\\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\\n@@ -1030,7 +1030,7 @@ else if ( ((LA4_0>='\\\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\\n \\t }\\n \\t break;\\n \\tcase 2 :\\n- \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:66: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) )\\n+ \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:66: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\"' ) )\\n \\t {\\n \\t if ( (input.LA(1)>='\\\\u0000' && input.LA(1)<='!')||(input.LA(1)>='#' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\\\uFFFF') ) {\\n \\t input.consume();\\n@@ -1055,10 +1055,10 @@ else if ( ((LA4_0>='\\\\u0000' && LA4_0<='!')||(LA4_0>='#' && LA4_0<='[')||(LA4_0>=\\n }\\n break;\\n case 2 :\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:86: '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\''\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:86: '\\\\\\\\'' ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )* '\\\\\\\\''\\n {\\n match('\\\\''); \\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:91: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )*\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:91: ( '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' ) | ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) ) )*\\n loop5:\\n do {\\n int alt5=3;\\n@@ -1074,7 +1074,7 @@ else if ( ((LA5_0>='\\\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\\n \\n switch (alt5) {\\n \\tcase 1 :\\n- \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:92: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n+ \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:92: '\\\\\\\\\\\\\\\\' ( 'b' | 't' | 'n' | 'f' | 'r' | 'u' | '\\\\\\\"' | '\\\\\\\\'' | '\\\\\\\\\\\\\\\\' )\\n \\t {\\n \\t match('\\\\\\\\'); \\n \\t if ( input.LA(1)=='\\\\\\\"'||input.LA(1)=='\\\\''||input.LA(1)=='\\\\\\\\'||input.LA(1)=='b'||input.LA(1)=='f'||input.LA(1)=='n'||input.LA(1)=='r'||(input.LA(1)>='t' && input.LA(1)<='u') ) {\\n@@ -1090,7 +1090,7 @@ else if ( ((LA5_0>='\\\\u0000' && LA5_0<='&')||(LA5_0>='(' && LA5_0<='[')||(LA5_0>=\\n \\t }\\n \\t break;\\n \\tcase 2 :\\n- \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1099:137: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) )\\n+ \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1274:137: ~ ( ( '\\\\\\\\\\\\\\\\' | '\\\\\\\\'' ) )\\n \\t {\\n \\t if ( (input.LA(1)>='\\\\u0000' && input.LA(1)<='&')||(input.LA(1)>='(' && input.LA(1)<='[')||(input.LA(1)>=']' && input.LA(1)<='\\\\uFFFF') ) {\\n \\t input.consume();\\n@@ -1133,12 +1133,12 @@ public final void mRULE_ML_COMMENT() throws RecognitionException {\\n try {\\n int _type = RULE_ML_COMMENT;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:19: '/*' ( options {greedy=false; } : . )* '*/'\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:17: ( '/*' ( options {greedy=false; } : . )* '*/' )\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:19: '/*' ( options {greedy=false; } : . )* '*/'\\n {\\n match(\\\"/*\\\"); \\n \\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:24: ( options {greedy=false; } : . )*\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:24: ( options {greedy=false; } : . )*\\n loop7:\\n do {\\n int alt7=2;\\n@@ -1163,7 +1163,7 @@ else if ( ((LA7_0>='\\\\u0000' && LA7_0<=')')||(LA7_0>='+' && LA7_0<='\\\\uFFFF')) ) {\\n \\n switch (alt7) {\\n \\tcase 1 :\\n- \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1101:52: .\\n+ \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1276:52: .\\n \\t {\\n \\t matchAny(); \\n \\n@@ -1193,12 +1193,12 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\\n try {\\n int _type = RULE_SL_COMMENT;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:17: ( '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )? )\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:19: '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:17: ( '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )? )\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:19: '//' (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )* ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n {\\n match(\\\"//\\\"); \\n \\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:24: (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )*\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:24: (~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) ) )*\\n loop8:\\n do {\\n int alt8=2;\\n@@ -1211,7 +1211,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\\n \\n switch (alt8) {\\n \\tcase 1 :\\n- \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:24: ~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) )\\n+ \\t // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:24: ~ ( ( '\\\\\\\\n' | '\\\\\\\\r' ) )\\n \\t {\\n \\t if ( (input.LA(1)>='\\\\u0000' && input.LA(1)<='\\\\t')||(input.LA(1)>='\\\\u000B' && input.LA(1)<='\\\\f')||(input.LA(1)>='\\\\u000E' && input.LA(1)<='\\\\uFFFF') ) {\\n \\t input.consume();\\n@@ -1231,7 +1231,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\\n }\\n } while (true);\\n \\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:40: ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:40: ( ( '\\\\\\\\r' )? '\\\\\\\\n' )?\\n int alt10=2;\\n int LA10_0 = input.LA(1);\\n \\n@@ -1240,9 +1240,9 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\\n }\\n switch (alt10) {\\n case 1 :\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: ( '\\\\\\\\r' )? '\\\\\\\\n'\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: ( '\\\\\\\\r' )? '\\\\\\\\n'\\n {\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: ( '\\\\\\\\r' )?\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: ( '\\\\\\\\r' )?\\n int alt9=2;\\n int LA9_0 = input.LA(1);\\n \\n@@ -1251,7 +1251,7 @@ public final void mRULE_SL_COMMENT() throws RecognitionException {\\n }\\n switch (alt9) {\\n case 1 :\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1103:41: '\\\\\\\\r'\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1278:41: '\\\\\\\\r'\\n {\\n match('\\\\r'); \\n \\n@@ -1283,10 +1283,10 @@ public final void mRULE_WS() throws RecognitionException {\\n try {\\n int _type = RULE_WS;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:9: ( ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+ )\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:9: ( ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+ )\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n {\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1105:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1280:11: ( ' ' | '\\\\\\\\t' | '\\\\\\\\r' | '\\\\\\\\n' )+\\n int cnt11=0;\\n loop11:\\n do {\\n@@ -1340,8 +1340,8 @@ public final void mRULE_ANY_OTHER() throws RecognitionException {\\n try {\\n int _type = RULE_ANY_OTHER;\\n int _channel = DEFAULT_TOKEN_CHANNEL;\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1107:16: ( . )\\n- // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1107:18: .\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1282:16: ( . )\\n+ // ../net.certware.intent/src-gen/net/certware/intent/parser/antlr/internal/InternalIntentSpecification.g:1282:18: .\\n {\\n matchAny(); \\n \",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fparser%2Fantlr%2Finternal%2FInternalIntentSpecificationLexer.java\",\n \"sha\": \"18f7294e0031576cfeb922c0d98957cc758ceb78\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 116,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSemanticSequencer.java\",\n \"changes\": 129,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSemanticSequencer.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 13,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java\",\n \"new_code\": \"import net.certware.intent.intentSpecification.DecompositionType;\\nimport net.certware.intent.intentSpecification.DocItemType;\\nimport net.certware.intent.intentSpecification.IntentType;\\nimport net.certware.intent.intentSpecification.ListItemType;\\nimport net.certware.intent.intentSpecification.ModelType;\\n\\t\\t\\tcase IntentSpecificationPackage.DECOMPOSITION_TYPE:\\n\\t\\t\\t\\tif(context == grammarAccess.getDecompositionTypeRule()) {\\n\\t\\t\\t\\t\\tsequence_DecompositionType(context, (DecompositionType) semanticObject); \\n\\t\\t\\t\\t\\treturn; \\n\\t\\t\\t\\t}\\n\\t\\t\\t\\telse break;\\n\\t\\t\\tcase IntentSpecificationPackage.DOC_ITEM_TYPE:\\n\\t\\t\\t\\tif(context == grammarAccess.getDocItemTypeRule()) {\\n\\t\\t\\t\\t\\tsequence_DocItemType(context, (DocItemType) semanticObject); \\n\\t\\t\\t\\t\\treturn; \\n\\t\\t\\t\\t}\\n\\t\\t\\t\\telse break;\\n\\t\\t\\tcase IntentSpecificationPackage.INTENT_TYPE:\\n\\t\\t\\t\\tif(context == grammarAccess.getIntentTypeRule()) {\\n\\t\\t\\t\\t\\tsequence_IntentType(context, (IntentType) semanticObject); \\n\\t\\t\\t\\t\\treturn; \\n\\t\\t\\t\\t}\\n\\t\\t\\t\\telse break;\\n\\t\\t\\tcase IntentSpecificationPackage.LIST_ITEM_TYPE:\\n\\t\\t\\t\\tif(context == grammarAccess.getListItemTypeRule()) {\\n\\t\\t\\t\\t\\tsequence_ListItemType(context, (ListItemType) semanticObject); \\n\\t\\t\\t\\t\\treturn; \\n\\t\\t\\t\\t}\\n\\t\\t\\t\\telse break;\\n\\t\\t\\tcase IntentSpecificationPackage.MODEL_TYPE:\\n\\t\\t\\t\\tif(context == grammarAccess.getModelTypeRule()) {\\n\\t\\t\\t\\t\\tsequence_ModelType(context, (ModelType) semanticObject); \\n\\t\\t\\t\\t\\treturn; \\n\\t\\t\\t\\t}\\n\\t\\t\\t\\telse break;\\n\\t/**\\n\\t * Constraint:\\n\\t * (typeName='environment' | typeName='operator' | typeName='system' | typeName='verification')\\n\\t */\\n\\tprotected void sequence_DecompositionType(EObject context, DecompositionType semanticObject) {\\n\\t\\tgenericSequencer.createSequence(context, semanticObject);\\n\\t}\\n\\t\\n\\t\\n\\t * name=ID \\n\\t * (\\n\\t * typeName='condition' | \\n\\t * typeName='figure' | \\n\\t * typeName='break' | \\n\\t * typeName='model' | \\n\\t * typeName='paragraph' | \\n\\t * typeName='section' | \\n\\t * typeName='table'\\n\\t * )\\n\\t */\\n\\tprotected void sequence_DocItemType(EObject context, DocItemType semanticObject) {\\n\\t\\tgenericSequencer.createSequence(context, semanticObject);\\n\\t}\\n\\t\\n\\t\\n\\t/**\\n\\t * Constraint:\\n\\t * (type=DocItemType name=ID ref=STRING)\\n\\t\\t\\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__NAME) == ValueTransient.YES)\\n\\t\\t\\t\\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__NAME));\\n\\t\\tfeeder.accept(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());\\n\\t * (\\n\\t * typeName='basic' | \\n\\t * typeName='purpose' | \\n\\t * typeName='principles' | \\n\\t * typeName='models' | \\n\\t * typeName='design' | \\n\\t * typeName='implementation' | \\n\\t * typeName='operation'\\n\\t * )\\n\\t */\\n\\tprotected void sequence_IntentType(EObject context, IntentType semanticObject) {\\n\\t\\tgenericSequencer.createSequence(context, semanticObject);\\n\\t}\\n\\t\\n\\t\\n\\t/**\\n\\t * Constraint:\\n\\t * (type=IntentType name=ID desc=STRING decompositions+=Decomposition+)\\n\\t/**\\n\\t * Constraint:\\n\\t * (typeName='requirement' | typeName='goal' | typeName='hazard' | typeName='constraint')\\n\\t */\\n\\tprotected void sequence_ListItemType(EObject context, ListItemType semanticObject) {\\n\\t\\tgenericSequencer.createSequence(context, semanticObject);\\n\\t}\\n\\t\\n\\t\\n\\t * name=ID \\n\\t * (type=ModelType name=ID desc=STRING)\\n\\t\\t\\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__NAME) == ValueTransient.YES)\\n\\t\\t\\t\\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__NAME));\\n\\t\\tfeeder.accept(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());\\n\\t * (\\n\\t * typeName='output' | \\n\\t * typeName='mode' | \\n\\t * typeName='state' | \\n\\t * typeName='macro' | \\n\\t * typeName='function' | \\n\\t * typeName='input'\\n\\t * )\\n\\t */\\n\\tprotected void sequence_ModelType(EObject context, ModelType semanticObject) {\\n\\t\\tgenericSequencer.createSequence(context, semanticObject);\\n\\t}\\n\\t\\n\\t\\n\\t/**\\n\\t * Constraint:\\n\\t * (name=ID desc=STRING intents+=Intent+)\\n\\t * (name=ID refinements+=Refinement+)\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"EObject context\",\n \" DecompositionType semanticObject\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java\",\n \"implementation\": \"genericSequencer.createSequence(context, semanticObject);\",\n \"signature\": \"void sequence_DecompositionType(EObject context, DecompositionType semanticObject)\"\n },\n {\n \"arguments\": [\n \"EObject context\",\n \" DocItemType semanticObject\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java\",\n \"implementation\": \"genericSequencer.createSequence(context, semanticObject);\",\n \"signature\": \"void sequence_DocItemType(EObject context, DocItemType semanticObject)\"\n },\n {\n \"arguments\": [\n \"EObject context\",\n \" IntentType semanticObject\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java\",\n \"implementation\": \"genericSequencer.createSequence(context, semanticObject);\",\n \"signature\": \"void sequence_IntentType(EObject context, IntentType semanticObject)\"\n },\n {\n \"arguments\": [\n \"EObject context\",\n \" ListItemType semanticObject\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java\",\n \"implementation\": \"genericSequencer.createSequence(context, semanticObject);\",\n \"signature\": \"void sequence_ListItemType(EObject context, ListItemType semanticObject)\"\n },\n {\n \"arguments\": [\n \"EObject context\",\n \" ModelType semanticObject\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSemanticSequencer.java\",\n \"implementation\": \"genericSequencer.createSequence(context, semanticObject);\",\n \"signature\": \"void sequence_ModelType(EObject context, ModelType semanticObject)\"\n }\n ],\n \"old_code\": \"\\t * id=ID \\n\\t * (type=DocItemType id=ID ref=STRING)\\n\\t\\t\\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__ID) == ValueTransient.YES)\\n\\t\\t\\t\\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__ID));\\n\\t\\tfeeder.accept(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());\\n\\t * (type=IntentType id=ID desc=STRING decompositions+=Decomposition+)\\n\\t * id=ID \\n\\t * (type=ModelType id=ID desc=STRING)\\n\\t\\t\\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__ID) == ValueTransient.YES)\\n\\t\\t\\t\\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__ID));\\n\\t\\tfeeder.accept(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());\\n\\t * (id=ID desc=STRING intents+=Intent+)\\n\\t * (id=ID refinements+=Refinement+)\",\n \"old_methods\": [],\n \"patch\": \"@@ -3,12 +3,17 @@\\n import com.google.inject.Inject;\\n import com.google.inject.Provider;\\n import net.certware.intent.intentSpecification.Decomposition;\\n+import net.certware.intent.intentSpecification.DecompositionType;\\n import net.certware.intent.intentSpecification.DocItem;\\n+import net.certware.intent.intentSpecification.DocItemType;\\n import net.certware.intent.intentSpecification.Document;\\n import net.certware.intent.intentSpecification.Intent;\\n import net.certware.intent.intentSpecification.IntentSpecificationPackage;\\n+import net.certware.intent.intentSpecification.IntentType;\\n import net.certware.intent.intentSpecification.ListItem;\\n+import net.certware.intent.intentSpecification.ListItemType;\\n import net.certware.intent.intentSpecification.ModelItem;\\n+import net.certware.intent.intentSpecification.ModelType;\\n import net.certware.intent.intentSpecification.Refinement;\\n import net.certware.intent.intentSpecification.Specification;\\n import net.certware.intent.services.IntentSpecificationGrammarAccess;\\n@@ -38,12 +43,24 @@ public void createSequence(EObject context, EObject semanticObject) {\\n \\t\\t\\t\\t\\treturn; \\n \\t\\t\\t\\t}\\n \\t\\t\\t\\telse break;\\n+\\t\\t\\tcase IntentSpecificationPackage.DECOMPOSITION_TYPE:\\n+\\t\\t\\t\\tif(context == grammarAccess.getDecompositionTypeRule()) {\\n+\\t\\t\\t\\t\\tsequence_DecompositionType(context, (DecompositionType) semanticObject); \\n+\\t\\t\\t\\t\\treturn; \\n+\\t\\t\\t\\t}\\n+\\t\\t\\t\\telse break;\\n \\t\\t\\tcase IntentSpecificationPackage.DOC_ITEM:\\n \\t\\t\\t\\tif(context == grammarAccess.getDocItemRule()) {\\n \\t\\t\\t\\t\\tsequence_DocItem(context, (DocItem) semanticObject); \\n \\t\\t\\t\\t\\treturn; \\n \\t\\t\\t\\t}\\n \\t\\t\\t\\telse break;\\n+\\t\\t\\tcase IntentSpecificationPackage.DOC_ITEM_TYPE:\\n+\\t\\t\\t\\tif(context == grammarAccess.getDocItemTypeRule()) {\\n+\\t\\t\\t\\t\\tsequence_DocItemType(context, (DocItemType) semanticObject); \\n+\\t\\t\\t\\t\\treturn; \\n+\\t\\t\\t\\t}\\n+\\t\\t\\t\\telse break;\\n \\t\\t\\tcase IntentSpecificationPackage.DOCUMENT:\\n \\t\\t\\t\\tif(context == grammarAccess.getDocumentRule()) {\\n \\t\\t\\t\\t\\tsequence_Document(context, (Document) semanticObject); \\n@@ -56,18 +73,36 @@ public void createSequence(EObject context, EObject semanticObject) {\\n \\t\\t\\t\\t\\treturn; \\n \\t\\t\\t\\t}\\n \\t\\t\\t\\telse break;\\n+\\t\\t\\tcase IntentSpecificationPackage.INTENT_TYPE:\\n+\\t\\t\\t\\tif(context == grammarAccess.getIntentTypeRule()) {\\n+\\t\\t\\t\\t\\tsequence_IntentType(context, (IntentType) semanticObject); \\n+\\t\\t\\t\\t\\treturn; \\n+\\t\\t\\t\\t}\\n+\\t\\t\\t\\telse break;\\n \\t\\t\\tcase IntentSpecificationPackage.LIST_ITEM:\\n \\t\\t\\t\\tif(context == grammarAccess.getListItemRule()) {\\n \\t\\t\\t\\t\\tsequence_ListItem(context, (ListItem) semanticObject); \\n \\t\\t\\t\\t\\treturn; \\n \\t\\t\\t\\t}\\n \\t\\t\\t\\telse break;\\n+\\t\\t\\tcase IntentSpecificationPackage.LIST_ITEM_TYPE:\\n+\\t\\t\\t\\tif(context == grammarAccess.getListItemTypeRule()) {\\n+\\t\\t\\t\\t\\tsequence_ListItemType(context, (ListItemType) semanticObject); \\n+\\t\\t\\t\\t\\treturn; \\n+\\t\\t\\t\\t}\\n+\\t\\t\\t\\telse break;\\n \\t\\t\\tcase IntentSpecificationPackage.MODEL_ITEM:\\n \\t\\t\\t\\tif(context == grammarAccess.getModelItemRule()) {\\n \\t\\t\\t\\t\\tsequence_ModelItem(context, (ModelItem) semanticObject); \\n \\t\\t\\t\\t\\treturn; \\n \\t\\t\\t\\t}\\n \\t\\t\\t\\telse break;\\n+\\t\\t\\tcase IntentSpecificationPackage.MODEL_TYPE:\\n+\\t\\t\\t\\tif(context == grammarAccess.getModelTypeRule()) {\\n+\\t\\t\\t\\t\\tsequence_ModelType(context, (ModelType) semanticObject); \\n+\\t\\t\\t\\t\\treturn; \\n+\\t\\t\\t\\t}\\n+\\t\\t\\t\\telse break;\\n \\t\\t\\tcase IntentSpecificationPackage.REFINEMENT:\\n \\t\\t\\t\\tif(context == grammarAccess.getRefinementRule()) {\\n \\t\\t\\t\\t\\tsequence_Refinement(context, (Refinement) semanticObject); \\n@@ -84,11 +119,20 @@ public void createSequence(EObject context, EObject semanticObject) {\\n \\t\\tif (errorAcceptor != null) errorAcceptor.accept(diagnosticProvider.createInvalidContextOrTypeDiagnostic(semanticObject, context));\\n \\t}\\n \\t\\n+\\t/**\\n+\\t * Constraint:\\n+\\t * (typeName='environment' | typeName='operator' | typeName='system' | typeName='verification')\\n+\\t */\\n+\\tprotected void sequence_DecompositionType(EObject context, DecompositionType semanticObject) {\\n+\\t\\tgenericSequencer.createSequence(context, semanticObject);\\n+\\t}\\n+\\t\\n+\\t\\n \\t/**\\n \\t * Constraint:\\n \\t * (\\n \\t * type=DecompositionType \\n-\\t * id=ID \\n+\\t * name=ID \\n \\t * desc=STRING \\n \\t * documents+=Document* \\n \\t * models+=ModelItem* \\n@@ -102,21 +146,38 @@ protected void sequence_Decomposition(EObject context, Decomposition semanticObj\\n \\t\\n \\t/**\\n \\t * Constraint:\\n-\\t * (type=DocItemType id=ID ref=STRING)\\n+\\t * (\\n+\\t * typeName='condition' | \\n+\\t * typeName='figure' | \\n+\\t * typeName='break' | \\n+\\t * typeName='model' | \\n+\\t * typeName='paragraph' | \\n+\\t * typeName='section' | \\n+\\t * typeName='table'\\n+\\t * )\\n+\\t */\\n+\\tprotected void sequence_DocItemType(EObject context, DocItemType semanticObject) {\\n+\\t\\tgenericSequencer.createSequence(context, semanticObject);\\n+\\t}\\n+\\t\\n+\\t\\n+\\t/**\\n+\\t * Constraint:\\n+\\t * (type=DocItemType name=ID ref=STRING)\\n \\t */\\n \\tprotected void sequence_DocItem(EObject context, DocItem semanticObject) {\\n \\t\\tif(errorAcceptor != null) {\\n \\t\\t\\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__TYPE) == ValueTransient.YES)\\n \\t\\t\\t\\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__TYPE));\\n-\\t\\t\\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__ID) == ValueTransient.YES)\\n-\\t\\t\\t\\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__ID));\\n+\\t\\t\\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__NAME) == ValueTransient.YES)\\n+\\t\\t\\t\\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__NAME));\\n \\t\\t\\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__REF) == ValueTransient.YES)\\n \\t\\t\\t\\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.DOC_ITEM__REF));\\n \\t\\t}\\n \\t\\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\\n \\t\\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\\n \\t\\tfeeder.accept(grammarAccess.getDocItemAccess().getTypeDocItemTypeParserRuleCall_0_0(), semanticObject.getType());\\n-\\t\\tfeeder.accept(grammarAccess.getDocItemAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());\\n+\\t\\tfeeder.accept(grammarAccess.getDocItemAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());\\n \\t\\tfeeder.accept(grammarAccess.getDocItemAccess().getRefSTRINGTerminalRuleCall_2_0(), semanticObject.getRef());\\n \\t\\tfeeder.finish();\\n \\t}\\n@@ -133,18 +194,44 @@ protected void sequence_Document(EObject context, Document semanticObject) {\\n \\t\\n \\t/**\\n \\t * Constraint:\\n-\\t * (type=IntentType id=ID desc=STRING decompositions+=Decomposition+)\\n+\\t * (\\n+\\t * typeName='basic' | \\n+\\t * typeName='purpose' | \\n+\\t * typeName='principles' | \\n+\\t * typeName='models' | \\n+\\t * typeName='design' | \\n+\\t * typeName='implementation' | \\n+\\t * typeName='operation'\\n+\\t * )\\n+\\t */\\n+\\tprotected void sequence_IntentType(EObject context, IntentType semanticObject) {\\n+\\t\\tgenericSequencer.createSequence(context, semanticObject);\\n+\\t}\\n+\\t\\n+\\t\\n+\\t/**\\n+\\t * Constraint:\\n+\\t * (type=IntentType name=ID desc=STRING decompositions+=Decomposition+)\\n \\t */\\n \\tprotected void sequence_Intent(EObject context, Intent semanticObject) {\\n \\t\\tgenericSequencer.createSequence(context, semanticObject);\\n \\t}\\n \\t\\n \\t\\n+\\t/**\\n+\\t * Constraint:\\n+\\t * (typeName='requirement' | typeName='goal' | typeName='hazard' | typeName='constraint')\\n+\\t */\\n+\\tprotected void sequence_ListItemType(EObject context, ListItemType semanticObject) {\\n+\\t\\tgenericSequencer.createSequence(context, semanticObject);\\n+\\t}\\n+\\t\\n+\\t\\n \\t/**\\n \\t * Constraint:\\n \\t * (\\n \\t * type=ListItemType \\n-\\t * id=ID \\n+\\t * name=ID \\n \\t * desc=STRING \\n \\t * docReferences+=[DocItem|ID]* \\n \\t * itemReferences+=[ListItem|ID]* \\n@@ -158,29 +245,45 @@ protected void sequence_ListItem(EObject context, ListItem semanticObject) {\\n \\t\\n \\t/**\\n \\t * Constraint:\\n-\\t * (type=ModelType id=ID desc=STRING)\\n+\\t * (type=ModelType name=ID desc=STRING)\\n \\t */\\n \\tprotected void sequence_ModelItem(EObject context, ModelItem semanticObject) {\\n \\t\\tif(errorAcceptor != null) {\\n \\t\\t\\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__TYPE) == ValueTransient.YES)\\n \\t\\t\\t\\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__TYPE));\\n-\\t\\t\\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__ID) == ValueTransient.YES)\\n-\\t\\t\\t\\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__ID));\\n+\\t\\t\\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__NAME) == ValueTransient.YES)\\n+\\t\\t\\t\\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__NAME));\\n \\t\\t\\tif(transientValues.isValueTransient(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__DESC) == ValueTransient.YES)\\n \\t\\t\\t\\terrorAcceptor.accept(diagnosticProvider.createFeatureValueMissing(semanticObject, IntentSpecificationPackage.Literals.MODEL_ITEM__DESC));\\n \\t\\t}\\n \\t\\tINodesForEObjectProvider nodes = createNodeProvider(semanticObject);\\n \\t\\tSequenceFeeder feeder = createSequencerFeeder(semanticObject, nodes);\\n \\t\\tfeeder.accept(grammarAccess.getModelItemAccess().getTypeModelTypeParserRuleCall_0_0(), semanticObject.getType());\\n-\\t\\tfeeder.accept(grammarAccess.getModelItemAccess().getIdIDTerminalRuleCall_1_0(), semanticObject.getId());\\n+\\t\\tfeeder.accept(grammarAccess.getModelItemAccess().getNameIDTerminalRuleCall_1_0(), semanticObject.getName());\\n \\t\\tfeeder.accept(grammarAccess.getModelItemAccess().getDescSTRINGTerminalRuleCall_2_0(), semanticObject.getDesc());\\n \\t\\tfeeder.finish();\\n \\t}\\n \\t\\n \\t\\n \\t/**\\n \\t * Constraint:\\n-\\t * (id=ID desc=STRING intents+=Intent+)\\n+\\t * (\\n+\\t * typeName='output' | \\n+\\t * typeName='mode' | \\n+\\t * typeName='state' | \\n+\\t * typeName='macro' | \\n+\\t * typeName='function' | \\n+\\t * typeName='input'\\n+\\t * )\\n+\\t */\\n+\\tprotected void sequence_ModelType(EObject context, ModelType semanticObject) {\\n+\\t\\tgenericSequencer.createSequence(context, semanticObject);\\n+\\t}\\n+\\t\\n+\\t\\n+\\t/**\\n+\\t * Constraint:\\n+\\t * (name=ID desc=STRING intents+=Intent+)\\n \\t */\\n \\tprotected void sequence_Refinement(EObject context, Refinement semanticObject) {\\n \\t\\tgenericSequencer.createSequence(context, semanticObject);\\n@@ -189,7 +292,7 @@ protected void sequence_Refinement(EObject context, Refinement semanticObject) {\\n \\t\\n \\t/**\\n \\t * Constraint:\\n-\\t * (id=ID refinements+=Refinement+)\\n+\\t * (name=ID refinements+=Refinement+)\\n \\t */\\n \\tprotected void sequence_Specification(EObject context, Specification semanticObject) {\\n \\t\\tgenericSequencer.createSequence(context, semanticObject);\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSemanticSequencer.java\",\n \"sha\": \"2abf9431b52e9a2bef30a8ef084b854fb99c6af9\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSyntacticSequencer.java\",\n \"changes\": 36,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSyntacticSequencer.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 36,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSyntacticSequencer.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\tprotected AbstractElementAlias match_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q;\\n\\tprotected AbstractElementAlias match_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q;\\n\\tprotected AbstractElementAlias match_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q;\\n\\t\\tmatch_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftCurlyBracketKeyword_3_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightCurlyBracketKeyword_3_2()));\\n\\t\\tmatch_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftParenthesisKeyword_4_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightParenthesisKeyword_4_2()));\\n\\t\\tmatch_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftSquareBracketKeyword_5_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightSquareBracketKeyword_5_2()));\\n\\t\\t\\telse if(match_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q.equals(syntax))\\n\\t\\t\\t\\temit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\\n\\t\\t\\telse if(match_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q.equals(syntax))\\n\\t\\t\\t\\temit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\\n\\t\\t\\telse if(match_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q.equals(syntax))\\n\\t\\t\\t\\temit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\\n\\t/**\\n\\t * Syntax:\\n\\t * ('{' '}')?\\n\\t */\\n\\tprotected void emit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(EObject semanticObject, ISynNavigable transition, List nodes) {\\n\\t\\tacceptNodes(transition, nodes);\\n\\t}\\n\\t\\n\\t/**\\n\\t * Syntax:\\n\\t * ('(' ')')?\\n\\t */\\n\\tprotected void emit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List nodes) {\\n\\t\\tacceptNodes(transition, nodes);\\n\\t}\\n\\t\\n\\t/**\\n\\t * Syntax:\\n\\t * ('[' ']')?\\n\\t */\\n\\tprotected void emit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(EObject semanticObject, ISynNavigable transition, List nodes) {\\n\\t\\tacceptNodes(transition, nodes);\\n\\t}\\n\\t\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"EObject semanticObject\",\n \" ISynNavigable transition\",\n \" List nodes\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSyntacticSequencer.java\",\n \"implementation\": \"acceptNodes(transition, nodes);\",\n \"signature\": \"void emit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(EObject semanticObject, ISynNavigable transition, List nodes)\"\n },\n {\n \"arguments\": [\n \"EObject semanticObject\",\n \" ISynNavigable transition\",\n \" List nodes\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSyntacticSequencer.java\",\n \"implementation\": \"acceptNodes(transition, nodes);\",\n \"signature\": \"void emit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List nodes)\"\n },\n {\n \"arguments\": [\n \"EObject semanticObject\",\n \" ISynNavigable transition\",\n \" List nodes\"\n ],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/serializer/IntentSpecificationSyntacticSequencer.java\",\n \"implementation\": \"acceptNodes(transition, nodes);\",\n \"signature\": \"void emit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(EObject semanticObject, ISynNavigable transition, List nodes)\"\n }\n ],\n \"patch\": \"@@ -21,19 +21,13 @@ public class IntentSpecificationSyntacticSequencer extends AbstractSyntacticSequ\\n \\tprotected AbstractElementAlias match_Decomposition___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q;\\n \\tprotected AbstractElementAlias match_Decomposition___LeftParenthesisKeyword_5_0_RightParenthesisKeyword_5_2__q;\\n \\tprotected AbstractElementAlias match_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBracketKeyword_4_2__q;\\n-\\tprotected AbstractElementAlias match_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q;\\n-\\tprotected AbstractElementAlias match_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q;\\n-\\tprotected AbstractElementAlias match_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q;\\n \\t\\n \\t@Inject\\n \\tprotected void init(IGrammarAccess access) {\\n \\t\\tgrammarAccess = (IntentSpecificationGrammarAccess) access;\\n \\t\\tmatch_Decomposition___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getLeftCurlyBracketKeyword_3_0()), new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getRightCurlyBracketKeyword_3_2()));\\n \\t\\tmatch_Decomposition___LeftParenthesisKeyword_5_0_RightParenthesisKeyword_5_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getLeftParenthesisKeyword_5_0()), new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getRightParenthesisKeyword_5_2()));\\n \\t\\tmatch_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBracketKeyword_4_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getLeftSquareBracketKeyword_4_0()), new TokenAlias(false, false, grammarAccess.getDecompositionAccess().getRightSquareBracketKeyword_4_2()));\\n-\\t\\tmatch_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftCurlyBracketKeyword_3_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightCurlyBracketKeyword_3_2()));\\n-\\t\\tmatch_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftParenthesisKeyword_4_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightParenthesisKeyword_4_2()));\\n-\\t\\tmatch_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q = new GroupAlias(false, true, new TokenAlias(false, false, grammarAccess.getListItemAccess().getLeftSquareBracketKeyword_5_0()), new TokenAlias(false, false, grammarAccess.getListItemAccess().getRightSquareBracketKeyword_5_2()));\\n \\t}\\n \\t\\n \\t@Override\\n@@ -54,12 +48,6 @@ else if(match_Decomposition___LeftParenthesisKeyword_5_0_RightParenthesisKeyword\\n \\t\\t\\t\\temit_Decomposition___LeftParenthesisKeyword_5_0_RightParenthesisKeyword_5_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\\n \\t\\t\\telse if(match_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBracketKeyword_4_2__q.equals(syntax))\\n \\t\\t\\t\\temit_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBracketKeyword_4_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\\n-\\t\\t\\telse if(match_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q.equals(syntax))\\n-\\t\\t\\t\\temit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\\n-\\t\\t\\telse if(match_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q.equals(syntax))\\n-\\t\\t\\t\\temit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\\n-\\t\\t\\telse if(match_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q.equals(syntax))\\n-\\t\\t\\t\\temit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(semanticObject, getLastNavigableState(), syntaxNodes);\\n \\t\\t\\telse acceptNodes(getLastNavigableState(), syntaxNodes);\\n \\t\\t}\\n \\t}\\n@@ -88,28 +76,4 @@ protected void emit_Decomposition___LeftSquareBracketKeyword_4_0_RightSquareBrac\\n \\t\\tacceptNodes(transition, nodes);\\n \\t}\\n \\t\\n-\\t/**\\n-\\t * Syntax:\\n-\\t * ('{' '}')?\\n-\\t */\\n-\\tprotected void emit_ListItem___LeftCurlyBracketKeyword_3_0_RightCurlyBracketKeyword_3_2__q(EObject semanticObject, ISynNavigable transition, List nodes) {\\n-\\t\\tacceptNodes(transition, nodes);\\n-\\t}\\n-\\t\\n-\\t/**\\n-\\t * Syntax:\\n-\\t * ('(' ')')?\\n-\\t */\\n-\\tprotected void emit_ListItem___LeftParenthesisKeyword_4_0_RightParenthesisKeyword_4_2__q(EObject semanticObject, ISynNavigable transition, List nodes) {\\n-\\t\\tacceptNodes(transition, nodes);\\n-\\t}\\n-\\t\\n-\\t/**\\n-\\t * Syntax:\\n-\\t * ('[' ']')?\\n-\\t */\\n-\\tprotected void emit_ListItem___LeftSquareBracketKeyword_5_0_RightSquareBracketKeyword_5_2__q(EObject semanticObject, ISynNavigable transition, List nodes) {\\n-\\t\\tacceptNodes(transition, nodes);\\n-\\t}\\n-\\t\\n }\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fserializer%2FIntentSpecificationSyntacticSequencer.java\",\n \"sha\": \"796b54e95838c36cdf8372e691e7e66f9d7748a9\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 161,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fservices%2FIntentSpecificationGrammarAccess.java\",\n \"changes\": 392,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fservices%2FIntentSpecificationGrammarAccess.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 231,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"new_code\": \"\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n\\t\\t//\\t\\\"specification\\\" name=ID refinements+=Refinement+;\\n\\t\\t//\\\"specification\\\" name=ID refinements+=Refinement+\\n\\t\\t//name=ID\\n\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n\\t\\t//\\t\\\"refinement\\\" name=ID desc=STRING intents+=Intent+;\\n\\t\\t//\\\"refinement\\\" name=ID desc=STRING intents+=Intent+\\n\\t\\t//name=ID\\n\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n\\t\\t//\\ttype=IntentType name=ID desc=STRING decompositions+=Decomposition+;\\n\\t\\t//type=IntentType name=ID desc=STRING decompositions+=Decomposition+\\n\\t\\t//name=ID\\n\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n\\t\\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\\n\\t\\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\\n\\t\\tprivate final Keyword cTypeNameBasicKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\\n\\t\\tprivate final Keyword cTypeNamePurposeKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\\n\\t\\tprivate final Keyword cTypeNamePrinciplesKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\\n\\t\\tprivate final Keyword cTypeNameModelsKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\\n\\t\\tprivate final Keyword cTypeNameDesignKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\\n\\t\\tprivate final Keyword cTypeNameImplementationKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\\n\\t\\tprivate final Keyword cTypeNameOperationKeyword_0_6 = (Keyword)cTypeNameAlternatives_0.eContents().get(6);\\n\\t\\t//\\ttypeName=(\\\"basic\\\" | \\\"purpose\\\" | \\\"principles\\\" | \\\"models\\\" | \\\"design\\\" | \\\"implementation\\\" | \\\"operation\\\");\\n\\t\\t//typeName=(\\\"basic\\\" | \\\"purpose\\\" | \\\"principles\\\" | \\\"models\\\" | \\\"design\\\" | \\\"implementation\\\" | \\\"operation\\\")\\n\\t\\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\\n\\n\\t\\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\\n\\t\\tpublic Keyword getTypeNameBasicKeyword_0_0() { return cTypeNameBasicKeyword_0_0; }\\n\\t\\tpublic Keyword getTypeNamePurposeKeyword_0_1() { return cTypeNamePurposeKeyword_0_1; }\\n\\t\\tpublic Keyword getTypeNamePrinciplesKeyword_0_2() { return cTypeNamePrinciplesKeyword_0_2; }\\n\\t\\tpublic Keyword getTypeNameModelsKeyword_0_3() { return cTypeNameModelsKeyword_0_3; }\\n\\t\\tpublic Keyword getTypeNameDesignKeyword_0_4() { return cTypeNameDesignKeyword_0_4; }\\n\\t\\tpublic Keyword getTypeNameImplementationKeyword_0_5() { return cTypeNameImplementationKeyword_0_5; }\\n\\t\\tpublic Keyword getTypeNameOperationKeyword_0_6() { return cTypeNameOperationKeyword_0_6; }\\n\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n\\t\\t//\\ttype=DecompositionType name=ID desc=STRING (\\\"{\\\" documents+=Document* \\\"}\\\")? (\\\"[\\\" models+=ModelItem* \\\"]\\\")? (\\\"(\\\"\\n\\t\\t//type=DecompositionType name=ID desc=STRING (\\\"{\\\" documents+=Document* \\\"}\\\")? (\\\"[\\\" models+=ModelItem* \\\"]\\\")? (\\\"(\\\"\\n\\t\\t//name=ID\\n\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n\\t\\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\\n\\t\\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\\n\\t\\tprivate final Keyword cTypeNameEnvironmentKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\\n\\t\\tprivate final Keyword cTypeNameOperatorKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\\n\\t\\tprivate final Keyword cTypeNameSystemKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\\n\\t\\tprivate final Keyword cTypeNameVerificationKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\\n\\t\\t//\\ttypeName=(\\\"environment\\\" | \\\"operator\\\" | \\\"system\\\" | \\\"verification\\\");\\n\\t\\t//typeName=(\\\"environment\\\" | \\\"operator\\\" | \\\"system\\\" | \\\"verification\\\")\\n\\t\\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\\n\\n\\t\\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\\n\\t\\tpublic Keyword getTypeNameEnvironmentKeyword_0_0() { return cTypeNameEnvironmentKeyword_0_0; }\\n\\t\\tpublic Keyword getTypeNameOperatorKeyword_0_1() { return cTypeNameOperatorKeyword_0_1; }\\n\\t\\tpublic Keyword getTypeNameSystemKeyword_0_2() { return cTypeNameSystemKeyword_0_2; }\\n\\t\\tpublic Keyword getTypeNameVerificationKeyword_0_3() { return cTypeNameVerificationKeyword_0_3; }\\n\\t\\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\\n\\t\\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\\n\\t\\tprivate final Keyword cTypeNameConditionKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\\n\\t\\tprivate final Keyword cTypeNameFigureKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\\n\\t\\tprivate final Keyword cTypeNameBreakKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\\n\\t\\tprivate final Keyword cTypeNameModelKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\\n\\t\\tprivate final Keyword cTypeNameParagraphKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\\n\\t\\tprivate final Keyword cTypeNameSectionKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\\n\\t\\tprivate final Keyword cTypeNameTableKeyword_0_6 = (Keyword)cTypeNameAlternatives_0.eContents().get(6);\\n\\t\\t//\\ttypeName=(\\\"condition\\\" | \\\"figure\\\" | \\\"break\\\" | \\\"model\\\" | \\\"paragraph\\\" | \\\"section\\\" | \\\"table\\\");\\n\\t\\t//typeName=(\\\"condition\\\" | \\\"figure\\\" | \\\"break\\\" | \\\"model\\\" | \\\"paragraph\\\" | \\\"section\\\" | \\\"table\\\")\\n\\t\\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\\n\\n\\t\\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\\n\\t\\tpublic Keyword getTypeNameConditionKeyword_0_0() { return cTypeNameConditionKeyword_0_0; }\\n\\t\\tpublic Keyword getTypeNameFigureKeyword_0_1() { return cTypeNameFigureKeyword_0_1; }\\n\\t\\tpublic Keyword getTypeNameBreakKeyword_0_2() { return cTypeNameBreakKeyword_0_2; }\\n\\t\\tpublic Keyword getTypeNameModelKeyword_0_3() { return cTypeNameModelKeyword_0_3; }\\n\\t\\tpublic Keyword getTypeNameParagraphKeyword_0_4() { return cTypeNameParagraphKeyword_0_4; }\\n\\t\\tpublic Keyword getTypeNameSectionKeyword_0_5() { return cTypeNameSectionKeyword_0_5; }\\n\\t\\tpublic Keyword getTypeNameTableKeyword_0_6() { return cTypeNameTableKeyword_0_6; }\\n\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n\\t\\t//\\ttype=DocItemType name=ID ref=STRING \\\";\\\";\\n\\t\\t//type=DocItemType name=ID ref=STRING \\\";\\\"\\n\\t\\t//name=ID\\n\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n\\t\\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\\n\\t\\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\\n\\t\\tprivate final Keyword cTypeNameOutputKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\\n\\t\\tprivate final Keyword cTypeNameModeKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\\n\\t\\tprivate final Keyword cTypeNameStateKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\\n\\t\\tprivate final Keyword cTypeNameMacroKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\\n\\t\\tprivate final Keyword cTypeNameFunctionKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\\n\\t\\tprivate final Keyword cTypeNameInputKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\\n\\t\\t//\\ttypeName=(\\\"output\\\" | \\\"mode\\\" | \\\"state\\\" | \\\"macro\\\" | \\\"function\\\" | \\\"input\\\");\\n\\t\\t//typeName=(\\\"output\\\" | \\\"mode\\\" | \\\"state\\\" | \\\"macro\\\" | \\\"function\\\" | \\\"input\\\")\\n\\t\\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\\n\\n\\t\\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\\n\\t\\tpublic Keyword getTypeNameOutputKeyword_0_0() { return cTypeNameOutputKeyword_0_0; }\\n\\t\\tpublic Keyword getTypeNameModeKeyword_0_1() { return cTypeNameModeKeyword_0_1; }\\n\\t\\tpublic Keyword getTypeNameStateKeyword_0_2() { return cTypeNameStateKeyword_0_2; }\\n\\t\\tpublic Keyword getTypeNameMacroKeyword_0_3() { return cTypeNameMacroKeyword_0_3; }\\n\\t\\tpublic Keyword getTypeNameFunctionKeyword_0_4() { return cTypeNameFunctionKeyword_0_4; }\\n\\t\\tpublic Keyword getTypeNameInputKeyword_0_5() { return cTypeNameInputKeyword_0_5; }\\n\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n\\t\\t//\\ttype=ModelType name=ID desc=STRING \\\";\\\";\\n\\t\\t//type=ModelType name=ID desc=STRING \\\";\\\"\\n\\t\\t//name=ID\\n\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n\\t\\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\\n\\t\\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\\n\\t\\tprivate final Keyword cTypeNameRequirementKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\\n\\t\\tprivate final Keyword cTypeNameGoalKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\\n\\t\\tprivate final Keyword cTypeNameHazardKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\\n\\t\\tprivate final Keyword cTypeNameConstraintKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\\n\\t\\t//\\ttypeName=(\\\"requirement\\\" | \\\"goal\\\" | \\\"hazard\\\" | \\\"constraint\\\");\\n\\t\\t//typeName=(\\\"requirement\\\" | \\\"goal\\\" | \\\"hazard\\\" | \\\"constraint\\\")\\n\\t\\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\\n\\n\\t\\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\\n\\t\\tpublic Keyword getTypeNameRequirementKeyword_0_0() { return cTypeNameRequirementKeyword_0_0; }\\n\\t\\tpublic Keyword getTypeNameGoalKeyword_0_1() { return cTypeNameGoalKeyword_0_1; }\\n\\t\\tpublic Keyword getTypeNameHazardKeyword_0_2() { return cTypeNameHazardKeyword_0_2; }\\n\\t\\tpublic Keyword getTypeNameConstraintKeyword_0_3() { return cTypeNameConstraintKeyword_0_3; }\\n\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n\\t\\t//\\ttype=ListItemType name=ID desc=STRING (\\\"{\\\" docReferences+=[DocItem]+ \\\"}\\\")? (\\\"(\\\" itemReferences+=[ListItem]+ \\\")\\\")? (\\\"[\\\"\\n\\t\\t//\\tmodelReferences+=[ModelItem]+ \\\"]\\\")? \\\";\\\";\\n\\t\\t//type=ListItemType name=ID desc=STRING (\\\"{\\\" docReferences+=[DocItem]+ \\\"}\\\")? (\\\"(\\\" itemReferences+=[ListItem]+ \\\")\\\")? (\\\"[\\\"\\n\\t\\t//modelReferences+=[ModelItem]+ \\\"]\\\")? \\\";\\\"\\n\\t\\t//name=ID\\n\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n\\t\\t//(\\\"{\\\" docReferences+=[DocItem]+ \\\"}\\\")?\\n\\t\\t//docReferences+=[DocItem]+\\n\\t\\t//(\\\"(\\\" itemReferences+=[ListItem]+ \\\")\\\")?\\n\\t\\t//itemReferences+=[ListItem]+\\n\\t\\t//(\\\"[\\\" modelReferences+=[ModelItem]+ \\\"]\\\")?\\n\\t\\t//modelReferences+=[ModelItem]+\\n\\t//\\t\\\"specification\\\" name=ID refinements+=Refinement+;\\n\\t//\\t\\\"refinement\\\" name=ID desc=STRING intents+=Intent+;\\n\\t//\\ttype=IntentType name=ID desc=STRING decompositions+=Decomposition+;\\n\\t//\\ttypeName=(\\\"basic\\\" | \\\"purpose\\\" | \\\"principles\\\" | \\\"models\\\" | \\\"design\\\" | \\\"implementation\\\" | \\\"operation\\\");\\n\\t//\\ttype=DecompositionType name=ID desc=STRING (\\\"{\\\" documents+=Document* \\\"}\\\")? (\\\"[\\\" models+=ModelItem* \\\"]\\\")? (\\\"(\\\"\\n\\t//\\ttypeName=(\\\"environment\\\" | \\\"operator\\\" | \\\"system\\\" | \\\"verification\\\");\\n\\t//\\ttypeName=(\\\"condition\\\" | \\\"figure\\\" | \\\"break\\\" | \\\"model\\\" | \\\"paragraph\\\" | \\\"section\\\" | \\\"table\\\");\\n\\t//\\ttype=DocItemType name=ID ref=STRING \\\";\\\";\\n\\t//\\ttypeName=(\\\"output\\\" | \\\"mode\\\" | \\\"state\\\" | \\\"macro\\\" | \\\"function\\\" | \\\"input\\\");\\n\\t//\\ttype=ModelType name=ID desc=STRING \\\";\\\";\\n\\t//\\ttypeName=(\\\"requirement\\\" | \\\"goal\\\" | \\\"hazard\\\" | \\\"constraint\\\");\\n\\t//\\ttype=ListItemType name=ID desc=STRING (\\\"{\\\" docReferences+=[DocItem]+ \\\"}\\\")? (\\\"(\\\" itemReferences+=[ListItem]+ \\\")\\\")? (\\\"[\\\"\\n\\t//\\tmodelReferences+=[ModelItem]+ \\\"]\\\")? \\\";\\\";\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameAssignment_1;\",\n \"signature\": \"Assignment getNameAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameAssignment_1;\",\n \"signature\": \"Assignment getNameAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameAssignment_1;\",\n \"signature\": \"Assignment getNameAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameAssignment;\",\n \"signature\": \"Assignment getTypeNameAssignment()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameAlternatives_0;\",\n \"signature\": \"Alternatives getTypeNameAlternatives_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameBasicKeyword_0_0;\",\n \"signature\": \"Keyword getTypeNameBasicKeyword_0_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNamePurposeKeyword_0_1;\",\n \"signature\": \"Keyword getTypeNamePurposeKeyword_0_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNamePrinciplesKeyword_0_2;\",\n \"signature\": \"Keyword getTypeNamePrinciplesKeyword_0_2()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameModelsKeyword_0_3;\",\n \"signature\": \"Keyword getTypeNameModelsKeyword_0_3()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameDesignKeyword_0_4;\",\n \"signature\": \"Keyword getTypeNameDesignKeyword_0_4()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameImplementationKeyword_0_5;\",\n \"signature\": \"Keyword getTypeNameImplementationKeyword_0_5()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameOperationKeyword_0_6;\",\n \"signature\": \"Keyword getTypeNameOperationKeyword_0_6()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameAssignment_1;\",\n \"signature\": \"Assignment getNameAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameAssignment;\",\n \"signature\": \"Assignment getTypeNameAssignment()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameAlternatives_0;\",\n \"signature\": \"Alternatives getTypeNameAlternatives_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameEnvironmentKeyword_0_0;\",\n \"signature\": \"Keyword getTypeNameEnvironmentKeyword_0_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameOperatorKeyword_0_1;\",\n \"signature\": \"Keyword getTypeNameOperatorKeyword_0_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameSystemKeyword_0_2;\",\n \"signature\": \"Keyword getTypeNameSystemKeyword_0_2()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameVerificationKeyword_0_3;\",\n \"signature\": \"Keyword getTypeNameVerificationKeyword_0_3()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameAssignment;\",\n \"signature\": \"Assignment getTypeNameAssignment()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameAlternatives_0;\",\n \"signature\": \"Alternatives getTypeNameAlternatives_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameConditionKeyword_0_0;\",\n \"signature\": \"Keyword getTypeNameConditionKeyword_0_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameFigureKeyword_0_1;\",\n \"signature\": \"Keyword getTypeNameFigureKeyword_0_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameBreakKeyword_0_2;\",\n \"signature\": \"Keyword getTypeNameBreakKeyword_0_2()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameModelKeyword_0_3;\",\n \"signature\": \"Keyword getTypeNameModelKeyword_0_3()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameParagraphKeyword_0_4;\",\n \"signature\": \"Keyword getTypeNameParagraphKeyword_0_4()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameSectionKeyword_0_5;\",\n \"signature\": \"Keyword getTypeNameSectionKeyword_0_5()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameTableKeyword_0_6;\",\n \"signature\": \"Keyword getTypeNameTableKeyword_0_6()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameAssignment_1;\",\n \"signature\": \"Assignment getNameAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameAssignment;\",\n \"signature\": \"Assignment getTypeNameAssignment()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameAlternatives_0;\",\n \"signature\": \"Alternatives getTypeNameAlternatives_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameOutputKeyword_0_0;\",\n \"signature\": \"Keyword getTypeNameOutputKeyword_0_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameModeKeyword_0_1;\",\n \"signature\": \"Keyword getTypeNameModeKeyword_0_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameStateKeyword_0_2;\",\n \"signature\": \"Keyword getTypeNameStateKeyword_0_2()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameMacroKeyword_0_3;\",\n \"signature\": \"Keyword getTypeNameMacroKeyword_0_3()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameFunctionKeyword_0_4;\",\n \"signature\": \"Keyword getTypeNameFunctionKeyword_0_4()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameInputKeyword_0_5;\",\n \"signature\": \"Keyword getTypeNameInputKeyword_0_5()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameAssignment_1;\",\n \"signature\": \"Assignment getNameAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameAssignment;\",\n \"signature\": \"Assignment getTypeNameAssignment()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameAlternatives_0;\",\n \"signature\": \"Alternatives getTypeNameAlternatives_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameRequirementKeyword_0_0;\",\n \"signature\": \"Keyword getTypeNameRequirementKeyword_0_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameGoalKeyword_0_1;\",\n \"signature\": \"Keyword getTypeNameGoalKeyword_0_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameHazardKeyword_0_2;\",\n \"signature\": \"Keyword getTypeNameHazardKeyword_0_2()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTypeNameConstraintKeyword_0_3;\",\n \"signature\": \"Keyword getTypeNameConstraintKeyword_0_3()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameAssignment_1;\",\n \"signature\": \"Assignment getNameAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\"\n }\n ],\n \"old_code\": \"\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n\\t\\t//\\t\\\"specification\\\" id=ID refinements+=Refinement+;\\n\\t\\t//\\\"specification\\\" id=ID refinements+=Refinement+\\n\\t\\t//id=ID\\n\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n\\t\\t//\\t\\\"refinement\\\" id=ID desc=STRING intents+=Intent+;\\n\\t\\t//\\\"refinement\\\" id=ID desc=STRING intents+=Intent+\\n\\t\\t//id=ID\\n\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n\\t\\t//\\ttype=IntentType id=ID desc=STRING decompositions+=Decomposition+;\\n\\t\\t//type=IntentType id=ID desc=STRING decompositions+=Decomposition+\\n\\t\\t//id=ID\\n\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n\\t\\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\\n\\t\\tprivate final Keyword cBasicKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\\n\\t\\tprivate final Keyword cPurposeKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\\n\\t\\tprivate final Keyword cPrinciplesKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\\n\\t\\tprivate final Keyword cModelsKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\\n\\t\\tprivate final Keyword cDesignKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\\n\\t\\tprivate final Keyword cImplementationKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\\n\\t\\tprivate final Keyword cOperationKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\\n\\t\\t//\\t\\\"basic\\\" | \\\"purpose\\\" | \\\"principles\\\" | \\\"models\\\" | \\\"design\\\" | \\\"implementation\\\" | \\\"operation\\\";\\n\\t\\tpublic Alternatives getAlternatives() { return cAlternatives; }\\n\\t\\tpublic Keyword getBasicKeyword_0() { return cBasicKeyword_0; }\\n\\t\\tpublic Keyword getPurposeKeyword_1() { return cPurposeKeyword_1; }\\n\\t\\tpublic Keyword getPrinciplesKeyword_2() { return cPrinciplesKeyword_2; }\\n\\t\\tpublic Keyword getModelsKeyword_3() { return cModelsKeyword_3; }\\n\\t\\tpublic Keyword getDesignKeyword_4() { return cDesignKeyword_4; }\\n\\t\\tpublic Keyword getImplementationKeyword_5() { return cImplementationKeyword_5; }\\n\\t\\tpublic Keyword getOperationKeyword_6() { return cOperationKeyword_6; }\\n\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n\\t\\t//\\ttype=DecompositionType id=ID desc=STRING (\\\"{\\\" documents+=Document* \\\"}\\\")? (\\\"[\\\" models+=ModelItem* \\\"]\\\")? (\\\"(\\\"\\n\\t\\t//type=DecompositionType id=ID desc=STRING (\\\"{\\\" documents+=Document* \\\"}\\\")? (\\\"[\\\" models+=ModelItem* \\\"]\\\")? (\\\"(\\\"\\n\\t\\t//id=ID\\n\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n\\t\\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\\n\\t\\tprivate final Keyword cEnvironmentKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\\n\\t\\tprivate final Keyword cOperatorKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\\n\\t\\tprivate final Keyword cSystemKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\\n\\t\\tprivate final Keyword cVerificationKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\\n\\t\\t//\\t\\\"environment\\\" | \\\"operator\\\" | \\\"system\\\" | \\\"verification\\\";\\n\\t\\tpublic Alternatives getAlternatives() { return cAlternatives; }\\n\\t\\tpublic Keyword getEnvironmentKeyword_0() { return cEnvironmentKeyword_0; }\\n\\t\\tpublic Keyword getOperatorKeyword_1() { return cOperatorKeyword_1; }\\n\\t\\tpublic Keyword getSystemKeyword_2() { return cSystemKeyword_2; }\\n\\t\\tpublic Keyword getVerificationKeyword_3() { return cVerificationKeyword_3; }\\n\\t\\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\\n\\t\\tprivate final Keyword cConditionKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\\n\\t\\tprivate final Keyword cFigureKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\\n\\t\\tprivate final Keyword cBreakKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\\n\\t\\tprivate final Keyword cModelKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\\n\\t\\tprivate final Keyword cParagraphKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\\n\\t\\tprivate final Keyword cSectionKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\\n\\t\\tprivate final Keyword cTableKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\\n\\t\\t//\\t\\\"condition\\\" | \\\"figure\\\" | \\\"break\\\" | \\\"model\\\" | \\\"paragraph\\\" | \\\"section\\\" | \\\"table\\\";\\n\\t\\tpublic Alternatives getAlternatives() { return cAlternatives; }\\n\\t\\tpublic Keyword getConditionKeyword_0() { return cConditionKeyword_0; }\\n\\t\\tpublic Keyword getFigureKeyword_1() { return cFigureKeyword_1; }\\n\\t\\tpublic Keyword getBreakKeyword_2() { return cBreakKeyword_2; }\\n\\t\\tpublic Keyword getModelKeyword_3() { return cModelKeyword_3; }\\n\\t\\tpublic Keyword getParagraphKeyword_4() { return cParagraphKeyword_4; }\\n\\t\\tpublic Keyword getSectionKeyword_5() { return cSectionKeyword_5; }\\n\\t\\tpublic Keyword getTableKeyword_6() { return cTableKeyword_6; }\\n\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n\\t\\t//\\ttype=DocItemType id=ID ref=STRING \\\";\\\";\\n\\t\\t//type=DocItemType id=ID ref=STRING \\\";\\\"\\n\\t\\t//id=ID\\n\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n\\t\\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\\n\\t\\tprivate final Keyword cOutputKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\\n\\t\\tprivate final Keyword cModeKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\\n\\t\\tprivate final Keyword cStateKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\\n\\t\\tprivate final Keyword cMacroKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\\n\\t\\tprivate final Keyword cFunctionKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\\n\\t\\tprivate final Keyword cInputKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\\n\\t\\t//\\t\\\"output\\\" | \\\"mode\\\" | \\\"state\\\" | \\\"macro\\\" | \\\"function\\\" | \\\"input\\\";\\n\\t\\tpublic Alternatives getAlternatives() { return cAlternatives; }\\n\\t\\tpublic Keyword getOutputKeyword_0() { return cOutputKeyword_0; }\\n\\t\\tpublic Keyword getModeKeyword_1() { return cModeKeyword_1; }\\n\\t\\tpublic Keyword getStateKeyword_2() { return cStateKeyword_2; }\\n\\t\\tpublic Keyword getMacroKeyword_3() { return cMacroKeyword_3; }\\n\\t\\tpublic Keyword getFunctionKeyword_4() { return cFunctionKeyword_4; }\\n\\t\\tpublic Keyword getInputKeyword_5() { return cInputKeyword_5; }\\n\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n\\t\\t//\\ttype=ModelType id=ID desc=STRING \\\";\\\";\\n\\t\\t//type=ModelType id=ID desc=STRING \\\";\\\"\\n\\t\\t//id=ID\\n\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n\\t\\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\\n\\t\\tprivate final Keyword cRequirementKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\\n\\t\\tprivate final Keyword cGoalKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\\n\\t\\tprivate final Keyword cHazardKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\\n\\t\\tprivate final Keyword cConstraintKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\\n\\t\\t//\\t\\\"requirement\\\" | \\\"goal\\\" | \\\"hazard\\\" | \\\"constraint\\\";\\n\\t\\tpublic Alternatives getAlternatives() { return cAlternatives; }\\n\\t\\tpublic Keyword getRequirementKeyword_0() { return cRequirementKeyword_0; }\\n\\t\\tpublic Keyword getGoalKeyword_1() { return cGoalKeyword_1; }\\n\\t\\tpublic Keyword getHazardKeyword_2() { return cHazardKeyword_2; }\\n\\t\\tpublic Keyword getConstraintKeyword_3() { return cConstraintKeyword_3; }\\n\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n\\t\\t// * / / * \\n\\t\\t//Level0:\\n\\t\\t//\\t{Level0}\\n\\t\\t//\\t'{'\\n\\t\\t//\\t\\t('Program Plan' pmp=Document)?\\n\\t\\t//\\t\\t('Safety Plan' safetyPlan=Document)?\\n\\t\\t//\\t\\t('Accident Definition' accidentDefinition=Document)?\\n\\t\\t//\\t\\t('Safety Policy' safetyPolicy=Document)?\\n\\t\\t//\\t'}'\\n\\t\\t//;\\n\\t\\t//\\n\\t\\t//Level1:\\n\\t\\t//\\t{Level1}\\n\\t\\t//\\t'{'\\n\\t\\t//\\t\\t('Introduction' introduction=Document)?\\n\\t\\t//\\t\\t('Historical' historical=Document)?\\n\\t\\t//\\t\\t('Environment' environment=Document)?\\n\\t\\t//\\t\\t('Goals' '(' goals+=GoalItem* ')' )?\\n\\t\\t//\\t\\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\\n\\t\\t//\\t\\t('System Limitations' limitations=Document)?\\n\\t\\t//\\t\\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\\n\\t\\t//\\t\\t('Hazard Analysis' hazardAnalysis=Document)?\\n\\t\\t//\\t\\t('Hazard List' '(' hazardList+=HazardItem* ')')?\\n\\t\\t//\\t\\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\\n\\t\\t//\\t\\t('Verification and Validation' verification=Document)?\\n\\t\\t//\\t'}'\\n\\t\\t//;\\n\\t\\t//\\n\\t\\t//\\n\\t\\t//Level2:\\n\\t\\t//\\tdesc=STRING\\n\\t\\t//\\t'{'\\n\\t\\t//\\t'}'\\t\\n\\t\\t//;\\n\\t\\t//\\n\\t\\t//Level3:\\n\\t\\t//\\tdesc=STRING\\n\\t\\t//\\t'{'\\n\\t\\t//\\t\\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\\n\\t\\t//\\t\\t('User Model' '(' userModels+=ModelItem* ')' )?\\n\\t\\t//\\t\\t('Verification and Validation' verification=Document )?\\n\\t\\t//\\t'}'\\n\\t\\t//;\\n\\t\\t//\\n\\t\\t//\\n\\t\\t//\\ttype=ListItemType id=ID desc=STRING (\\\"{\\\" docReferences+=[DocItem]* \\\"}\\\")? (\\\"(\\\" itemReferences+=[ListItem]* \\\")\\\")? (\\\"[\\\"\\n\\t\\t//\\tmodelReferences+=[ModelItem]* \\\"]\\\")? \\\";\\\";\\n\\t\\t//type=ListItemType id=ID desc=STRING (\\\"{\\\" docReferences+=[DocItem]* \\\"}\\\")? (\\\"(\\\" itemReferences+=[ListItem]* \\\")\\\")? (\\\"[\\\"\\n\\t\\t//modelReferences+=[ModelItem]* \\\"]\\\")? \\\";\\\"\\n\\t\\t//id=ID\\n\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n\\t\\t//(\\\"{\\\" docReferences+=[DocItem]* \\\"}\\\")?\\n\\t\\t//docReferences+=[DocItem]*\\n\\t\\t//(\\\"(\\\" itemReferences+=[ListItem]* \\\")\\\")?\\n\\t\\t//itemReferences+=[ListItem]*\\n\\t\\t//(\\\"[\\\" modelReferences+=[ModelItem]* \\\"]\\\")?\\n\\t\\t//modelReferences+=[ModelItem]*\\n\\t//\\t\\\"specification\\\" id=ID refinements+=Refinement+;\\n\\t//\\t\\\"refinement\\\" id=ID desc=STRING intents+=Intent+;\\n\\t//\\ttype=IntentType id=ID desc=STRING decompositions+=Decomposition+;\\n\\t//\\t\\\"basic\\\" | \\\"purpose\\\" | \\\"principles\\\" | \\\"models\\\" | \\\"design\\\" | \\\"implementation\\\" | \\\"operation\\\";\\n\\t//\\ttype=DecompositionType id=ID desc=STRING (\\\"{\\\" documents+=Document* \\\"}\\\")? (\\\"[\\\" models+=ModelItem* \\\"]\\\")? (\\\"(\\\"\\n\\t//\\t\\\"environment\\\" | \\\"operator\\\" | \\\"system\\\" | \\\"verification\\\";\\n\\t//\\t\\\"condition\\\" | \\\"figure\\\" | \\\"break\\\" | \\\"model\\\" | \\\"paragraph\\\" | \\\"section\\\" | \\\"table\\\";\\n\\t//\\ttype=DocItemType id=ID ref=STRING \\\";\\\";\\n\\t//\\t\\\"output\\\" | \\\"mode\\\" | \\\"state\\\" | \\\"macro\\\" | \\\"function\\\" | \\\"input\\\";\\n\\t//\\ttype=ModelType id=ID desc=STRING \\\";\\\";\\n\\t//\\t\\\"requirement\\\" | \\\"goal\\\" | \\\"hazard\\\" | \\\"constraint\\\";\\n\\t// * / / * \\n\\t//Level0:\\n\\t//\\t{Level0}\\n\\t//\\t'{'\\n\\t//\\t\\t('Program Plan' pmp=Document)?\\n\\t//\\t\\t('Safety Plan' safetyPlan=Document)?\\n\\t//\\t\\t('Accident Definition' accidentDefinition=Document)?\\n\\t//\\t\\t('Safety Policy' safetyPolicy=Document)?\\n\\t//\\t'}'\\n\\t//;\\n\\t//\\n\\t//Level1:\\n\\t//\\t{Level1}\\n\\t//\\t'{'\\n\\t//\\t\\t('Introduction' introduction=Document)?\\n\\t//\\t\\t('Historical' historical=Document)?\\n\\t//\\t\\t('Environment' environment=Document)?\\n\\t//\\t\\t('Goals' '(' goals+=GoalItem* ')' )?\\n\\t//\\t\\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\\n\\t//\\t\\t('System Limitations' limitations=Document)?\\n\\t//\\t\\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\\n\\t//\\t\\t('Hazard Analysis' hazardAnalysis=Document)?\\n\\t//\\t\\t('Hazard List' '(' hazardList+=HazardItem* ')')?\\n\\t//\\t\\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\\n\\t//\\t\\t('Verification and Validation' verification=Document)?\\n\\t//\\t'}'\\n\\t//;\\n\\t//\\n\\t//\\n\\t//Level2:\\n\\t//\\tdesc=STRING\\n\\t//\\t'{'\\n\\t//\\t'}'\\t\\n\\t//;\\n\\t//\\n\\t//Level3:\\n\\t//\\tdesc=STRING\\n\\t//\\t'{'\\n\\t//\\t\\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\\n\\t//\\t\\t('User Model' '(' userModels+=ModelItem* ')' )?\\n\\t//\\t\\t('Verification and Validation' verification=Document )?\\n\\t//\\t'}'\\n\\t//;\\n\\t//\\n\\t//\\n\\t//\\ttype=ListItemType id=ID desc=STRING (\\\"{\\\" docReferences+=[DocItem]* \\\"}\\\")? (\\\"(\\\" itemReferences+=[ListItem]* \\\")\\\")? (\\\"[\\\"\\n\\t//\\tmodelReferences+=[ModelItem]* \\\"]\\\")? \\\";\\\";\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdAssignment_1;\",\n \"signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdAssignment_1;\",\n \"signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdAssignment_1;\",\n \"signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cAlternatives;\",\n \"signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cBasicKeyword_0;\",\n \"signature\": \"Keyword getBasicKeyword_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cPurposeKeyword_1;\",\n \"signature\": \"Keyword getPurposeKeyword_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cPrinciplesKeyword_2;\",\n \"signature\": \"Keyword getPrinciplesKeyword_2()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cModelsKeyword_3;\",\n \"signature\": \"Keyword getModelsKeyword_3()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cDesignKeyword_4;\",\n \"signature\": \"Keyword getDesignKeyword_4()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cImplementationKeyword_5;\",\n \"signature\": \"Keyword getImplementationKeyword_5()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cOperationKeyword_6;\",\n \"signature\": \"Keyword getOperationKeyword_6()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdAssignment_1;\",\n \"signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cAlternatives;\",\n \"signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cEnvironmentKeyword_0;\",\n \"signature\": \"Keyword getEnvironmentKeyword_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cOperatorKeyword_1;\",\n \"signature\": \"Keyword getOperatorKeyword_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cSystemKeyword_2;\",\n \"signature\": \"Keyword getSystemKeyword_2()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cVerificationKeyword_3;\",\n \"signature\": \"Keyword getVerificationKeyword_3()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cAlternatives;\",\n \"signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cConditionKeyword_0;\",\n \"signature\": \"Keyword getConditionKeyword_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cFigureKeyword_1;\",\n \"signature\": \"Keyword getFigureKeyword_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cBreakKeyword_2;\",\n \"signature\": \"Keyword getBreakKeyword_2()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cModelKeyword_3;\",\n \"signature\": \"Keyword getModelKeyword_3()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cParagraphKeyword_4;\",\n \"signature\": \"Keyword getParagraphKeyword_4()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cSectionKeyword_5;\",\n \"signature\": \"Keyword getSectionKeyword_5()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cTableKeyword_6;\",\n \"signature\": \"Keyword getTableKeyword_6()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdAssignment_1;\",\n \"signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cAlternatives;\",\n \"signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cOutputKeyword_0;\",\n \"signature\": \"Keyword getOutputKeyword_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cModeKeyword_1;\",\n \"signature\": \"Keyword getModeKeyword_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cStateKeyword_2;\",\n \"signature\": \"Keyword getStateKeyword_2()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cMacroKeyword_3;\",\n \"signature\": \"Keyword getMacroKeyword_3()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cFunctionKeyword_4;\",\n \"signature\": \"Keyword getFunctionKeyword_4()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cInputKeyword_5;\",\n \"signature\": \"Keyword getInputKeyword_5()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdAssignment_1;\",\n \"signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cAlternatives;\",\n \"signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cRequirementKeyword_0;\",\n \"signature\": \"Keyword getRequirementKeyword_0()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cGoalKeyword_1;\",\n \"signature\": \"Keyword getGoalKeyword_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cHazardKeyword_2;\",\n \"signature\": \"Keyword getHazardKeyword_2()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cConstraintKeyword_3;\",\n \"signature\": \"Keyword getConstraintKeyword_3()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdAssignment_1;\",\n \"signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/services/IntentSpecificationGrammarAccess.java\",\n \"implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n }\n ],\n \"patch\": \"@@ -22,28 +22,28 @@ public class SpecificationElements extends AbstractParserRuleElementFinder {\\n \\t\\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \\\"Specification\\\");\\n \\t\\tprivate final Group cGroup = (Group)rule.eContents().get(1);\\n \\t\\tprivate final Keyword cSpecificationKeyword_0 = (Keyword)cGroup.eContents().get(0);\\n-\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n-\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n+\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n+\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n \\t\\tprivate final Assignment cRefinementsAssignment_2 = (Assignment)cGroup.eContents().get(2);\\n \\t\\tprivate final RuleCall cRefinementsRefinementParserRuleCall_2_0 = (RuleCall)cRefinementsAssignment_2.eContents().get(0);\\n \\t\\t\\n \\t\\t/// *\\n \\t\\t// * An intent specification consists of one or more refinements.\\n \\t\\t// * / Specification:\\n-\\t\\t//\\t\\\"specification\\\" id=ID refinements+=Refinement+;\\n+\\t\\t//\\t\\\"specification\\\" name=ID refinements+=Refinement+;\\n \\t\\tpublic ParserRule getRule() { return rule; }\\n \\n-\\t\\t//\\\"specification\\\" id=ID refinements+=Refinement+\\n+\\t\\t//\\\"specification\\\" name=ID refinements+=Refinement+\\n \\t\\tpublic Group getGroup() { return cGroup; }\\n \\n \\t\\t//\\\"specification\\\"\\n \\t\\tpublic Keyword getSpecificationKeyword_0() { return cSpecificationKeyword_0; }\\n \\n-\\t\\t//id=ID\\n-\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n+\\t\\t//name=ID\\n+\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n \\n \\t\\t//ID\\n-\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n+\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n \\n \\t\\t//refinements+=Refinement+\\n \\t\\tpublic Assignment getRefinementsAssignment_2() { return cRefinementsAssignment_2; }\\n@@ -56,8 +56,8 @@ public class RefinementElements extends AbstractParserRuleElementFinder {\\n \\t\\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \\\"Refinement\\\");\\n \\t\\tprivate final Group cGroup = (Group)rule.eContents().get(1);\\n \\t\\tprivate final Keyword cRefinementKeyword_0 = (Keyword)cGroup.eContents().get(0);\\n-\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n-\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n+\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n+\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n \\t\\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\\n \\t\\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\\n \\t\\tprivate final Assignment cIntentsAssignment_3 = (Assignment)cGroup.eContents().get(3);\\n@@ -66,20 +66,20 @@ public class RefinementElements extends AbstractParserRuleElementFinder {\\n \\t\\t/// *\\n \\t\\t// * A refinement has no type and consists of one or more intents.\\n \\t\\t// * / Refinement:\\n-\\t\\t//\\t\\\"refinement\\\" id=ID desc=STRING intents+=Intent+;\\n+\\t\\t//\\t\\\"refinement\\\" name=ID desc=STRING intents+=Intent+;\\n \\t\\tpublic ParserRule getRule() { return rule; }\\n \\n-\\t\\t//\\\"refinement\\\" id=ID desc=STRING intents+=Intent+\\n+\\t\\t//\\\"refinement\\\" name=ID desc=STRING intents+=Intent+\\n \\t\\tpublic Group getGroup() { return cGroup; }\\n \\n \\t\\t//\\\"refinement\\\"\\n \\t\\tpublic Keyword getRefinementKeyword_0() { return cRefinementKeyword_0; }\\n \\n-\\t\\t//id=ID\\n-\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n+\\t\\t//name=ID\\n+\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n \\n \\t\\t//ID\\n-\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n+\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n \\n \\t\\t//desc=STRING\\n \\t\\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\\n@@ -99,8 +99,8 @@ public class IntentElements extends AbstractParserRuleElementFinder {\\n \\t\\tprivate final Group cGroup = (Group)rule.eContents().get(1);\\n \\t\\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\\n \\t\\tprivate final RuleCall cTypeIntentTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\\n-\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n-\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n+\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n+\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n \\t\\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\\n \\t\\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\\n \\t\\tprivate final Assignment cDecompositionsAssignment_3 = (Assignment)cGroup.eContents().get(3);\\n@@ -109,10 +109,10 @@ public class IntentElements extends AbstractParserRuleElementFinder {\\n \\t\\t/// *\\n \\t\\t// * An intent has a type and consists of one or more decompositions. \\n \\t\\t// * / Intent:\\n-\\t\\t//\\ttype=IntentType id=ID desc=STRING decompositions+=Decomposition+;\\n+\\t\\t//\\ttype=IntentType name=ID desc=STRING decompositions+=Decomposition+;\\n \\t\\tpublic ParserRule getRule() { return rule; }\\n \\n-\\t\\t//type=IntentType id=ID desc=STRING decompositions+=Decomposition+\\n+\\t\\t//type=IntentType name=ID desc=STRING decompositions+=Decomposition+\\n \\t\\tpublic Group getGroup() { return cGroup; }\\n \\n \\t\\t//type=IntentType\\n@@ -121,11 +121,11 @@ public class IntentElements extends AbstractParserRuleElementFinder {\\n \\t\\t//IntentType\\n \\t\\tpublic RuleCall getTypeIntentTypeParserRuleCall_0_0() { return cTypeIntentTypeParserRuleCall_0_0; }\\n \\n-\\t\\t//id=ID\\n-\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n+\\t\\t//name=ID\\n+\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n \\n \\t\\t//ID\\n-\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n+\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n \\n \\t\\t//desc=STRING\\n \\t\\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\\n@@ -142,55 +142,59 @@ public class IntentElements extends AbstractParserRuleElementFinder {\\n \\n \\tpublic class IntentTypeElements extends AbstractParserRuleElementFinder {\\n \\t\\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \\\"IntentType\\\");\\n-\\t\\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\\n-\\t\\tprivate final Keyword cBasicKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\\n-\\t\\tprivate final Keyword cPurposeKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\\n-\\t\\tprivate final Keyword cPrinciplesKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\\n-\\t\\tprivate final Keyword cModelsKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\\n-\\t\\tprivate final Keyword cDesignKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\\n-\\t\\tprivate final Keyword cImplementationKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\\n-\\t\\tprivate final Keyword cOperationKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\\n+\\t\\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\\n+\\t\\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\\n+\\t\\tprivate final Keyword cTypeNameBasicKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\\n+\\t\\tprivate final Keyword cTypeNamePurposeKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\\n+\\t\\tprivate final Keyword cTypeNamePrinciplesKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\\n+\\t\\tprivate final Keyword cTypeNameModelsKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\\n+\\t\\tprivate final Keyword cTypeNameDesignKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\\n+\\t\\tprivate final Keyword cTypeNameImplementationKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\\n+\\t\\tprivate final Keyword cTypeNameOperationKeyword_0_6 = (Keyword)cTypeNameAlternatives_0.eContents().get(6);\\n \\t\\t\\n \\t\\t/// *\\n \\t\\t// * Intent types refer to the different levels of the canonical model.\\n \\t\\t// * The grammar does not enforce their universal containment in a specification.\\n \\t\\t// * A proper intention specification should contain an intent of each type in each refinement.\\n \\t\\t// * / IntentType:\\n-\\t\\t//\\t\\\"basic\\\" | \\\"purpose\\\" | \\\"principles\\\" | \\\"models\\\" | \\\"design\\\" | \\\"implementation\\\" | \\\"operation\\\";\\n+\\t\\t//\\ttypeName=(\\\"basic\\\" | \\\"purpose\\\" | \\\"principles\\\" | \\\"models\\\" | \\\"design\\\" | \\\"implementation\\\" | \\\"operation\\\");\\n \\t\\tpublic ParserRule getRule() { return rule; }\\n \\n+\\t\\t//typeName=(\\\"basic\\\" | \\\"purpose\\\" | \\\"principles\\\" | \\\"models\\\" | \\\"design\\\" | \\\"implementation\\\" | \\\"operation\\\")\\n+\\t\\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\\n+\\n \\t\\t//\\\"basic\\\" | \\\"purpose\\\" | \\\"principles\\\" | \\\"models\\\" | \\\"design\\\" | \\\"implementation\\\" | \\\"operation\\\"\\n-\\t\\tpublic Alternatives getAlternatives() { return cAlternatives; }\\n+\\t\\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\\n \\n \\t\\t//\\\"basic\\\"\\n-\\t\\tpublic Keyword getBasicKeyword_0() { return cBasicKeyword_0; }\\n+\\t\\tpublic Keyword getTypeNameBasicKeyword_0_0() { return cTypeNameBasicKeyword_0_0; }\\n \\n \\t\\t//\\\"purpose\\\"\\n-\\t\\tpublic Keyword getPurposeKeyword_1() { return cPurposeKeyword_1; }\\n+\\t\\tpublic Keyword getTypeNamePurposeKeyword_0_1() { return cTypeNamePurposeKeyword_0_1; }\\n \\n \\t\\t//\\\"principles\\\"\\n-\\t\\tpublic Keyword getPrinciplesKeyword_2() { return cPrinciplesKeyword_2; }\\n+\\t\\tpublic Keyword getTypeNamePrinciplesKeyword_0_2() { return cTypeNamePrinciplesKeyword_0_2; }\\n \\n \\t\\t//\\\"models\\\"\\n-\\t\\tpublic Keyword getModelsKeyword_3() { return cModelsKeyword_3; }\\n+\\t\\tpublic Keyword getTypeNameModelsKeyword_0_3() { return cTypeNameModelsKeyword_0_3; }\\n \\n \\t\\t//\\\"design\\\"\\n-\\t\\tpublic Keyword getDesignKeyword_4() { return cDesignKeyword_4; }\\n+\\t\\tpublic Keyword getTypeNameDesignKeyword_0_4() { return cTypeNameDesignKeyword_0_4; }\\n \\n \\t\\t//\\\"implementation\\\"\\n-\\t\\tpublic Keyword getImplementationKeyword_5() { return cImplementationKeyword_5; }\\n+\\t\\tpublic Keyword getTypeNameImplementationKeyword_0_5() { return cTypeNameImplementationKeyword_0_5; }\\n \\n \\t\\t//\\\"operation\\\"\\n-\\t\\tpublic Keyword getOperationKeyword_6() { return cOperationKeyword_6; }\\n+\\t\\tpublic Keyword getTypeNameOperationKeyword_0_6() { return cTypeNameOperationKeyword_0_6; }\\n \\t}\\n \\n \\tpublic class DecompositionElements extends AbstractParserRuleElementFinder {\\n \\t\\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \\\"Decomposition\\\");\\n \\t\\tprivate final Group cGroup = (Group)rule.eContents().get(1);\\n \\t\\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\\n \\t\\tprivate final RuleCall cTypeDecompositionTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\\n-\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n-\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n+\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n+\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n \\t\\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\\n \\t\\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\\n \\t\\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\\n@@ -212,11 +216,11 @@ public class DecompositionElements extends AbstractParserRuleElementFinder {\\n \\t\\t/// *\\n \\t\\t// * A decomposition has a type and consists of one or more models, documents, or items.\\n \\t\\t// * / Decomposition:\\n-\\t\\t//\\ttype=DecompositionType id=ID desc=STRING (\\\"{\\\" documents+=Document* \\\"}\\\")? (\\\"[\\\" models+=ModelItem* \\\"]\\\")? (\\\"(\\\"\\n+\\t\\t//\\ttype=DecompositionType name=ID desc=STRING (\\\"{\\\" documents+=Document* \\\"}\\\")? (\\\"[\\\" models+=ModelItem* \\\"]\\\")? (\\\"(\\\"\\n \\t\\t//\\titems+=ListItem* \\\")\\\")?;\\n \\t\\tpublic ParserRule getRule() { return rule; }\\n \\n-\\t\\t//type=DecompositionType id=ID desc=STRING (\\\"{\\\" documents+=Document* \\\"}\\\")? (\\\"[\\\" models+=ModelItem* \\\"]\\\")? (\\\"(\\\"\\n+\\t\\t//type=DecompositionType name=ID desc=STRING (\\\"{\\\" documents+=Document* \\\"}\\\")? (\\\"[\\\" models+=ModelItem* \\\"]\\\")? (\\\"(\\\"\\n \\t\\t//items+=ListItem* \\\")\\\")?\\n \\t\\tpublic Group getGroup() { return cGroup; }\\n \\n@@ -226,11 +230,11 @@ public class DecompositionElements extends AbstractParserRuleElementFinder {\\n \\t\\t//DecompositionType\\n \\t\\tpublic RuleCall getTypeDecompositionTypeParserRuleCall_0_0() { return cTypeDecompositionTypeParserRuleCall_0_0; }\\n \\n-\\t\\t//id=ID\\n-\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n+\\t\\t//name=ID\\n+\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n \\n \\t\\t//ID\\n-\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n+\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n \\n \\t\\t//desc=STRING\\n \\t\\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\\n@@ -286,30 +290,34 @@ public class DecompositionElements extends AbstractParserRuleElementFinder {\\n \\n \\tpublic class DecompositionTypeElements extends AbstractParserRuleElementFinder {\\n \\t\\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \\\"DecompositionType\\\");\\n-\\t\\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\\n-\\t\\tprivate final Keyword cEnvironmentKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\\n-\\t\\tprivate final Keyword cOperatorKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\\n-\\t\\tprivate final Keyword cSystemKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\\n-\\t\\tprivate final Keyword cVerificationKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\\n+\\t\\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\\n+\\t\\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\\n+\\t\\tprivate final Keyword cTypeNameEnvironmentKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\\n+\\t\\tprivate final Keyword cTypeNameOperatorKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\\n+\\t\\tprivate final Keyword cTypeNameSystemKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\\n+\\t\\tprivate final Keyword cTypeNameVerificationKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\\n \\t\\t\\n \\t\\t//DecompositionType:\\n-\\t\\t//\\t\\\"environment\\\" | \\\"operator\\\" | \\\"system\\\" | \\\"verification\\\";\\n+\\t\\t//\\ttypeName=(\\\"environment\\\" | \\\"operator\\\" | \\\"system\\\" | \\\"verification\\\");\\n \\t\\tpublic ParserRule getRule() { return rule; }\\n \\n+\\t\\t//typeName=(\\\"environment\\\" | \\\"operator\\\" | \\\"system\\\" | \\\"verification\\\")\\n+\\t\\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\\n+\\n \\t\\t//\\\"environment\\\" | \\\"operator\\\" | \\\"system\\\" | \\\"verification\\\"\\n-\\t\\tpublic Alternatives getAlternatives() { return cAlternatives; }\\n+\\t\\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\\n \\n \\t\\t//\\\"environment\\\"\\n-\\t\\tpublic Keyword getEnvironmentKeyword_0() { return cEnvironmentKeyword_0; }\\n+\\t\\tpublic Keyword getTypeNameEnvironmentKeyword_0_0() { return cTypeNameEnvironmentKeyword_0_0; }\\n \\n \\t\\t//\\\"operator\\\"\\n-\\t\\tpublic Keyword getOperatorKeyword_1() { return cOperatorKeyword_1; }\\n+\\t\\tpublic Keyword getTypeNameOperatorKeyword_0_1() { return cTypeNameOperatorKeyword_0_1; }\\n \\n \\t\\t//\\\"system\\\"\\n-\\t\\tpublic Keyword getSystemKeyword_2() { return cSystemKeyword_2; }\\n+\\t\\tpublic Keyword getTypeNameSystemKeyword_0_2() { return cTypeNameSystemKeyword_0_2; }\\n \\n \\t\\t//\\\"verification\\\"\\n-\\t\\tpublic Keyword getVerificationKeyword_3() { return cVerificationKeyword_3; }\\n+\\t\\tpublic Keyword getTypeNameVerificationKeyword_0_3() { return cTypeNameVerificationKeyword_0_3; }\\n \\t}\\n \\n \\tpublic class DocumentElements extends AbstractParserRuleElementFinder {\\n@@ -342,60 +350,64 @@ public class DocumentElements extends AbstractParserRuleElementFinder {\\n \\n \\tpublic class DocItemTypeElements extends AbstractParserRuleElementFinder {\\n \\t\\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \\\"DocItemType\\\");\\n-\\t\\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\\n-\\t\\tprivate final Keyword cConditionKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\\n-\\t\\tprivate final Keyword cFigureKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\\n-\\t\\tprivate final Keyword cBreakKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\\n-\\t\\tprivate final Keyword cModelKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\\n-\\t\\tprivate final Keyword cParagraphKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\\n-\\t\\tprivate final Keyword cSectionKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\\n-\\t\\tprivate final Keyword cTableKeyword_6 = (Keyword)cAlternatives.eContents().get(6);\\n+\\t\\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\\n+\\t\\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\\n+\\t\\tprivate final Keyword cTypeNameConditionKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\\n+\\t\\tprivate final Keyword cTypeNameFigureKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\\n+\\t\\tprivate final Keyword cTypeNameBreakKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\\n+\\t\\tprivate final Keyword cTypeNameModelKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\\n+\\t\\tprivate final Keyword cTypeNameParagraphKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\\n+\\t\\tprivate final Keyword cTypeNameSectionKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\\n+\\t\\tprivate final Keyword cTypeNameTableKeyword_0_6 = (Keyword)cTypeNameAlternatives_0.eContents().get(6);\\n \\t\\t\\n \\t\\t//DocItemType:\\n-\\t\\t//\\t\\\"condition\\\" | \\\"figure\\\" | \\\"break\\\" | \\\"model\\\" | \\\"paragraph\\\" | \\\"section\\\" | \\\"table\\\";\\n+\\t\\t//\\ttypeName=(\\\"condition\\\" | \\\"figure\\\" | \\\"break\\\" | \\\"model\\\" | \\\"paragraph\\\" | \\\"section\\\" | \\\"table\\\");\\n \\t\\tpublic ParserRule getRule() { return rule; }\\n \\n+\\t\\t//typeName=(\\\"condition\\\" | \\\"figure\\\" | \\\"break\\\" | \\\"model\\\" | \\\"paragraph\\\" | \\\"section\\\" | \\\"table\\\")\\n+\\t\\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\\n+\\n \\t\\t//\\\"condition\\\" | \\\"figure\\\" | \\\"break\\\" | \\\"model\\\" | \\\"paragraph\\\" | \\\"section\\\" | \\\"table\\\"\\n-\\t\\tpublic Alternatives getAlternatives() { return cAlternatives; }\\n+\\t\\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\\n \\n \\t\\t//\\\"condition\\\"\\n-\\t\\tpublic Keyword getConditionKeyword_0() { return cConditionKeyword_0; }\\n+\\t\\tpublic Keyword getTypeNameConditionKeyword_0_0() { return cTypeNameConditionKeyword_0_0; }\\n \\n \\t\\t//\\\"figure\\\"\\n-\\t\\tpublic Keyword getFigureKeyword_1() { return cFigureKeyword_1; }\\n+\\t\\tpublic Keyword getTypeNameFigureKeyword_0_1() { return cTypeNameFigureKeyword_0_1; }\\n \\n \\t\\t//\\\"break\\\"\\n-\\t\\tpublic Keyword getBreakKeyword_2() { return cBreakKeyword_2; }\\n+\\t\\tpublic Keyword getTypeNameBreakKeyword_0_2() { return cTypeNameBreakKeyword_0_2; }\\n \\n \\t\\t//\\\"model\\\"\\n-\\t\\tpublic Keyword getModelKeyword_3() { return cModelKeyword_3; }\\n+\\t\\tpublic Keyword getTypeNameModelKeyword_0_3() { return cTypeNameModelKeyword_0_3; }\\n \\n \\t\\t//\\\"paragraph\\\"\\n-\\t\\tpublic Keyword getParagraphKeyword_4() { return cParagraphKeyword_4; }\\n+\\t\\tpublic Keyword getTypeNameParagraphKeyword_0_4() { return cTypeNameParagraphKeyword_0_4; }\\n \\n \\t\\t//\\\"section\\\"\\n-\\t\\tpublic Keyword getSectionKeyword_5() { return cSectionKeyword_5; }\\n+\\t\\tpublic Keyword getTypeNameSectionKeyword_0_5() { return cTypeNameSectionKeyword_0_5; }\\n \\n \\t\\t//\\\"table\\\"\\n-\\t\\tpublic Keyword getTableKeyword_6() { return cTableKeyword_6; }\\n+\\t\\tpublic Keyword getTypeNameTableKeyword_0_6() { return cTypeNameTableKeyword_0_6; }\\n \\t}\\n \\n \\tpublic class DocItemElements extends AbstractParserRuleElementFinder {\\n \\t\\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \\\"DocItem\\\");\\n \\t\\tprivate final Group cGroup = (Group)rule.eContents().get(1);\\n \\t\\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\\n \\t\\tprivate final RuleCall cTypeDocItemTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\\n-\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n-\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n+\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n+\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n \\t\\tprivate final Assignment cRefAssignment_2 = (Assignment)cGroup.eContents().get(2);\\n \\t\\tprivate final RuleCall cRefSTRINGTerminalRuleCall_2_0 = (RuleCall)cRefAssignment_2.eContents().get(0);\\n \\t\\tprivate final Keyword cSemicolonKeyword_3 = (Keyword)cGroup.eContents().get(3);\\n \\t\\t\\n \\t\\t//DocItem:\\n-\\t\\t//\\ttype=DocItemType id=ID ref=STRING \\\";\\\";\\n+\\t\\t//\\ttype=DocItemType name=ID ref=STRING \\\";\\\";\\n \\t\\tpublic ParserRule getRule() { return rule; }\\n \\n-\\t\\t//type=DocItemType id=ID ref=STRING \\\";\\\"\\n+\\t\\t//type=DocItemType name=ID ref=STRING \\\";\\\"\\n \\t\\tpublic Group getGroup() { return cGroup; }\\n \\n \\t\\t//type=DocItemType\\n@@ -404,11 +416,11 @@ public class DocItemElements extends AbstractParserRuleElementFinder {\\n \\t\\t//DocItemType\\n \\t\\tpublic RuleCall getTypeDocItemTypeParserRuleCall_0_0() { return cTypeDocItemTypeParserRuleCall_0_0; }\\n \\n-\\t\\t//id=ID\\n-\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n+\\t\\t//name=ID\\n+\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n \\n \\t\\t//ID\\n-\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n+\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n \\n \\t\\t//ref=STRING\\n \\t\\tpublic Assignment getRefAssignment_2() { return cRefAssignment_2; }\\n@@ -422,56 +434,60 @@ public class DocItemElements extends AbstractParserRuleElementFinder {\\n \\n \\tpublic class ModelTypeElements extends AbstractParserRuleElementFinder {\\n \\t\\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \\\"ModelType\\\");\\n-\\t\\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\\n-\\t\\tprivate final Keyword cOutputKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\\n-\\t\\tprivate final Keyword cModeKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\\n-\\t\\tprivate final Keyword cStateKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\\n-\\t\\tprivate final Keyword cMacroKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\\n-\\t\\tprivate final Keyword cFunctionKeyword_4 = (Keyword)cAlternatives.eContents().get(4);\\n-\\t\\tprivate final Keyword cInputKeyword_5 = (Keyword)cAlternatives.eContents().get(5);\\n+\\t\\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\\n+\\t\\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\\n+\\t\\tprivate final Keyword cTypeNameOutputKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\\n+\\t\\tprivate final Keyword cTypeNameModeKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\\n+\\t\\tprivate final Keyword cTypeNameStateKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\\n+\\t\\tprivate final Keyword cTypeNameMacroKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\\n+\\t\\tprivate final Keyword cTypeNameFunctionKeyword_0_4 = (Keyword)cTypeNameAlternatives_0.eContents().get(4);\\n+\\t\\tprivate final Keyword cTypeNameInputKeyword_0_5 = (Keyword)cTypeNameAlternatives_0.eContents().get(5);\\n \\t\\t\\n \\t\\t//ModelType:\\n-\\t\\t//\\t\\\"output\\\" | \\\"mode\\\" | \\\"state\\\" | \\\"macro\\\" | \\\"function\\\" | \\\"input\\\";\\n+\\t\\t//\\ttypeName=(\\\"output\\\" | \\\"mode\\\" | \\\"state\\\" | \\\"macro\\\" | \\\"function\\\" | \\\"input\\\");\\n \\t\\tpublic ParserRule getRule() { return rule; }\\n \\n+\\t\\t//typeName=(\\\"output\\\" | \\\"mode\\\" | \\\"state\\\" | \\\"macro\\\" | \\\"function\\\" | \\\"input\\\")\\n+\\t\\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\\n+\\n \\t\\t//\\\"output\\\" | \\\"mode\\\" | \\\"state\\\" | \\\"macro\\\" | \\\"function\\\" | \\\"input\\\"\\n-\\t\\tpublic Alternatives getAlternatives() { return cAlternatives; }\\n+\\t\\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\\n \\n \\t\\t//\\\"output\\\"\\n-\\t\\tpublic Keyword getOutputKeyword_0() { return cOutputKeyword_0; }\\n+\\t\\tpublic Keyword getTypeNameOutputKeyword_0_0() { return cTypeNameOutputKeyword_0_0; }\\n \\n \\t\\t//\\\"mode\\\"\\n-\\t\\tpublic Keyword getModeKeyword_1() { return cModeKeyword_1; }\\n+\\t\\tpublic Keyword getTypeNameModeKeyword_0_1() { return cTypeNameModeKeyword_0_1; }\\n \\n \\t\\t//\\\"state\\\"\\n-\\t\\tpublic Keyword getStateKeyword_2() { return cStateKeyword_2; }\\n+\\t\\tpublic Keyword getTypeNameStateKeyword_0_2() { return cTypeNameStateKeyword_0_2; }\\n \\n \\t\\t//\\\"macro\\\"\\n-\\t\\tpublic Keyword getMacroKeyword_3() { return cMacroKeyword_3; }\\n+\\t\\tpublic Keyword getTypeNameMacroKeyword_0_3() { return cTypeNameMacroKeyword_0_3; }\\n \\n \\t\\t//\\\"function\\\"\\n-\\t\\tpublic Keyword getFunctionKeyword_4() { return cFunctionKeyword_4; }\\n+\\t\\tpublic Keyword getTypeNameFunctionKeyword_0_4() { return cTypeNameFunctionKeyword_0_4; }\\n \\n \\t\\t//\\\"input\\\"\\n-\\t\\tpublic Keyword getInputKeyword_5() { return cInputKeyword_5; }\\n+\\t\\tpublic Keyword getTypeNameInputKeyword_0_5() { return cTypeNameInputKeyword_0_5; }\\n \\t}\\n \\n \\tpublic class ModelItemElements extends AbstractParserRuleElementFinder {\\n \\t\\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \\\"ModelItem\\\");\\n \\t\\tprivate final Group cGroup = (Group)rule.eContents().get(1);\\n \\t\\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\\n \\t\\tprivate final RuleCall cTypeModelTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\\n-\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n-\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n+\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n+\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n \\t\\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\\n \\t\\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\\n \\t\\tprivate final Keyword cSemicolonKeyword_3 = (Keyword)cGroup.eContents().get(3);\\n \\t\\t\\n \\t\\t//ModelItem:\\n-\\t\\t//\\ttype=ModelType id=ID desc=STRING \\\";\\\";\\n+\\t\\t//\\ttype=ModelType name=ID desc=STRING \\\";\\\";\\n \\t\\tpublic ParserRule getRule() { return rule; }\\n \\n-\\t\\t//type=ModelType id=ID desc=STRING \\\";\\\"\\n+\\t\\t//type=ModelType name=ID desc=STRING \\\";\\\"\\n \\t\\tpublic Group getGroup() { return cGroup; }\\n \\n \\t\\t//type=ModelType\\n@@ -480,11 +496,11 @@ public class ModelItemElements extends AbstractParserRuleElementFinder {\\n \\t\\t//ModelType\\n \\t\\tpublic RuleCall getTypeModelTypeParserRuleCall_0_0() { return cTypeModelTypeParserRuleCall_0_0; }\\n \\n-\\t\\t//id=ID\\n-\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n+\\t\\t//name=ID\\n+\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n \\n \\t\\t//ID\\n-\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n+\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n \\n \\t\\t//desc=STRING\\n \\t\\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\\n@@ -498,39 +514,43 @@ public class ModelItemElements extends AbstractParserRuleElementFinder {\\n \\n \\tpublic class ListItemTypeElements extends AbstractParserRuleElementFinder {\\n \\t\\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \\\"ListItemType\\\");\\n-\\t\\tprivate final Alternatives cAlternatives = (Alternatives)rule.eContents().get(1);\\n-\\t\\tprivate final Keyword cRequirementKeyword_0 = (Keyword)cAlternatives.eContents().get(0);\\n-\\t\\tprivate final Keyword cGoalKeyword_1 = (Keyword)cAlternatives.eContents().get(1);\\n-\\t\\tprivate final Keyword cHazardKeyword_2 = (Keyword)cAlternatives.eContents().get(2);\\n-\\t\\tprivate final Keyword cConstraintKeyword_3 = (Keyword)cAlternatives.eContents().get(3);\\n+\\t\\tprivate final Assignment cTypeNameAssignment = (Assignment)rule.eContents().get(1);\\n+\\t\\tprivate final Alternatives cTypeNameAlternatives_0 = (Alternatives)cTypeNameAssignment.eContents().get(0);\\n+\\t\\tprivate final Keyword cTypeNameRequirementKeyword_0_0 = (Keyword)cTypeNameAlternatives_0.eContents().get(0);\\n+\\t\\tprivate final Keyword cTypeNameGoalKeyword_0_1 = (Keyword)cTypeNameAlternatives_0.eContents().get(1);\\n+\\t\\tprivate final Keyword cTypeNameHazardKeyword_0_2 = (Keyword)cTypeNameAlternatives_0.eContents().get(2);\\n+\\t\\tprivate final Keyword cTypeNameConstraintKeyword_0_3 = (Keyword)cTypeNameAlternatives_0.eContents().get(3);\\n \\t\\t\\n \\t\\t//ListItemType:\\n-\\t\\t//\\t\\\"requirement\\\" | \\\"goal\\\" | \\\"hazard\\\" | \\\"constraint\\\";\\n+\\t\\t//\\ttypeName=(\\\"requirement\\\" | \\\"goal\\\" | \\\"hazard\\\" | \\\"constraint\\\");\\n \\t\\tpublic ParserRule getRule() { return rule; }\\n \\n+\\t\\t//typeName=(\\\"requirement\\\" | \\\"goal\\\" | \\\"hazard\\\" | \\\"constraint\\\")\\n+\\t\\tpublic Assignment getTypeNameAssignment() { return cTypeNameAssignment; }\\n+\\n \\t\\t//\\\"requirement\\\" | \\\"goal\\\" | \\\"hazard\\\" | \\\"constraint\\\"\\n-\\t\\tpublic Alternatives getAlternatives() { return cAlternatives; }\\n+\\t\\tpublic Alternatives getTypeNameAlternatives_0() { return cTypeNameAlternatives_0; }\\n \\n \\t\\t//\\\"requirement\\\"\\n-\\t\\tpublic Keyword getRequirementKeyword_0() { return cRequirementKeyword_0; }\\n+\\t\\tpublic Keyword getTypeNameRequirementKeyword_0_0() { return cTypeNameRequirementKeyword_0_0; }\\n \\n \\t\\t//\\\"goal\\\"\\n-\\t\\tpublic Keyword getGoalKeyword_1() { return cGoalKeyword_1; }\\n+\\t\\tpublic Keyword getTypeNameGoalKeyword_0_1() { return cTypeNameGoalKeyword_0_1; }\\n \\n \\t\\t//\\\"hazard\\\"\\n-\\t\\tpublic Keyword getHazardKeyword_2() { return cHazardKeyword_2; }\\n+\\t\\tpublic Keyword getTypeNameHazardKeyword_0_2() { return cTypeNameHazardKeyword_0_2; }\\n \\n \\t\\t//\\\"constraint\\\"\\n-\\t\\tpublic Keyword getConstraintKeyword_3() { return cConstraintKeyword_3; }\\n+\\t\\tpublic Keyword getTypeNameConstraintKeyword_0_3() { return cTypeNameConstraintKeyword_0_3; }\\n \\t}\\n \\n \\tpublic class ListItemElements extends AbstractParserRuleElementFinder {\\n \\t\\tprivate final ParserRule rule = (ParserRule) GrammarUtil.findRuleForName(getGrammar(), \\\"ListItem\\\");\\n \\t\\tprivate final Group cGroup = (Group)rule.eContents().get(1);\\n \\t\\tprivate final Assignment cTypeAssignment_0 = (Assignment)cGroup.eContents().get(0);\\n \\t\\tprivate final RuleCall cTypeListItemTypeParserRuleCall_0_0 = (RuleCall)cTypeAssignment_0.eContents().get(0);\\n-\\t\\tprivate final Assignment cIdAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n-\\t\\tprivate final RuleCall cIdIDTerminalRuleCall_1_0 = (RuleCall)cIdAssignment_1.eContents().get(0);\\n+\\t\\tprivate final Assignment cNameAssignment_1 = (Assignment)cGroup.eContents().get(1);\\n+\\t\\tprivate final RuleCall cNameIDTerminalRuleCall_1_0 = (RuleCall)cNameAssignment_1.eContents().get(0);\\n \\t\\tprivate final Assignment cDescAssignment_2 = (Assignment)cGroup.eContents().get(2);\\n \\t\\tprivate final RuleCall cDescSTRINGTerminalRuleCall_2_0 = (RuleCall)cDescAssignment_2.eContents().get(0);\\n \\t\\tprivate final Group cGroup_3 = (Group)cGroup.eContents().get(3);\\n@@ -555,58 +575,13 @@ public class ListItemElements extends AbstractParserRuleElementFinder {\\n \\t\\t\\n \\t\\t/// *\\n \\t\\t// * A list item has a type, description and lists of references.\\n-\\t\\t// * / / * \\n-\\t\\t//Level0:\\n-\\t\\t//\\t{Level0}\\n-\\t\\t//\\t'{'\\n-\\t\\t//\\t\\t('Program Plan' pmp=Document)?\\n-\\t\\t//\\t\\t('Safety Plan' safetyPlan=Document)?\\n-\\t\\t//\\t\\t('Accident Definition' accidentDefinition=Document)?\\n-\\t\\t//\\t\\t('Safety Policy' safetyPolicy=Document)?\\n-\\t\\t//\\t'}'\\n-\\t\\t//;\\n-\\t\\t//\\n-\\t\\t//Level1:\\n-\\t\\t//\\t{Level1}\\n-\\t\\t//\\t'{'\\n-\\t\\t//\\t\\t('Introduction' introduction=Document)?\\n-\\t\\t//\\t\\t('Historical' historical=Document)?\\n-\\t\\t//\\t\\t('Environment' environment=Document)?\\n-\\t\\t//\\t\\t('Goals' '(' goals+=GoalItem* ')' )?\\n-\\t\\t//\\t\\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\\n-\\t\\t//\\t\\t('System Limitations' limitations=Document)?\\n-\\t\\t//\\t\\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\\n-\\t\\t//\\t\\t('Hazard Analysis' hazardAnalysis=Document)?\\n-\\t\\t//\\t\\t('Hazard List' '(' hazardList+=HazardItem* ')')?\\n-\\t\\t//\\t\\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\\n-\\t\\t//\\t\\t('Verification and Validation' verification=Document)?\\n-\\t\\t//\\t'}'\\n-\\t\\t//;\\n-\\t\\t//\\n-\\t\\t//\\n-\\t\\t//Level2:\\n-\\t\\t//\\tdesc=STRING\\n-\\t\\t//\\t'{'\\n-\\t\\t//\\t'}'\\t\\n-\\t\\t//;\\n-\\t\\t//\\n-\\t\\t//Level3:\\n-\\t\\t//\\tdesc=STRING\\n-\\t\\t//\\t'{'\\n-\\t\\t//\\t\\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\\n-\\t\\t//\\t\\t('User Model' '(' userModels+=ModelItem* ')' )?\\n-\\t\\t//\\t\\t('Verification and Validation' verification=Document )?\\n-\\t\\t//\\t'}'\\n-\\t\\t//;\\n-\\t\\t//\\n-\\t\\t//\\n \\t\\t// * / ListItem:\\n-\\t\\t//\\ttype=ListItemType id=ID desc=STRING (\\\"{\\\" docReferences+=[DocItem]* \\\"}\\\")? (\\\"(\\\" itemReferences+=[ListItem]* \\\")\\\")? (\\\"[\\\"\\n-\\t\\t//\\tmodelReferences+=[ModelItem]* \\\"]\\\")? \\\";\\\";\\n+\\t\\t//\\ttype=ListItemType name=ID desc=STRING (\\\"{\\\" docReferences+=[DocItem]+ \\\"}\\\")? (\\\"(\\\" itemReferences+=[ListItem]+ \\\")\\\")? (\\\"[\\\"\\n+\\t\\t//\\tmodelReferences+=[ModelItem]+ \\\"]\\\")? \\\";\\\";\\n \\t\\tpublic ParserRule getRule() { return rule; }\\n \\n-\\t\\t//type=ListItemType id=ID desc=STRING (\\\"{\\\" docReferences+=[DocItem]* \\\"}\\\")? (\\\"(\\\" itemReferences+=[ListItem]* \\\")\\\")? (\\\"[\\\"\\n-\\t\\t//modelReferences+=[ModelItem]* \\\"]\\\")? \\\";\\\"\\n+\\t\\t//type=ListItemType name=ID desc=STRING (\\\"{\\\" docReferences+=[DocItem]+ \\\"}\\\")? (\\\"(\\\" itemReferences+=[ListItem]+ \\\")\\\")? (\\\"[\\\"\\n+\\t\\t//modelReferences+=[ModelItem]+ \\\"]\\\")? \\\";\\\"\\n \\t\\tpublic Group getGroup() { return cGroup; }\\n \\n \\t\\t//type=ListItemType\\n@@ -615,25 +590,25 @@ public class ListItemElements extends AbstractParserRuleElementFinder {\\n \\t\\t//ListItemType\\n \\t\\tpublic RuleCall getTypeListItemTypeParserRuleCall_0_0() { return cTypeListItemTypeParserRuleCall_0_0; }\\n \\n-\\t\\t//id=ID\\n-\\t\\tpublic Assignment getIdAssignment_1() { return cIdAssignment_1; }\\n+\\t\\t//name=ID\\n+\\t\\tpublic Assignment getNameAssignment_1() { return cNameAssignment_1; }\\n \\n \\t\\t//ID\\n-\\t\\tpublic RuleCall getIdIDTerminalRuleCall_1_0() { return cIdIDTerminalRuleCall_1_0; }\\n+\\t\\tpublic RuleCall getNameIDTerminalRuleCall_1_0() { return cNameIDTerminalRuleCall_1_0; }\\n \\n \\t\\t//desc=STRING\\n \\t\\tpublic Assignment getDescAssignment_2() { return cDescAssignment_2; }\\n \\n \\t\\t//STRING\\n \\t\\tpublic RuleCall getDescSTRINGTerminalRuleCall_2_0() { return cDescSTRINGTerminalRuleCall_2_0; }\\n \\n-\\t\\t//(\\\"{\\\" docReferences+=[DocItem]* \\\"}\\\")?\\n+\\t\\t//(\\\"{\\\" docReferences+=[DocItem]+ \\\"}\\\")?\\n \\t\\tpublic Group getGroup_3() { return cGroup_3; }\\n \\n \\t\\t//\\\"{\\\"\\n \\t\\tpublic Keyword getLeftCurlyBracketKeyword_3_0() { return cLeftCurlyBracketKeyword_3_0; }\\n \\n-\\t\\t//docReferences+=[DocItem]*\\n+\\t\\t//docReferences+=[DocItem]+\\n \\t\\tpublic Assignment getDocReferencesAssignment_3_1() { return cDocReferencesAssignment_3_1; }\\n \\n \\t\\t//[DocItem]\\n@@ -645,13 +620,13 @@ public class ListItemElements extends AbstractParserRuleElementFinder {\\n \\t\\t//\\\"}\\\"\\n \\t\\tpublic Keyword getRightCurlyBracketKeyword_3_2() { return cRightCurlyBracketKeyword_3_2; }\\n \\n-\\t\\t//(\\\"(\\\" itemReferences+=[ListItem]* \\\")\\\")?\\n+\\t\\t//(\\\"(\\\" itemReferences+=[ListItem]+ \\\")\\\")?\\n \\t\\tpublic Group getGroup_4() { return cGroup_4; }\\n \\n \\t\\t//\\\"(\\\"\\n \\t\\tpublic Keyword getLeftParenthesisKeyword_4_0() { return cLeftParenthesisKeyword_4_0; }\\n \\n-\\t\\t//itemReferences+=[ListItem]*\\n+\\t\\t//itemReferences+=[ListItem]+\\n \\t\\tpublic Assignment getItemReferencesAssignment_4_1() { return cItemReferencesAssignment_4_1; }\\n \\n \\t\\t//[ListItem]\\n@@ -663,13 +638,13 @@ public class ListItemElements extends AbstractParserRuleElementFinder {\\n \\t\\t//\\\")\\\"\\n \\t\\tpublic Keyword getRightParenthesisKeyword_4_2() { return cRightParenthesisKeyword_4_2; }\\n \\n-\\t\\t//(\\\"[\\\" modelReferences+=[ModelItem]* \\\"]\\\")?\\n+\\t\\t//(\\\"[\\\" modelReferences+=[ModelItem]+ \\\"]\\\")?\\n \\t\\tpublic Group getGroup_5() { return cGroup_5; }\\n \\n \\t\\t//\\\"[\\\"\\n \\t\\tpublic Keyword getLeftSquareBracketKeyword_5_0() { return cLeftSquareBracketKeyword_5_0; }\\n \\n-\\t\\t//modelReferences+=[ModelItem]*\\n+\\t\\t//modelReferences+=[ModelItem]+\\n \\t\\tpublic Assignment getModelReferencesAssignment_5_1() { return cModelReferencesAssignment_5_1; }\\n \\n \\t\\t//[ModelItem]\\n@@ -741,7 +716,7 @@ public TerminalsGrammarAccess getTerminalsGrammarAccess() {\\n \\t/// *\\n \\t// * An intent specification consists of one or more refinements.\\n \\t// * / Specification:\\n-\\t//\\t\\\"specification\\\" id=ID refinements+=Refinement+;\\n+\\t//\\t\\\"specification\\\" name=ID refinements+=Refinement+;\\n \\tpublic SpecificationElements getSpecificationAccess() {\\n \\t\\treturn (pSpecification != null) ? pSpecification : (pSpecification = new SpecificationElements());\\n \\t}\\n@@ -753,7 +728,7 @@ public ParserRule getSpecificationRule() {\\n \\t/// *\\n \\t// * A refinement has no type and consists of one or more intents.\\n \\t// * / Refinement:\\n-\\t//\\t\\\"refinement\\\" id=ID desc=STRING intents+=Intent+;\\n+\\t//\\t\\\"refinement\\\" name=ID desc=STRING intents+=Intent+;\\n \\tpublic RefinementElements getRefinementAccess() {\\n \\t\\treturn (pRefinement != null) ? pRefinement : (pRefinement = new RefinementElements());\\n \\t}\\n@@ -765,7 +740,7 @@ public ParserRule getRefinementRule() {\\n \\t/// *\\n \\t// * An intent has a type and consists of one or more decompositions. \\n \\t// * / Intent:\\n-\\t//\\ttype=IntentType id=ID desc=STRING decompositions+=Decomposition+;\\n+\\t//\\ttype=IntentType name=ID desc=STRING decompositions+=Decomposition+;\\n \\tpublic IntentElements getIntentAccess() {\\n \\t\\treturn (pIntent != null) ? pIntent : (pIntent = new IntentElements());\\n \\t}\\n@@ -779,7 +754,7 @@ public ParserRule getIntentRule() {\\n \\t// * The grammar does not enforce their universal containment in a specification.\\n \\t// * A proper intention specification should contain an intent of each type in each refinement.\\n \\t// * / IntentType:\\n-\\t//\\t\\\"basic\\\" | \\\"purpose\\\" | \\\"principles\\\" | \\\"models\\\" | \\\"design\\\" | \\\"implementation\\\" | \\\"operation\\\";\\n+\\t//\\ttypeName=(\\\"basic\\\" | \\\"purpose\\\" | \\\"principles\\\" | \\\"models\\\" | \\\"design\\\" | \\\"implementation\\\" | \\\"operation\\\");\\n \\tpublic IntentTypeElements getIntentTypeAccess() {\\n \\t\\treturn (pIntentType != null) ? pIntentType : (pIntentType = new IntentTypeElements());\\n \\t}\\n@@ -791,7 +766,7 @@ public ParserRule getIntentTypeRule() {\\n \\t/// *\\n \\t// * A decomposition has a type and consists of one or more models, documents, or items.\\n \\t// * / Decomposition:\\n-\\t//\\ttype=DecompositionType id=ID desc=STRING (\\\"{\\\" documents+=Document* \\\"}\\\")? (\\\"[\\\" models+=ModelItem* \\\"]\\\")? (\\\"(\\\"\\n+\\t//\\ttype=DecompositionType name=ID desc=STRING (\\\"{\\\" documents+=Document* \\\"}\\\")? (\\\"[\\\" models+=ModelItem* \\\"]\\\")? (\\\"(\\\"\\n \\t//\\titems+=ListItem* \\\")\\\")?;\\n \\tpublic DecompositionElements getDecompositionAccess() {\\n \\t\\treturn (pDecomposition != null) ? pDecomposition : (pDecomposition = new DecompositionElements());\\n@@ -802,7 +777,7 @@ public ParserRule getDecompositionRule() {\\n \\t}\\n \\n \\t//DecompositionType:\\n-\\t//\\t\\\"environment\\\" | \\\"operator\\\" | \\\"system\\\" | \\\"verification\\\";\\n+\\t//\\ttypeName=(\\\"environment\\\" | \\\"operator\\\" | \\\"system\\\" | \\\"verification\\\");\\n \\tpublic DecompositionTypeElements getDecompositionTypeAccess() {\\n \\t\\treturn (pDecompositionType != null) ? pDecompositionType : (pDecompositionType = new DecompositionTypeElements());\\n \\t}\\n@@ -822,7 +797,7 @@ public ParserRule getDocumentRule() {\\n \\t}\\n \\n \\t//DocItemType:\\n-\\t//\\t\\\"condition\\\" | \\\"figure\\\" | \\\"break\\\" | \\\"model\\\" | \\\"paragraph\\\" | \\\"section\\\" | \\\"table\\\";\\n+\\t//\\ttypeName=(\\\"condition\\\" | \\\"figure\\\" | \\\"break\\\" | \\\"model\\\" | \\\"paragraph\\\" | \\\"section\\\" | \\\"table\\\");\\n \\tpublic DocItemTypeElements getDocItemTypeAccess() {\\n \\t\\treturn (pDocItemType != null) ? pDocItemType : (pDocItemType = new DocItemTypeElements());\\n \\t}\\n@@ -832,7 +807,7 @@ public ParserRule getDocItemTypeRule() {\\n \\t}\\n \\n \\t//DocItem:\\n-\\t//\\ttype=DocItemType id=ID ref=STRING \\\";\\\";\\n+\\t//\\ttype=DocItemType name=ID ref=STRING \\\";\\\";\\n \\tpublic DocItemElements getDocItemAccess() {\\n \\t\\treturn (pDocItem != null) ? pDocItem : (pDocItem = new DocItemElements());\\n \\t}\\n@@ -842,7 +817,7 @@ public ParserRule getDocItemRule() {\\n \\t}\\n \\n \\t//ModelType:\\n-\\t//\\t\\\"output\\\" | \\\"mode\\\" | \\\"state\\\" | \\\"macro\\\" | \\\"function\\\" | \\\"input\\\";\\n+\\t//\\ttypeName=(\\\"output\\\" | \\\"mode\\\" | \\\"state\\\" | \\\"macro\\\" | \\\"function\\\" | \\\"input\\\");\\n \\tpublic ModelTypeElements getModelTypeAccess() {\\n \\t\\treturn (pModelType != null) ? pModelType : (pModelType = new ModelTypeElements());\\n \\t}\\n@@ -852,7 +827,7 @@ public ParserRule getModelTypeRule() {\\n \\t}\\n \\n \\t//ModelItem:\\n-\\t//\\ttype=ModelType id=ID desc=STRING \\\";\\\";\\n+\\t//\\ttype=ModelType name=ID desc=STRING \\\";\\\";\\n \\tpublic ModelItemElements getModelItemAccess() {\\n \\t\\treturn (pModelItem != null) ? pModelItem : (pModelItem = new ModelItemElements());\\n \\t}\\n@@ -862,7 +837,7 @@ public ParserRule getModelItemRule() {\\n \\t}\\n \\n \\t//ListItemType:\\n-\\t//\\t\\\"requirement\\\" | \\\"goal\\\" | \\\"hazard\\\" | \\\"constraint\\\";\\n+\\t//\\ttypeName=(\\\"requirement\\\" | \\\"goal\\\" | \\\"hazard\\\" | \\\"constraint\\\");\\n \\tpublic ListItemTypeElements getListItemTypeAccess() {\\n \\t\\treturn (pListItemType != null) ? pListItemType : (pListItemType = new ListItemTypeElements());\\n \\t}\\n@@ -873,54 +848,9 @@ public ParserRule getListItemTypeRule() {\\n \\n \\t/// *\\n \\t// * A list item has a type, description and lists of references.\\n-\\t// * / / * \\n-\\t//Level0:\\n-\\t//\\t{Level0}\\n-\\t//\\t'{'\\n-\\t//\\t\\t('Program Plan' pmp=Document)?\\n-\\t//\\t\\t('Safety Plan' safetyPlan=Document)?\\n-\\t//\\t\\t('Accident Definition' accidentDefinition=Document)?\\n-\\t//\\t\\t('Safety Policy' safetyPolicy=Document)?\\n-\\t//\\t'}'\\n-\\t//;\\n-\\t//\\n-\\t//Level1:\\n-\\t//\\t{Level1}\\n-\\t//\\t'{'\\n-\\t//\\t\\t('Introduction' introduction=Document)?\\n-\\t//\\t\\t('Historical' historical=Document)?\\n-\\t//\\t\\t('Environment' environment=Document)?\\n-\\t//\\t\\t('Goals' '(' goals+=GoalItem* ')' )?\\n-\\t//\\t\\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\\n-\\t//\\t\\t('System Limitations' limitations=Document)?\\n-\\t//\\t\\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\\n-\\t//\\t\\t('Hazard Analysis' hazardAnalysis=Document)?\\n-\\t//\\t\\t('Hazard List' '(' hazardList+=HazardItem* ')')?\\n-\\t//\\t\\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\\n-\\t//\\t\\t('Verification and Validation' verification=Document)?\\n-\\t//\\t'}'\\n-\\t//;\\n-\\t//\\n-\\t//\\n-\\t//Level2:\\n-\\t//\\tdesc=STRING\\n-\\t//\\t'{'\\n-\\t//\\t'}'\\t\\n-\\t//;\\n-\\t//\\n-\\t//Level3:\\n-\\t//\\tdesc=STRING\\n-\\t//\\t'{'\\n-\\t//\\t\\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\\n-\\t//\\t\\t('User Model' '(' userModels+=ModelItem* ')' )?\\n-\\t//\\t\\t('Verification and Validation' verification=Document )?\\n-\\t//\\t'}'\\n-\\t//;\\n-\\t//\\n-\\t//\\n \\t// * / ListItem:\\n-\\t//\\ttype=ListItemType id=ID desc=STRING (\\\"{\\\" docReferences+=[DocItem]* \\\"}\\\")? (\\\"(\\\" itemReferences+=[ListItem]* \\\")\\\")? (\\\"[\\\"\\n-\\t//\\tmodelReferences+=[ModelItem]* \\\"]\\\")? \\\";\\\";\\n+\\t//\\ttype=ListItemType name=ID desc=STRING (\\\"{\\\" docReferences+=[DocItem]+ \\\"}\\\")? (\\\"(\\\" itemReferences+=[ListItem]+ \\\")\\\")? (\\\"[\\\"\\n+\\t//\\tmodelReferences+=[ModelItem]+ \\\"]\\\")? \\\";\\\";\\n \\tpublic ListItemElements getListItemAccess() {\\n \\t\\treturn (pListItem != null) ? pListItem : (pListItem = new ListItemElements());\\n \\t}\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fservices%2FIntentSpecificationGrammarAccess.java\",\n \"sha\": \"492d3f0c6e243a4a171562251d67918938a267e8\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FAbstractIntentSpecificationValidator.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FAbstractIntentSpecificationValidator.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 0,\n \"filename\": \"net.certware.intent/src-gen/net/certware/intent/validation/AbstractIntentSpecificationValidator.java\",\n \"new_code\": \"import org.eclipse.xtext.validation.ComposedChecks;\\n@ComposedChecks(validators= {org.eclipse.xtext.validation.NamesAreUniqueValidator.class})\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -6,7 +6,9 @@\\n import java.util.ArrayList;\\n import java.util.List;\\n import org.eclipse.emf.ecore.EPackage;\\n+import org.eclipse.xtext.validation.ComposedChecks;\\n \\n+@ComposedChecks(validators= {org.eclipse.xtext.validation.NamesAreUniqueValidator.class})\\n public class AbstractIntentSpecificationValidator extends org.eclipse.xtext.validation.AbstractDeclarativeValidator {\\n \\n \\t@Override\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FAbstractIntentSpecificationValidator.java\",\n \"sha\": \"a9fbf6bc5f88b6795db0461bab75320ce7150d8a\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FGenerateIntentSpecification.mwe2\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FGenerateIntentSpecification.mwe2?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 1,\n \"filename\": \"net.certware.intent/src/net/certware/intent/GenerateIntentSpecification.mwe2\",\n \"new_code\": \"\\t\\t\\t\\tcomposedCheck = \\\"org.eclipse.xtext.validation.NamesAreUniqueValidator\\\"\",\n \"new_methods\": [],\n \"old_code\": \" \\t\\t// composedCheck = \\\"org.eclipse.xtext.validation.NamesAreUniqueValidator\\\"\",\n \"old_methods\": [],\n \"patch\": \"@@ -72,7 +72,7 @@ Workflow {\\n \\t\\t// Xtend-based API for validation\\n \\t\\tfragment = validation.ValidatorFragment auto-inject {\\n \\t\\t// composedCheck = \\\"org.eclipse.xtext.validation.ImportUriValidator\\\"\\n- \\t\\t// composedCheck = \\\"org.eclipse.xtext.validation.NamesAreUniqueValidator\\\"\\n+\\t\\t\\t\\tcomposedCheck = \\\"org.eclipse.xtext.validation.NamesAreUniqueValidator\\\"\\n \\t\\t}\\n \\n \\t\\t// old scoping and exporting API\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FGenerateIntentSpecification.mwe2\",\n \"sha\": \"4f8023b917cb702ee5648856888b6b276f59f3a9\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 12,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.xtext\",\n \"changes\": 72,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.xtext?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 60,\n \"filename\": \"net.certware.intent/src/net/certware/intent/IntentSpecification.xtext\",\n \"new_code\": \"\\tname=ID\\n\\tname=ID\\n\\tname=ID\\n\\ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\\n\\tname=ID\\n\\ttypeName=('environment' | 'operator' | 'system' | 'verification')\\n\\ttypeName=('condition' | 'figure' | 'break' | 'model' | 'paragraph' | 'section' | 'table')\\n\\tname=ID\\n\\ttypeName=('output' | 'mode' | 'state' | 'macro' | 'function' | 'input')\\t\\n\\tname=ID\\n\\ttypeName=('requirement' | 'goal' | 'hazard' | 'constraint')\\t\\n\\tname=ID\",\n \"new_methods\": [],\n \"old_code\": \"\\tid=ID\\n\\tid=ID\\n\\tid=ID\\n\\t'basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation'\\n\\tid=ID\\n\\t'environment' | 'operator' | 'system' | 'verification'\\n\\t'condition' | 'figure' | 'break' | 'model' | 'paragraph' | 'section' | 'table'\\n\\tid=ID\\n\\t'output' | 'mode' | 'state' | 'macro' | 'function' | 'input'\\t\\n\\tid=ID\\n\\t'requirement' | 'goal' | 'hazard' | 'constraint'\\t\\n\\tid=ID\\n\\n\\n/* \\nLevel0:\\n\\t{Level0}\\n\\t'{'\\n\\t\\t('Program Plan' pmp=Document)?\\n\\t\\t('Safety Plan' safetyPlan=Document)?\\n\\t\\t('Accident Definition' accidentDefinition=Document)?\\n\\t\\t('Safety Policy' safetyPolicy=Document)?\\n\\t'}'\\n;\\n\\nLevel1:\\n\\t{Level1}\\n\\t'{'\\n\\t\\t('Introduction' introduction=Document)?\\n\\t\\t('Historical' historical=Document)?\\n\\t\\t('Environment' environment=Document)?\\n\\t\\t('Goals' '(' goals+=GoalItem* ')' )?\\n\\t\\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\\n\\t\\t('System Limitations' limitations=Document)?\\n\\t\\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\\n\\t\\t('Hazard Analysis' hazardAnalysis=Document)?\\n\\t\\t('Hazard List' '(' hazardList+=HazardItem* ')')?\\n\\t\\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\\n\\t\\t('Verification and Validation' verification=Document)?\\n\\t'}'\\n;\\n\\n\\nLevel2:\\n\\tdesc=STRING\\n\\t'{'\\n\\t'}'\\t\\n;\\n\\nLevel3:\\n\\tdesc=STRING\\n\\t'{'\\n\\t\\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\\n\\t\\t('User Model' '(' userModels+=ModelItem* ')' )?\\n\\t\\t('Verification and Validation' verification=Document )?\\n\\t'}'\\n;\\n\\n\\n*/\",\n \"old_methods\": [],\n \"patch\": \"@@ -12,7 +12,7 @@ generate intentSpecification \\\"http://www.certware.net/intent/IntentSpecification\\n */\\n Specification:\\n \\t'specification'\\n-\\tid=ID\\n+\\tname=ID\\n \\trefinements+=Refinement+\\n ;\\n \\n@@ -21,7 +21,7 @@ Specification:\\n */\\n Refinement:\\n \\t'refinement'\\n-\\tid=ID\\n+\\tname=ID\\n \\tdesc=STRING\\n \\tintents+=Intent+\\t\\n ;\\t\\n@@ -31,7 +31,7 @@ Refinement:\\n */\\n Intent:\\n \\ttype=IntentType\\n-\\tid=ID\\n+\\tname=ID\\n \\tdesc=STRING\\n \\tdecompositions+=Decomposition+\\t\\n ;\\n@@ -42,113 +42,65 @@ Intent:\\n * A proper intention specification should contain an intent of each type in each refinement.\\n */\\n IntentType:\\n-\\t'basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation'\\n+\\ttypeName=('basic' | 'purpose' | 'principles' | 'models' | 'design' | 'implementation' | 'operation')\\n ;\\n \\n /*\\n * A decomposition has a type and consists of one or more models, documents, or items.\\n */\\n Decomposition:\\n \\ttype=DecompositionType\\n-\\tid=ID\\n+\\tname=ID\\n \\tdesc=STRING\\n \\t('{' documents+=Document* '}')?\\n \\t('[' models+=ModelItem* ']')?\\n \\t('(' items+=ListItem* ')')?\\n ;\\n \\n DecompositionType:\\n-\\t'environment' | 'operator' | 'system' | 'verification'\\n+\\ttypeName=('environment' | 'operator' | 'system' | 'verification')\\n ;\\n \\n Document:\\n \\t'{' entries += DocItem+ '}'\\n ;\\n \\n DocItemType:\\n-\\t'condition' | 'figure' | 'break' | 'model' | 'paragraph' | 'section' | 'table'\\n+\\ttypeName=('condition' | 'figure' | 'break' | 'model' | 'paragraph' | 'section' | 'table')\\n ;\\n \\n DocItem :\\n \\ttype=DocItemType\\n-\\tid=ID\\n+\\tname=ID\\n \\tref=STRING\\n \\t';'\\n ;\\n \\n ModelType:\\n-\\t'output' | 'mode' | 'state' | 'macro' | 'function' | 'input'\\t\\n+\\ttypeName=('output' | 'mode' | 'state' | 'macro' | 'function' | 'input')\\t\\n ;\\n \\n ModelItem:\\n \\ttype=ModelType\\n-\\tid=ID\\n+\\tname=ID\\n \\tdesc=STRING\\n \\t';'\\n ;\\n \\n ListItemType:\\n-\\t'requirement' | 'goal' | 'hazard' | 'constraint'\\t\\n+\\ttypeName=('requirement' | 'goal' | 'hazard' | 'constraint')\\t\\n ;\\n \\n /*\\n * A list item has a type, description and lists of references.\\n */\\n ListItem:\\n \\ttype=ListItemType\\n-\\tid=ID\\n+\\tname=ID\\n \\tdesc=STRING\\n \\t('{' docReferences+=[DocItem]+ '}' )?\\n \\t('(' itemReferences+=[ListItem]+ ')' )?\\n \\t('[' modelReferences+=[ModelItem]+ ']' )?\\n \\t';'\\n ;\\n \\n-\\n-\\n-/* \\n-Level0:\\n-\\t{Level0}\\n-\\t'{'\\n-\\t\\t('Program Plan' pmp=Document)?\\n-\\t\\t('Safety Plan' safetyPlan=Document)?\\n-\\t\\t('Accident Definition' accidentDefinition=Document)?\\n-\\t\\t('Safety Policy' safetyPolicy=Document)?\\n-\\t'}'\\n-;\\n-\\n-Level1:\\n-\\t{Level1}\\n-\\t'{'\\n-\\t\\t('Introduction' introduction=Document)?\\n-\\t\\t('Historical' historical=Document)?\\n-\\t\\t('Environment' environment=Document)?\\n-\\t\\t('Goals' '(' goals+=GoalItem* ')' )?\\n-\\t\\t('High-Level Requirements' '(' highLevelReqs+=RequirementItem* ')' )?\\n-\\t\\t('System Limitations' limitations=Document)?\\n-\\t\\t('Operator Requirements' '(' opReq+=RequirementItem* ')' )?\\n-\\t\\t('Hazard Analysis' hazardAnalysis=Document)?\\n-\\t\\t('Hazard List' '(' hazardList+=HazardItem* ')')?\\n-\\t\\t('Design Constraints' '(' constraints+=ConstraintItem* ')' )?\\n-\\t\\t('Verification and Validation' verification=Document)?\\n-\\t'}'\\n-;\\n-\\n-\\n-Level2:\\n-\\tdesc=STRING\\n-\\t'{'\\n-\\t'}'\\t\\n-;\\n-\\n-Level3:\\n-\\tdesc=STRING\\n-\\t'{'\\n-\\t\\t('System Blackbox Behavior' '(' behaviors+=ModelItem* ')' )?\\n-\\t\\t('User Model' '(' userModels+=ModelItem* ')' )?\\n-\\t\\t('Verification and Validation' verification=Document )?\\n-\\t'}'\\n-;\\n-\\n-\\n-*/\\n\\\\ No newline at end of file\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2FIntentSpecification.xtext\",\n \"sha\": \"328aadf18fab8c0509bd3935eeef66ac75dcf46f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 137,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.xtend\",\n \"changes\": 148,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.xtend?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 11,\n \"filename\": \"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend\",\n \"new_code\": \"\\nimport net.certware.intent.intentSpecification.Intent\\nimport net.certware.intent.intentSpecification.IntentSpecificationPackage\\nimport net.certware.intent.intentSpecification.Refinement\\nimport org.eclipse.xtext.validation.Check\\nimport net.certware.intent.intentSpecification.Decomposition\\nimport net.certware.intent.intentSpecification.ListItem\\nimport net.certware.intent.intentSpecification.ModelItem\\n\\tpublic static val UNIQUE_INTENTS_REFINEMENT = \\\"net.certware.intent.UniqueIntentsRefinement\\\";\\n\\tpublic static val UNIQUE_DECOMPOSITION_INTENT = \\\"net.certware.intent.UniqueDecompositionIntent\\\";\\n\\tpublic static val UNIQUE_LIST_ITEM_DECOMPOSITION = \\\"net.certware.intent.UniqueListItemDecomposition\\\";\\n\\tpublic static val UNIQUE_MODEL_ITEM_DECOMPOSITION = \\\"net.certware.intent.UniqueModelItemDecomposition\\\";\\n\\tpublic static val UNIQUE_LIST_ITEM_LIST_ITEM = \\\"net.certware.intent.UniqueListItemListItem\\\";\\n\\tpublic static val UNIQUE_MODEL_ITEM_LIST_ITEM = \\\"net.certware.intent.UniqueModelItemListItem\\\";\\n\\t\\n @Check\\n def checkUniqueIntentsInRefinement(Refinement refinement) {\\n \\t// for each intent type ensure it appears only once in a refinement\\n \\tval visitedIntentTypeNames = newHashSet()\\n \\t\\n \\tvar intents = refinement.intents\\n \\tvar i = intents.listIterator\\n \\twhile ( i.hasNext ) {\\n \\t\\tvar d = i.next as Intent\\n \\t\\tvar typeName = d.getType().getTypeName()\\n \\t\\tif ( visitedIntentTypeNames.contains(typeName)) {\\n \\t\\t\\twarning(\\\"duplicate intent type '\\\"+typeName+\\\"' in refinement\\\",\\n \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.refinement_Intents,\\n \\t\\t\\t\\tUNIQUE_INTENTS_REFINEMENT,\\n \\t\\t\\t\\td.name\\n \\t\\t\\t)\\n \\t\\t}\\n\\t\\t\\tvisitedIntentTypeNames.add(typeName)\\n \\t}\\n }\\n \\n @Check\\n def checkUniqueDecompositionInIntent(Intent intent) {\\n \\t// for each decomposition type ensure it appears only once in an intent\\n \\tval visitedDecompositionTypeNames = newHashSet()\\n \\t\\n \\tvar decompositions = intent.getDecompositions()\\n \\tvar i = decompositions.listIterator\\n \\twhile ( i.hasNext ) {\\n \\t\\tvar d = i.next as Decomposition\\n \\t\\tvar typeName = d.getType().getTypeName()\\n \\t\\tif ( visitedDecompositionTypeNames.contains(typeName)) {\\n \\t\\t\\twarning(\\\"duplicate decomposition type '\\\"+typeName+\\\"' in intent\\\",\\n \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.intent_Decompositions,\\n \\t\\t\\t\\tUNIQUE_DECOMPOSITION_INTENT,\\n \\t\\t\\t\\td.name\\n \\t\\t\\t)\\n \\t\\t}\\n\\t\\t\\tvisitedDecompositionTypeNames.add(typeName)\\n \\t}\\n }\\n \\n @Check\\n def checkUniqueListItemInDecomposition(Decomposition decomposition) {\\n \\t// for each list item it appears only once in a decomposition list\\n \\tval visitedListItems = newHashSet()\\n \\t\\n \\tvar items = decomposition.items\\n \\tvar i = items.listIterator\\n \\twhile ( i.hasNext ) {\\n \\t\\tvar d = i.next\\n \\t\\tif ( visitedListItems.contains(d)) {\\n \\t\\t\\twarning(\\\"duplicate item reference '\\\"+d.name+\\\"' in list\\\",\\n \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.decomposition_Items,\\n \\t\\t\\t\\tUNIQUE_LIST_ITEM_DECOMPOSITION,\\n \\t\\t\\t\\td.name\\n \\t\\t\\t)\\n \\t\\t}\\n\\t\\t\\tvisitedListItems.add(d)\\n \\t}\\n }\\n \\n @Check\\n def checkUniqueModelItemInDecomposition(Decomposition decomposition) {\\n \\t// for each model item it appears only once in a decomposition list\\n \\tval visitedModelItems = newHashSet()\\n \\t\\n \\tvar items = decomposition.models\\n \\tvar i = items.listIterator\\n \\twhile ( i.hasNext ) {\\n \\t\\tvar d = i.next as ModelItem\\n \\t\\tif ( visitedModelItems.contains(d)) {\\n \\t\\t\\twarning(\\\"duplicate item reference '\\\"+d.name+\\\"' in models\\\",\\n \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.decomposition_Models,\\n \\t\\t\\t\\tUNIQUE_MODEL_ITEM_DECOMPOSITION,\\n \\t\\t\\t\\td.name\\n \\t\\t\\t)\\n \\t\\t}\\n\\t\\t\\tvisitedModelItems.add(d)\\n \\t}\\n }\\n \\n @Check\\n def checkUniqueListItemInListItem(ListItem item) {\\n \\t// for each list item it appears only once in an item list\\n \\tval visitedListItems = newHashSet()\\n \\tvisitedListItems.add(item) // add self, preclude from referencing in item list\\n \\t\\n \\tvar items = item.itemReferences\\n \\tvar i = items.listIterator\\n \\twhile ( i.hasNext ) {\\n \\t\\tvar d = i.next as ListItem\\n \\t\\tif ( visitedListItems.contains(d)) {\\n \\t\\t\\twarning(\\\"duplicate item reference '\\\"+d.name+\\\"' in items\\\",\\n \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.listItem_ItemReferences,\\n \\t\\t\\t\\tUNIQUE_LIST_ITEM_LIST_ITEM,\\n\\t\\t\\t\\t\\td.name \\t\\t\\t\\t \\n \\t\\t\\t)\\n \\t\\t}\\n\\t\\t\\tvisitedListItems.add(d)\\n \\t}\\n }\\n \\n @Check\\n def checkUniqueModelItemInListItem(ListItem item) {\\n \\t// for each model item it appears only once in an model list\\n \\tval visitedModelItems = newHashSet()\\n \\t\\n \\tvar items = item.modelReferences\\n \\tvar i = items.listIterator\\n \\twhile ( i.hasNext ) {\\n \\t\\tvar d = i.next as ModelItem\\n \\t\\tif ( visitedModelItems.contains(d)) {\\n \\t\\t\\twarning(\\\"duplicate model reference '\\\"+d.name+\\\"' in models\\\",\\n \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.listItem_ModelReferences,\\n \\t\\t\\t\\tUNIQUE_MODEL_ITEM_LIST_ITEM,\\n \\t\\t\\t\\td.name\\n \\t\\t\\t)\\n \\t\\t}\\n\\t\\t\\tvisitedModelItems.add(d)\\n \\t}\\n }\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"Refinement refinement\"\n ],\n \"filename\": \"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend\",\n \"implementation\": \"// for each intent type ensure it appears only once in a refinement\\n \\tval visitedIntentTypeNames = newHashSet()\\n \\t\\n \\tvar intents = refinement.intents\\n \\tvar i = intents.listIterator\\n \\twhile ( i.hasNext ) {\\n \\t\\tvar d = i.next as Intent\\n \\t\\tvar typeName = d.getType().getTypeName()\\n \\t\\tif ( visitedIntentTypeNames.contains(typeName)) {\\n \\t\\t\\twarning(\\\"duplicate intent type '\\\"+typeName+\\\"' in refinement\\\",\\n \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.refinement_Intents,\\n \\t\\t\\t\\tUNIQUE_INTENTS_REFINEMENT,\\n \\t\\t\\t\\td.name\\n \\t\\t\\t)\",\n \"signature\": \"def checkUniqueIntentsInRefinement(Refinement refinement)\"\n },\n {\n \"arguments\": [\n \"Intent intent\"\n ],\n \"filename\": \"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend\",\n \"implementation\": \"// for each decomposition type ensure it appears only once in an intent\\n \\tval visitedDecompositionTypeNames = newHashSet()\\n \\t\\n \\tvar decompositions = intent.getDecompositions()\\n \\tvar i = decompositions.listIterator\\n \\twhile ( i.hasNext ) {\\n \\t\\tvar d = i.next as Decomposition\\n \\t\\tvar typeName = d.getType().getTypeName()\\n \\t\\tif ( visitedDecompositionTypeNames.contains(typeName)) {\\n \\t\\t\\twarning(\\\"duplicate decomposition type '\\\"+typeName+\\\"' in intent\\\",\\n \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.intent_Decompositions,\\n \\t\\t\\t\\tUNIQUE_DECOMPOSITION_INTENT,\\n \\t\\t\\t\\td.name\\n \\t\\t\\t)\",\n \"signature\": \"def checkUniqueDecompositionInIntent(Intent intent)\"\n },\n {\n \"arguments\": [\n \"Decomposition decomposition\"\n ],\n \"filename\": \"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend\",\n \"implementation\": \"// for each list item it appears only once in a decomposition list\\n \\tval visitedListItems = newHashSet()\\n \\t\\n \\tvar items = decomposition.items\\n \\tvar i = items.listIterator\\n \\twhile ( i.hasNext ) {\\n \\t\\tvar d = i.next\\n \\t\\tif ( visitedListItems.contains(d)) {\\n \\t\\t\\twarning(\\\"duplicate item reference '\\\"+d.name+\\\"' in list\\\",\\n \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.decomposition_Items,\\n \\t\\t\\t\\tUNIQUE_LIST_ITEM_DECOMPOSITION,\\n \\t\\t\\t\\td.name\\n \\t\\t\\t)\",\n \"signature\": \"def checkUniqueListItemInDecomposition(Decomposition decomposition)\"\n },\n {\n \"arguments\": [\n \"Decomposition decomposition\"\n ],\n \"filename\": \"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend\",\n \"implementation\": \"// for each model item it appears only once in a decomposition list\\n \\tval visitedModelItems = newHashSet()\\n \\t\\n \\tvar items = decomposition.models\\n \\tvar i = items.listIterator\\n \\twhile ( i.hasNext ) {\\n \\t\\tvar d = i.next as ModelItem\\n \\t\\tif ( visitedModelItems.contains(d)) {\\n \\t\\t\\twarning(\\\"duplicate item reference '\\\"+d.name+\\\"' in models\\\",\\n \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.decomposition_Models,\\n \\t\\t\\t\\tUNIQUE_MODEL_ITEM_DECOMPOSITION,\\n \\t\\t\\t\\td.name\\n \\t\\t\\t)\",\n \"signature\": \"def checkUniqueModelItemInDecomposition(Decomposition decomposition)\"\n },\n {\n \"arguments\": [\n \"ListItem item\"\n ],\n \"filename\": \"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend\",\n \"implementation\": \"// for each list item it appears only once in an item list\\n \\tval visitedListItems = newHashSet()\\n \\tvisitedListItems.add(item) // add self, preclude from referencing in item list\\n \\t\\n \\tvar items = item.itemReferences\\n \\tvar i = items.listIterator\\n \\twhile ( i.hasNext ) {\\n \\t\\tvar d = i.next as ListItem\\n \\t\\tif ( visitedListItems.contains(d)) {\\n \\t\\t\\twarning(\\\"duplicate item reference '\\\"+d.name+\\\"' in items\\\",\\n \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.listItem_ItemReferences,\\n \\t\\t\\t\\tUNIQUE_LIST_ITEM_LIST_ITEM,\\n\\t\\t\\t\\t\\td.name \\t\\t\\t\\t \\n \\t\\t\\t)\",\n \"signature\": \"def checkUniqueListItemInListItem(ListItem item)\"\n },\n {\n \"arguments\": [\n \"ListItem item\"\n ],\n \"filename\": \"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend\",\n \"implementation\": \"// for each model item it appears only once in an model list\\n \\tval visitedModelItems = newHashSet()\\n \\t\\n \\tvar items = item.modelReferences\\n \\tvar i = items.listIterator\\n \\twhile ( i.hasNext ) {\\n \\t\\tvar d = i.next as ModelItem\\n \\t\\tif ( visitedModelItems.contains(d)) {\\n \\t\\t\\twarning(\\\"duplicate model reference '\\\"+d.name+\\\"' in models\\\",\\n \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.listItem_ModelReferences,\\n \\t\\t\\t\\tUNIQUE_MODEL_ITEM_LIST_ITEM,\\n \\t\\t\\t\\td.name\\n \\t\\t\\t)\",\n \"signature\": \"def checkUniqueModelItemInListItem(ListItem item)\"\n }\n ],\n \"old_code\": \"//import org.eclipse.xtext.validation.Check\\n// public static val INVALID_NAME = 'invalidName'\\n//\\n//\\t@Check\\n//\\tdef checkGreetingStartsWithCapital(Greeting greeting) {\\n//\\t\\tif (!Character.isUpperCase(greeting.name.charAt(0))) {\\n//\\t\\t\\twarning('Name should start with a capital', \\n//\\t\\t\\t\\t\\tMyDslPackage.Literals.GREETING__NAME,\\n//\\t\\t\\t\\t\\tINVALID_NAME)\\n//\\t\\t}\\n//\\t}\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"Greeting greeting\"\n ],\n \"filename\": \"net.certware.intent/src/net/certware/intent/validation/IntentSpecificationValidator.xtend\",\n \"implementation\": \"//\\t\\tif (!Character.isUpperCase(greeting.name.charAt(0))) {\\n//\\t\\t\\twarning('Name should start with a capital', \\n//\\t\\t\\t\\t\\tMyDslPackage.Literals.GREETING__NAME,\\n//\\t\\t\\t\\t\\tINVALID_NAME)\\n//\",\n \"signature\": \"def checkGreetingStartsWithCapital(Greeting greeting)\"\n }\n ],\n \"patch\": \"@@ -2,7 +2,14 @@\\n * generated by Xtext\\n */\\n package net.certware.intent.validation\\n-//import org.eclipse.xtext.validation.Check\\n+\\n+import net.certware.intent.intentSpecification.Intent\\n+import net.certware.intent.intentSpecification.IntentSpecificationPackage\\n+import net.certware.intent.intentSpecification.Refinement\\n+import org.eclipse.xtext.validation.Check\\n+import net.certware.intent.intentSpecification.Decomposition\\n+import net.certware.intent.intentSpecification.ListItem\\n+import net.certware.intent.intentSpecification.ModelItem\\n \\n /**\\n * Custom validation rules. \\n@@ -11,14 +18,133 @@ package net.certware.intent.validation\\n */\\n class IntentSpecificationValidator extends AbstractIntentSpecificationValidator {\\n \\n-// public static val INVALID_NAME = 'invalidName'\\n-//\\n-//\\t@Check\\n-//\\tdef checkGreetingStartsWithCapital(Greeting greeting) {\\n-//\\t\\tif (!Character.isUpperCase(greeting.name.charAt(0))) {\\n-//\\t\\t\\twarning('Name should start with a capital', \\n-//\\t\\t\\t\\t\\tMyDslPackage.Literals.GREETING__NAME,\\n-//\\t\\t\\t\\t\\tINVALID_NAME)\\n-//\\t\\t}\\n-//\\t}\\n+\\tpublic static val UNIQUE_INTENTS_REFINEMENT = \\\"net.certware.intent.UniqueIntentsRefinement\\\";\\n+\\tpublic static val UNIQUE_DECOMPOSITION_INTENT = \\\"net.certware.intent.UniqueDecompositionIntent\\\";\\n+\\tpublic static val UNIQUE_LIST_ITEM_DECOMPOSITION = \\\"net.certware.intent.UniqueListItemDecomposition\\\";\\n+\\tpublic static val UNIQUE_MODEL_ITEM_DECOMPOSITION = \\\"net.certware.intent.UniqueModelItemDecomposition\\\";\\n+\\tpublic static val UNIQUE_LIST_ITEM_LIST_ITEM = \\\"net.certware.intent.UniqueListItemListItem\\\";\\n+\\tpublic static val UNIQUE_MODEL_ITEM_LIST_ITEM = \\\"net.certware.intent.UniqueModelItemListItem\\\";\\n+\\t\\n+ @Check\\n+ def checkUniqueIntentsInRefinement(Refinement refinement) {\\n+ \\t// for each intent type ensure it appears only once in a refinement\\n+ \\tval visitedIntentTypeNames = newHashSet()\\n+ \\t\\n+ \\tvar intents = refinement.intents\\n+ \\tvar i = intents.listIterator\\n+ \\twhile ( i.hasNext ) {\\n+ \\t\\tvar d = i.next as Intent\\n+ \\t\\tvar typeName = d.getType().getTypeName()\\n+ \\t\\tif ( visitedIntentTypeNames.contains(typeName)) {\\n+ \\t\\t\\twarning(\\\"duplicate intent type '\\\"+typeName+\\\"' in refinement\\\",\\n+ \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.refinement_Intents,\\n+ \\t\\t\\t\\tUNIQUE_INTENTS_REFINEMENT,\\n+ \\t\\t\\t\\td.name\\n+ \\t\\t\\t)\\n+ \\t\\t}\\n+\\t\\t\\tvisitedIntentTypeNames.add(typeName)\\n+ \\t}\\n+ }\\n+ \\n+ @Check\\n+ def checkUniqueDecompositionInIntent(Intent intent) {\\n+ \\t// for each decomposition type ensure it appears only once in an intent\\n+ \\tval visitedDecompositionTypeNames = newHashSet()\\n+ \\t\\n+ \\tvar decompositions = intent.getDecompositions()\\n+ \\tvar i = decompositions.listIterator\\n+ \\twhile ( i.hasNext ) {\\n+ \\t\\tvar d = i.next as Decomposition\\n+ \\t\\tvar typeName = d.getType().getTypeName()\\n+ \\t\\tif ( visitedDecompositionTypeNames.contains(typeName)) {\\n+ \\t\\t\\twarning(\\\"duplicate decomposition type '\\\"+typeName+\\\"' in intent\\\",\\n+ \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.intent_Decompositions,\\n+ \\t\\t\\t\\tUNIQUE_DECOMPOSITION_INTENT,\\n+ \\t\\t\\t\\td.name\\n+ \\t\\t\\t)\\n+ \\t\\t}\\n+\\t\\t\\tvisitedDecompositionTypeNames.add(typeName)\\n+ \\t}\\n+ }\\n+ \\n+ @Check\\n+ def checkUniqueListItemInDecomposition(Decomposition decomposition) {\\n+ \\t// for each list item it appears only once in a decomposition list\\n+ \\tval visitedListItems = newHashSet()\\n+ \\t\\n+ \\tvar items = decomposition.items\\n+ \\tvar i = items.listIterator\\n+ \\twhile ( i.hasNext ) {\\n+ \\t\\tvar d = i.next\\n+ \\t\\tif ( visitedListItems.contains(d)) {\\n+ \\t\\t\\twarning(\\\"duplicate item reference '\\\"+d.name+\\\"' in list\\\",\\n+ \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.decomposition_Items,\\n+ \\t\\t\\t\\tUNIQUE_LIST_ITEM_DECOMPOSITION,\\n+ \\t\\t\\t\\td.name\\n+ \\t\\t\\t)\\n+ \\t\\t}\\n+\\t\\t\\tvisitedListItems.add(d)\\n+ \\t}\\n+ }\\n+ \\n+ @Check\\n+ def checkUniqueModelItemInDecomposition(Decomposition decomposition) {\\n+ \\t// for each model item it appears only once in a decomposition list\\n+ \\tval visitedModelItems = newHashSet()\\n+ \\t\\n+ \\tvar items = decomposition.models\\n+ \\tvar i = items.listIterator\\n+ \\twhile ( i.hasNext ) {\\n+ \\t\\tvar d = i.next as ModelItem\\n+ \\t\\tif ( visitedModelItems.contains(d)) {\\n+ \\t\\t\\twarning(\\\"duplicate item reference '\\\"+d.name+\\\"' in models\\\",\\n+ \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.decomposition_Models,\\n+ \\t\\t\\t\\tUNIQUE_MODEL_ITEM_DECOMPOSITION,\\n+ \\t\\t\\t\\td.name\\n+ \\t\\t\\t)\\n+ \\t\\t}\\n+\\t\\t\\tvisitedModelItems.add(d)\\n+ \\t}\\n+ }\\n+ \\n+ @Check\\n+ def checkUniqueListItemInListItem(ListItem item) {\\n+ \\t// for each list item it appears only once in an item list\\n+ \\tval visitedListItems = newHashSet()\\n+ \\tvisitedListItems.add(item) // add self, preclude from referencing in item list\\n+ \\t\\n+ \\tvar items = item.itemReferences\\n+ \\tvar i = items.listIterator\\n+ \\twhile ( i.hasNext ) {\\n+ \\t\\tvar d = i.next as ListItem\\n+ \\t\\tif ( visitedListItems.contains(d)) {\\n+ \\t\\t\\twarning(\\\"duplicate item reference '\\\"+d.name+\\\"' in items\\\",\\n+ \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.listItem_ItemReferences,\\n+ \\t\\t\\t\\tUNIQUE_LIST_ITEM_LIST_ITEM,\\n+\\t\\t\\t\\t\\td.name \\t\\t\\t\\t \\n+ \\t\\t\\t)\\n+ \\t\\t}\\n+\\t\\t\\tvisitedListItems.add(d)\\n+ \\t}\\n+ }\\n+ \\n+ @Check\\n+ def checkUniqueModelItemInListItem(ListItem item) {\\n+ \\t// for each model item it appears only once in an model list\\n+ \\tval visitedModelItems = newHashSet()\\n+ \\t\\n+ \\tvar items = item.modelReferences\\n+ \\tvar i = items.listIterator\\n+ \\twhile ( i.hasNext ) {\\n+ \\t\\tvar d = i.next as ModelItem\\n+ \\t\\tif ( visitedModelItems.contains(d)) {\\n+ \\t\\t\\twarning(\\\"duplicate model reference '\\\"+d.name+\\\"' in models\\\",\\n+ \\t\\t\\t\\tIntentSpecificationPackage::eINSTANCE.listItem_ModelReferences,\\n+ \\t\\t\\t\\tUNIQUE_MODEL_ITEM_LIST_ITEM,\\n+ \\t\\t\\t\\td.name\\n+ \\t\\t\\t)\\n+ \\t\\t}\\n+\\t\\t\\tvisitedModelItems.add(d)\\n+ \\t}\\n+ }\\n }\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fsrc%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.xtend\",\n \"sha\": \"2948f9fdbdfa797be196d1a50778131fbdd19d07\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 195,\n \"blob_url\": \"https://github.com/nasa/CertWare/blob/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.java\",\n \"changes\": 195,\n \"contents_url\": \"https://api.github.com/repos/nasa/CertWare/contents/net.certware.intent%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.java?ref=27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9\",\n \"deletions\": 0,\n \"filename\": \"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java\",\n \"new_code\": \"import java.util.HashSet;\\nimport java.util.ListIterator;\\nimport net.certware.intent.intentSpecification.Decomposition;\\nimport net.certware.intent.intentSpecification.DecompositionType;\\nimport net.certware.intent.intentSpecification.Intent;\\nimport net.certware.intent.intentSpecification.IntentSpecificationPackage;\\nimport net.certware.intent.intentSpecification.IntentType;\\nimport net.certware.intent.intentSpecification.ListItem;\\nimport net.certware.intent.intentSpecification.ModelItem;\\nimport net.certware.intent.intentSpecification.Refinement;\\nimport org.eclipse.emf.common.util.EList;\\nimport org.eclipse.emf.ecore.EReference;\\nimport org.eclipse.xtext.validation.Check;\\nimport org.eclipse.xtext.xbase.lib.CollectionLiterals;\\n public final static String UNIQUE_INTENTS_REFINEMENT = \\\"net.certware.intent.UniqueIntentsRefinement\\\";\\n \\n public final static String UNIQUE_DECOMPOSITION_INTENT = \\\"net.certware.intent.UniqueDecompositionIntent\\\";\\n \\n public final static String UNIQUE_LIST_ITEM_DECOMPOSITION = \\\"net.certware.intent.UniqueListItemDecomposition\\\";\\n \\n public final static String UNIQUE_MODEL_ITEM_DECOMPOSITION = \\\"net.certware.intent.UniqueModelItemDecomposition\\\";\\n \\n public final static String UNIQUE_LIST_ITEM_LIST_ITEM = \\\"net.certware.intent.UniqueListItemListItem\\\";\\n \\n public final static String UNIQUE_MODEL_ITEM_LIST_ITEM = \\\"net.certware.intent.UniqueModelItemListItem\\\";\\n \\n @Check\\n public void checkUniqueIntentsInRefinement(final Refinement refinement) {\\n final HashSet visitedIntentTypeNames = CollectionLiterals.newHashSet();\\n EList intents = refinement.getIntents();\\n ListIterator i = intents.listIterator();\\n boolean _hasNext = i.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n Intent _next = i.next();\\n Intent d = ((Intent) _next);\\n IntentType _type = d.getType();\\n String typeName = _type.getTypeName();\\n boolean _contains = visitedIntentTypeNames.contains(typeName);\\n if (_contains) {\\n String _plus = (\\\"duplicate intent type \\\\'\\\" + typeName);\\n String _plus_1 = (_plus + \\\"\\\\' in refinement\\\");\\n EReference _refinement_Intents = IntentSpecificationPackage.eINSTANCE.getRefinement_Intents();\\n String _name = d.getName();\\n this.warning(_plus_1, _refinement_Intents, \\n IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT, _name);\\n }\\n visitedIntentTypeNames.add(typeName);\\n }\\n boolean _hasNext_1 = i.hasNext();\\n _while = _hasNext_1;\\n }\\n }\\n \\n @Check\\n public void checkUniqueDecompositionInIntent(final Intent intent) {\\n final HashSet visitedDecompositionTypeNames = CollectionLiterals.newHashSet();\\n EList decompositions = intent.getDecompositions();\\n ListIterator i = decompositions.listIterator();\\n boolean _hasNext = i.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n Decomposition _next = i.next();\\n Decomposition d = ((Decomposition) _next);\\n DecompositionType _type = d.getType();\\n String typeName = _type.getTypeName();\\n boolean _contains = visitedDecompositionTypeNames.contains(typeName);\\n if (_contains) {\\n String _plus = (\\\"duplicate decomposition type \\\\'\\\" + typeName);\\n String _plus_1 = (_plus + \\\"\\\\' in intent\\\");\\n EReference _intent_Decompositions = IntentSpecificationPackage.eINSTANCE.getIntent_Decompositions();\\n String _name = d.getName();\\n this.warning(_plus_1, _intent_Decompositions, \\n IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT, _name);\\n }\\n visitedDecompositionTypeNames.add(typeName);\\n }\\n boolean _hasNext_1 = i.hasNext();\\n _while = _hasNext_1;\\n }\\n }\\n \\n @Check\\n public void checkUniqueListItemInDecomposition(final Decomposition decomposition) {\\n final HashSet visitedListItems = CollectionLiterals.newHashSet();\\n EList items = decomposition.getItems();\\n ListIterator i = items.listIterator();\\n boolean _hasNext = i.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n ListItem d = i.next();\\n boolean _contains = visitedListItems.contains(d);\\n if (_contains) {\\n String _name = d.getName();\\n String _plus = (\\\"duplicate item reference \\\\'\\\" + _name);\\n String _plus_1 = (_plus + \\\"\\\\' in list\\\");\\n EReference _decomposition_Items = IntentSpecificationPackage.eINSTANCE.getDecomposition_Items();\\n String _name_1 = d.getName();\\n this.warning(_plus_1, _decomposition_Items, \\n IntentSpecificationValidator.UNIQUE_LIST_ITEM_DECOMPOSITION, _name_1);\\n }\\n visitedListItems.add(d);\\n }\\n boolean _hasNext_1 = i.hasNext();\\n _while = _hasNext_1;\\n }\\n }\\n \\n @Check\\n public void checkUniqueModelItemInDecomposition(final Decomposition decomposition) {\\n final HashSet visitedModelItems = CollectionLiterals.newHashSet();\\n EList items = decomposition.getModels();\\n ListIterator i = items.listIterator();\\n boolean _hasNext = i.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n ModelItem _next = i.next();\\n ModelItem d = ((ModelItem) _next);\\n boolean _contains = visitedModelItems.contains(d);\\n if (_contains) {\\n String _name = d.getName();\\n String _plus = (\\\"duplicate item reference \\\\'\\\" + _name);\\n String _plus_1 = (_plus + \\\"\\\\' in models\\\");\\n EReference _decomposition_Models = IntentSpecificationPackage.eINSTANCE.getDecomposition_Models();\\n String _name_1 = d.getName();\\n this.warning(_plus_1, _decomposition_Models, \\n IntentSpecificationValidator.UNIQUE_MODEL_ITEM_DECOMPOSITION, _name_1);\\n }\\n visitedModelItems.add(d);\\n }\\n boolean _hasNext_1 = i.hasNext();\\n _while = _hasNext_1;\\n }\\n }\\n \\n @Check\\n public void checkUniqueListItemInListItem(final ListItem item) {\\n final HashSet visitedListItems = CollectionLiterals.newHashSet();\\n visitedListItems.add(item);\\n EList items = item.getItemReferences();\\n ListIterator i = items.listIterator();\\n boolean _hasNext = i.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n ListItem _next = i.next();\\n ListItem d = ((ListItem) _next);\\n boolean _contains = visitedListItems.contains(d);\\n if (_contains) {\\n String _name = d.getName();\\n String _plus = (\\\"duplicate item reference \\\\'\\\" + _name);\\n String _plus_1 = (_plus + \\\"\\\\' in items\\\");\\n EReference _listItem_ItemReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ItemReferences();\\n String _name_1 = d.getName();\\n this.warning(_plus_1, _listItem_ItemReferences, \\n IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM, _name_1);\\n }\\n visitedListItems.add(d);\\n }\\n boolean _hasNext_1 = i.hasNext();\\n _while = _hasNext_1;\\n }\\n }\\n \\n @Check\\n public void checkUniqueModelItemInListItem(final ListItem item) {\\n final HashSet visitedModelItems = CollectionLiterals.newHashSet();\\n EList items = item.getModelReferences();\\n ListIterator i = items.listIterator();\\n boolean _hasNext = i.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n ModelItem _next = i.next();\\n ModelItem d = ((ModelItem) _next);\\n boolean _contains = visitedModelItems.contains(d);\\n if (_contains) {\\n String _name = d.getName();\\n String _plus = (\\\"duplicate model reference \\\\'\\\" + _name);\\n String _plus_1 = (_plus + \\\"\\\\' in models\\\");\\n EReference _listItem_ModelReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ModelReferences();\\n String _name_1 = d.getName();\\n this.warning(_plus_1, _listItem_ModelReferences, \\n IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM, _name_1);\\n }\\n visitedModelItems.add(d);\\n }\\n boolean _hasNext_1 = i.hasNext();\\n _while = _hasNext_1;\\n }\\n }\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"final Refinement refinement\"\n ],\n \"filename\": \"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java\",\n \"implementation\": \"final HashSet visitedIntentTypeNames = CollectionLiterals.newHashSet();\\n EList intents = refinement.getIntents();\\n ListIterator i = intents.listIterator();\\n boolean _hasNext = i.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n Intent _next = i.next();\\n Intent d = ((Intent) _next);\\n IntentType _type = d.getType();\\n String typeName = _type.getTypeName();\\n boolean _contains = visitedIntentTypeNames.contains(typeName);\\n if (_contains) {\\n String _plus = (\\\"duplicate intent type \\\\'\\\" + typeName);\\n String _plus_1 = (_plus + \\\"\\\\' in refinement\\\");\\n EReference _refinement_Intents = IntentSpecificationPackage.eINSTANCE.getRefinement_Intents();\\n String _name = d.getName();\\n this.warning(_plus_1, _refinement_Intents, \\n IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT, _name);\",\n \"signature\": \"void checkUniqueIntentsInRefinement(final Refinement refinement)\"\n },\n {\n \"arguments\": [\n \"final Intent intent\"\n ],\n \"filename\": \"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java\",\n \"implementation\": \"final HashSet visitedDecompositionTypeNames = CollectionLiterals.newHashSet();\\n EList decompositions = intent.getDecompositions();\\n ListIterator i = decompositions.listIterator();\\n boolean _hasNext = i.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n Decomposition _next = i.next();\\n Decomposition d = ((Decomposition) _next);\\n DecompositionType _type = d.getType();\\n String typeName = _type.getTypeName();\\n boolean _contains = visitedDecompositionTypeNames.contains(typeName);\\n if (_contains) {\\n String _plus = (\\\"duplicate decomposition type \\\\'\\\" + typeName);\\n String _plus_1 = (_plus + \\\"\\\\' in intent\\\");\\n EReference _intent_Decompositions = IntentSpecificationPackage.eINSTANCE.getIntent_Decompositions();\\n String _name = d.getName();\\n this.warning(_plus_1, _intent_Decompositions, \\n IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT, _name);\",\n \"signature\": \"void checkUniqueDecompositionInIntent(final Intent intent)\"\n },\n {\n \"arguments\": [\n \"final Decomposition decomposition\"\n ],\n \"filename\": \"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java\",\n \"implementation\": \"final HashSet visitedListItems = CollectionLiterals.newHashSet();\\n EList items = decomposition.getItems();\\n ListIterator i = items.listIterator();\\n boolean _hasNext = i.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n ListItem d = i.next();\\n boolean _contains = visitedListItems.contains(d);\\n if (_contains) {\\n String _name = d.getName();\\n String _plus = (\\\"duplicate item reference \\\\'\\\" + _name);\\n String _plus_1 = (_plus + \\\"\\\\' in list\\\");\\n EReference _decomposition_Items = IntentSpecificationPackage.eINSTANCE.getDecomposition_Items();\\n String _name_1 = d.getName();\\n this.warning(_plus_1, _decomposition_Items, \\n IntentSpecificationValidator.UNIQUE_LIST_ITEM_DECOMPOSITION, _name_1);\",\n \"signature\": \"void checkUniqueListItemInDecomposition(final Decomposition decomposition)\"\n },\n {\n \"arguments\": [\n \"final Decomposition decomposition\"\n ],\n \"filename\": \"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java\",\n \"implementation\": \"final HashSet visitedModelItems = CollectionLiterals.newHashSet();\\n EList items = decomposition.getModels();\\n ListIterator i = items.listIterator();\\n boolean _hasNext = i.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n ModelItem _next = i.next();\\n ModelItem d = ((ModelItem) _next);\\n boolean _contains = visitedModelItems.contains(d);\\n if (_contains) {\\n String _name = d.getName();\\n String _plus = (\\\"duplicate item reference \\\\'\\\" + _name);\\n String _plus_1 = (_plus + \\\"\\\\' in models\\\");\\n EReference _decomposition_Models = IntentSpecificationPackage.eINSTANCE.getDecomposition_Models();\\n String _name_1 = d.getName();\\n this.warning(_plus_1, _decomposition_Models, \\n IntentSpecificationValidator.UNIQUE_MODEL_ITEM_DECOMPOSITION, _name_1);\",\n \"signature\": \"void checkUniqueModelItemInDecomposition(final Decomposition decomposition)\"\n },\n {\n \"arguments\": [\n \"final ListItem item\"\n ],\n \"filename\": \"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java\",\n \"implementation\": \"final HashSet visitedListItems = CollectionLiterals.newHashSet();\\n visitedListItems.add(item);\\n EList items = item.getItemReferences();\\n ListIterator i = items.listIterator();\\n boolean _hasNext = i.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n ListItem _next = i.next();\\n ListItem d = ((ListItem) _next);\\n boolean _contains = visitedListItems.contains(d);\\n if (_contains) {\\n String _name = d.getName();\\n String _plus = (\\\"duplicate item reference \\\\'\\\" + _name);\\n String _plus_1 = (_plus + \\\"\\\\' in items\\\");\\n EReference _listItem_ItemReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ItemReferences();\\n String _name_1 = d.getName();\\n this.warning(_plus_1, _listItem_ItemReferences, \\n IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM, _name_1);\",\n \"signature\": \"void checkUniqueListItemInListItem(final ListItem item)\"\n },\n {\n \"arguments\": [\n \"final ListItem item\"\n ],\n \"filename\": \"net.certware.intent/xtend-gen/net/certware/intent/validation/IntentSpecificationValidator.java\",\n \"implementation\": \"final HashSet visitedModelItems = CollectionLiterals.newHashSet();\\n EList items = item.getModelReferences();\\n ListIterator i = items.listIterator();\\n boolean _hasNext = i.hasNext();\\n boolean _while = _hasNext;\\n while (_while) {\\n {\\n ModelItem _next = i.next();\\n ModelItem d = ((ModelItem) _next);\\n boolean _contains = visitedModelItems.contains(d);\\n if (_contains) {\\n String _name = d.getName();\\n String _plus = (\\\"duplicate model reference \\\\'\\\" + _name);\\n String _plus_1 = (_plus + \\\"\\\\' in models\\\");\\n EReference _listItem_ModelReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ModelReferences();\\n String _name_1 = d.getName();\\n this.warning(_plus_1, _listItem_ModelReferences, \\n IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM, _name_1);\",\n \"signature\": \"void checkUniqueModelItemInListItem(final ListItem item)\"\n }\n ],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -3,7 +3,21 @@\\n */\\n package net.certware.intent.validation;\\n \\n+import java.util.HashSet;\\n+import java.util.ListIterator;\\n+import net.certware.intent.intentSpecification.Decomposition;\\n+import net.certware.intent.intentSpecification.DecompositionType;\\n+import net.certware.intent.intentSpecification.Intent;\\n+import net.certware.intent.intentSpecification.IntentSpecificationPackage;\\n+import net.certware.intent.intentSpecification.IntentType;\\n+import net.certware.intent.intentSpecification.ListItem;\\n+import net.certware.intent.intentSpecification.ModelItem;\\n+import net.certware.intent.intentSpecification.Refinement;\\n import net.certware.intent.validation.AbstractIntentSpecificationValidator;\\n+import org.eclipse.emf.common.util.EList;\\n+import org.eclipse.emf.ecore.EReference;\\n+import org.eclipse.xtext.validation.Check;\\n+import org.eclipse.xtext.xbase.lib.CollectionLiterals;\\n \\n /**\\n * Custom validation rules.\\n@@ -12,4 +26,185 @@\\n */\\n @SuppressWarnings(\\\"all\\\")\\n public class IntentSpecificationValidator extends AbstractIntentSpecificationValidator {\\n+ public final static String UNIQUE_INTENTS_REFINEMENT = \\\"net.certware.intent.UniqueIntentsRefinement\\\";\\n+ \\n+ public final static String UNIQUE_DECOMPOSITION_INTENT = \\\"net.certware.intent.UniqueDecompositionIntent\\\";\\n+ \\n+ public final static String UNIQUE_LIST_ITEM_DECOMPOSITION = \\\"net.certware.intent.UniqueListItemDecomposition\\\";\\n+ \\n+ public final static String UNIQUE_MODEL_ITEM_DECOMPOSITION = \\\"net.certware.intent.UniqueModelItemDecomposition\\\";\\n+ \\n+ public final static String UNIQUE_LIST_ITEM_LIST_ITEM = \\\"net.certware.intent.UniqueListItemListItem\\\";\\n+ \\n+ public final static String UNIQUE_MODEL_ITEM_LIST_ITEM = \\\"net.certware.intent.UniqueModelItemListItem\\\";\\n+ \\n+ @Check\\n+ public void checkUniqueIntentsInRefinement(final Refinement refinement) {\\n+ final HashSet visitedIntentTypeNames = CollectionLiterals.newHashSet();\\n+ EList intents = refinement.getIntents();\\n+ ListIterator i = intents.listIterator();\\n+ boolean _hasNext = i.hasNext();\\n+ boolean _while = _hasNext;\\n+ while (_while) {\\n+ {\\n+ Intent _next = i.next();\\n+ Intent d = ((Intent) _next);\\n+ IntentType _type = d.getType();\\n+ String typeName = _type.getTypeName();\\n+ boolean _contains = visitedIntentTypeNames.contains(typeName);\\n+ if (_contains) {\\n+ String _plus = (\\\"duplicate intent type \\\\'\\\" + typeName);\\n+ String _plus_1 = (_plus + \\\"\\\\' in refinement\\\");\\n+ EReference _refinement_Intents = IntentSpecificationPackage.eINSTANCE.getRefinement_Intents();\\n+ String _name = d.getName();\\n+ this.warning(_plus_1, _refinement_Intents, \\n+ IntentSpecificationValidator.UNIQUE_INTENTS_REFINEMENT, _name);\\n+ }\\n+ visitedIntentTypeNames.add(typeName);\\n+ }\\n+ boolean _hasNext_1 = i.hasNext();\\n+ _while = _hasNext_1;\\n+ }\\n+ }\\n+ \\n+ @Check\\n+ public void checkUniqueDecompositionInIntent(final Intent intent) {\\n+ final HashSet visitedDecompositionTypeNames = CollectionLiterals.newHashSet();\\n+ EList decompositions = intent.getDecompositions();\\n+ ListIterator i = decompositions.listIterator();\\n+ boolean _hasNext = i.hasNext();\\n+ boolean _while = _hasNext;\\n+ while (_while) {\\n+ {\\n+ Decomposition _next = i.next();\\n+ Decomposition d = ((Decomposition) _next);\\n+ DecompositionType _type = d.getType();\\n+ String typeName = _type.getTypeName();\\n+ boolean _contains = visitedDecompositionTypeNames.contains(typeName);\\n+ if (_contains) {\\n+ String _plus = (\\\"duplicate decomposition type \\\\'\\\" + typeName);\\n+ String _plus_1 = (_plus + \\\"\\\\' in intent\\\");\\n+ EReference _intent_Decompositions = IntentSpecificationPackage.eINSTANCE.getIntent_Decompositions();\\n+ String _name = d.getName();\\n+ this.warning(_plus_1, _intent_Decompositions, \\n+ IntentSpecificationValidator.UNIQUE_DECOMPOSITION_INTENT, _name);\\n+ }\\n+ visitedDecompositionTypeNames.add(typeName);\\n+ }\\n+ boolean _hasNext_1 = i.hasNext();\\n+ _while = _hasNext_1;\\n+ }\\n+ }\\n+ \\n+ @Check\\n+ public void checkUniqueListItemInDecomposition(final Decomposition decomposition) {\\n+ final HashSet visitedListItems = CollectionLiterals.newHashSet();\\n+ EList items = decomposition.getItems();\\n+ ListIterator i = items.listIterator();\\n+ boolean _hasNext = i.hasNext();\\n+ boolean _while = _hasNext;\\n+ while (_while) {\\n+ {\\n+ ListItem d = i.next();\\n+ boolean _contains = visitedListItems.contains(d);\\n+ if (_contains) {\\n+ String _name = d.getName();\\n+ String _plus = (\\\"duplicate item reference \\\\'\\\" + _name);\\n+ String _plus_1 = (_plus + \\\"\\\\' in list\\\");\\n+ EReference _decomposition_Items = IntentSpecificationPackage.eINSTANCE.getDecomposition_Items();\\n+ String _name_1 = d.getName();\\n+ this.warning(_plus_1, _decomposition_Items, \\n+ IntentSpecificationValidator.UNIQUE_LIST_ITEM_DECOMPOSITION, _name_1);\\n+ }\\n+ visitedListItems.add(d);\\n+ }\\n+ boolean _hasNext_1 = i.hasNext();\\n+ _while = _hasNext_1;\\n+ }\\n+ }\\n+ \\n+ @Check\\n+ public void checkUniqueModelItemInDecomposition(final Decomposition decomposition) {\\n+ final HashSet visitedModelItems = CollectionLiterals.newHashSet();\\n+ EList items = decomposition.getModels();\\n+ ListIterator i = items.listIterator();\\n+ boolean _hasNext = i.hasNext();\\n+ boolean _while = _hasNext;\\n+ while (_while) {\\n+ {\\n+ ModelItem _next = i.next();\\n+ ModelItem d = ((ModelItem) _next);\\n+ boolean _contains = visitedModelItems.contains(d);\\n+ if (_contains) {\\n+ String _name = d.getName();\\n+ String _plus = (\\\"duplicate item reference \\\\'\\\" + _name);\\n+ String _plus_1 = (_plus + \\\"\\\\' in models\\\");\\n+ EReference _decomposition_Models = IntentSpecificationPackage.eINSTANCE.getDecomposition_Models();\\n+ String _name_1 = d.getName();\\n+ this.warning(_plus_1, _decomposition_Models, \\n+ IntentSpecificationValidator.UNIQUE_MODEL_ITEM_DECOMPOSITION, _name_1);\\n+ }\\n+ visitedModelItems.add(d);\\n+ }\\n+ boolean _hasNext_1 = i.hasNext();\\n+ _while = _hasNext_1;\\n+ }\\n+ }\\n+ \\n+ @Check\\n+ public void checkUniqueListItemInListItem(final ListItem item) {\\n+ final HashSet visitedListItems = CollectionLiterals.newHashSet();\\n+ visitedListItems.add(item);\\n+ EList items = item.getItemReferences();\\n+ ListIterator i = items.listIterator();\\n+ boolean _hasNext = i.hasNext();\\n+ boolean _while = _hasNext;\\n+ while (_while) {\\n+ {\\n+ ListItem _next = i.next();\\n+ ListItem d = ((ListItem) _next);\\n+ boolean _contains = visitedListItems.contains(d);\\n+ if (_contains) {\\n+ String _name = d.getName();\\n+ String _plus = (\\\"duplicate item reference \\\\'\\\" + _name);\\n+ String _plus_1 = (_plus + \\\"\\\\' in items\\\");\\n+ EReference _listItem_ItemReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ItemReferences();\\n+ String _name_1 = d.getName();\\n+ this.warning(_plus_1, _listItem_ItemReferences, \\n+ IntentSpecificationValidator.UNIQUE_LIST_ITEM_LIST_ITEM, _name_1);\\n+ }\\n+ visitedListItems.add(d);\\n+ }\\n+ boolean _hasNext_1 = i.hasNext();\\n+ _while = _hasNext_1;\\n+ }\\n+ }\\n+ \\n+ @Check\\n+ public void checkUniqueModelItemInListItem(final ListItem item) {\\n+ final HashSet visitedModelItems = CollectionLiterals.newHashSet();\\n+ EList items = item.getModelReferences();\\n+ ListIterator i = items.listIterator();\\n+ boolean _hasNext = i.hasNext();\\n+ boolean _while = _hasNext;\\n+ while (_while) {\\n+ {\\n+ ModelItem _next = i.next();\\n+ ModelItem d = ((ModelItem) _next);\\n+ boolean _contains = visitedModelItems.contains(d);\\n+ if (_contains) {\\n+ String _name = d.getName();\\n+ String _plus = (\\\"duplicate model reference \\\\'\\\" + _name);\\n+ String _plus_1 = (_plus + \\\"\\\\' in models\\\");\\n+ EReference _listItem_ModelReferences = IntentSpecificationPackage.eINSTANCE.getListItem_ModelReferences();\\n+ String _name_1 = d.getName();\\n+ this.warning(_plus_1, _listItem_ModelReferences, \\n+ IntentSpecificationValidator.UNIQUE_MODEL_ITEM_LIST_ITEM, _name_1);\\n+ }\\n+ visitedModelItems.add(d);\\n+ }\\n+ boolean _hasNext_1 = i.hasNext();\\n+ _while = _hasNext_1;\\n+ }\\n+ }\\n }\",\n \"raw_url\": \"https://github.com/nasa/CertWare/raw/27f4d5e2037fcd41cb9ae7e454cb91b54216d1d9/net.certware.intent%2Fxtend-gen%2Fnet%2Fcertware%2Fintent%2Fvalidation%2FIntentSpecificationValidator.java\",\n \"sha\": \"7af1db4fbd8a74caeb5142984fb685a77b01a4fa\",\n \"status\": \"modified\"\n }\n]"},"file_patch_count":{"kind":"number","value":42,"string":"42"},"enhanced_diffs":{"kind":"list like","value":[{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameAlternatives_0;","new_return_type":"Alternatives","new_signature":"Alternatives getTypeNameAlternatives_0()","old_args":"","old_implementation":"return cAlternatives;","old_return_type":"Alternatives","old_signature":"Alternatives getAlternatives()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameAlternatives_0;","new_return_type":"Alternatives","new_signature":"Alternatives getTypeNameAlternatives_0()","old_args":"","old_implementation":"return cAlternatives;","old_return_type":"Alternatives","old_signature":"Alternatives getAlternatives()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameAlternatives_0;","new_return_type":"Alternatives","new_signature":"Alternatives getTypeNameAlternatives_0()","old_args":"","old_implementation":"return cAlternatives;","old_return_type":"Alternatives","old_signature":"Alternatives getAlternatives()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameAlternatives_0;","new_return_type":"Alternatives","new_signature":"Alternatives getTypeNameAlternatives_0()","old_args":"","old_implementation":"return cAlternatives;","old_return_type":"Alternatives","old_signature":"Alternatives getAlternatives()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameAlternatives_0;","new_return_type":"Alternatives","new_signature":"Alternatives getTypeNameAlternatives_0()","old_args":"","old_implementation":"return cAlternatives;","old_return_type":"Alternatives","old_signature":"Alternatives getAlternatives()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameBasicKeyword_0_0;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameBasicKeyword_0_0()","old_args":"","old_implementation":"return cBasicKeyword_0;","old_return_type":"Keyword","old_signature":"Keyword getBasicKeyword_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameBreakKeyword_0_2;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameBreakKeyword_0_2()","old_args":"","old_implementation":"return cBreakKeyword_2;","old_return_type":"Keyword","old_signature":"Keyword getBreakKeyword_2()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameConditionKeyword_0_0;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameConditionKeyword_0_0()","old_args":"","old_implementation":"return cConditionKeyword_0;","old_return_type":"Keyword","old_signature":"Keyword getConditionKeyword_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameConstraintKeyword_0_3;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameConstraintKeyword_0_3()","old_args":"","old_implementation":"return cConstraintKeyword_3;","old_return_type":"Keyword","old_signature":"Keyword getConstraintKeyword_3()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameDesignKeyword_0_4;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameDesignKeyword_0_4()","old_args":"","old_implementation":"return cDesignKeyword_4;","old_return_type":"Keyword","old_signature":"Keyword getDesignKeyword_4()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameEnvironmentKeyword_0_0;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameEnvironmentKeyword_0_0()","old_args":"","old_implementation":"return cEnvironmentKeyword_0;","old_return_type":"Keyword","old_signature":"Keyword getEnvironmentKeyword_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameFigureKeyword_0_1;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameFigureKeyword_0_1()","old_args":"","old_implementation":"return cFigureKeyword_1;","old_return_type":"Keyword","old_signature":"Keyword getFigureKeyword_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameFunctionKeyword_0_4;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameFunctionKeyword_0_4()","old_args":"","old_implementation":"return cFunctionKeyword_4;","old_return_type":"Keyword","old_signature":"Keyword getFunctionKeyword_4()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameGoalKeyword_0_1;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameGoalKeyword_0_1()","old_args":"","old_implementation":"return cGoalKeyword_1;","old_return_type":"Keyword","old_signature":"Keyword getGoalKeyword_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameHazardKeyword_0_2;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameHazardKeyword_0_2()","old_args":"","old_implementation":"return cHazardKeyword_2;","old_return_type":"Keyword","old_signature":"Keyword getHazardKeyword_2()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameAssignment_1;","new_return_type":"Assignment","new_signature":"Assignment getNameAssignment_1()","old_args":"","old_implementation":"return cIdAssignment_1;","old_return_type":"Assignment","old_signature":"Assignment getIdAssignment_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cNameIDTerminalRuleCall_1_0;","new_return_type":"RuleCall","new_signature":"RuleCall getNameIDTerminalRuleCall_1_0()","old_args":"","old_implementation":"return cIdIDTerminalRuleCall_1_0;","old_return_type":"RuleCall","old_signature":"RuleCall getIdIDTerminalRuleCall_1_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameImplementationKeyword_0_5;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameImplementationKeyword_0_5()","old_args":"","old_implementation":"return cImplementationKeyword_5;","old_return_type":"Keyword","old_signature":"Keyword getImplementationKeyword_5()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameInputKeyword_0_5;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameInputKeyword_0_5()","old_args":"","old_implementation":"return cInputKeyword_5;","old_return_type":"Keyword","old_signature":"Keyword getInputKeyword_5()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameMacroKeyword_0_3;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameMacroKeyword_0_3()","old_args":"","old_implementation":"return cMacroKeyword_3;","old_return_type":"Keyword","old_signature":"Keyword getMacroKeyword_3()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameModeKeyword_0_1;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameModeKeyword_0_1()","old_args":"","old_implementation":"return cModeKeyword_1;","old_return_type":"Keyword","old_signature":"Keyword getModeKeyword_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameModelKeyword_0_3;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameModelKeyword_0_3()","old_args":"","old_implementation":"return cModelKeyword_3;","old_return_type":"Keyword","old_signature":"Keyword getModelKeyword_3()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameModelsKeyword_0_3;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameModelsKeyword_0_3()","old_args":"","old_implementation":"return cModelsKeyword_3;","old_return_type":"Keyword","old_signature":"Keyword getModelsKeyword_3()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameOperationKeyword_0_6;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameOperationKeyword_0_6()","old_args":"","old_implementation":"return cOperationKeyword_6;","old_return_type":"Keyword","old_signature":"Keyword getOperationKeyword_6()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameOperatorKeyword_0_1;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameOperatorKeyword_0_1()","old_args":"","old_implementation":"return cOperatorKeyword_1;","old_return_type":"Keyword","old_signature":"Keyword getOperatorKeyword_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameOutputKeyword_0_0;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameOutputKeyword_0_0()","old_args":"","old_implementation":"return cOutputKeyword_0;","old_return_type":"Keyword","old_signature":"Keyword getOutputKeyword_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameParagraphKeyword_0_4;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameParagraphKeyword_0_4()","old_args":"","old_implementation":"return cParagraphKeyword_4;","old_return_type":"Keyword","old_signature":"Keyword getParagraphKeyword_4()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNamePrinciplesKeyword_0_2;","new_return_type":"Keyword","new_signature":"Keyword getTypeNamePrinciplesKeyword_0_2()","old_args":"","old_implementation":"return cPrinciplesKeyword_2;","old_return_type":"Keyword","old_signature":"Keyword getPrinciplesKeyword_2()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNamePurposeKeyword_0_1;","new_return_type":"Keyword","new_signature":"Keyword getTypeNamePurposeKeyword_0_1()","old_args":"","old_implementation":"return cPurposeKeyword_1;","old_return_type":"Keyword","old_signature":"Keyword getPurposeKeyword_1()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameRequirementKeyword_0_0;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameRequirementKeyword_0_0()","old_args":"","old_implementation":"return cRequirementKeyword_0;","old_return_type":"Keyword","old_signature":"Keyword getRequirementKeyword_0()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameSectionKeyword_0_5;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameSectionKeyword_0_5()","old_args":"","old_implementation":"return cSectionKeyword_5;","old_return_type":"Keyword","old_signature":"Keyword getSectionKeyword_5()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameStateKeyword_0_2;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameStateKeyword_0_2()","old_args":"","old_implementation":"return cStateKeyword_2;","old_return_type":"Keyword","old_signature":"Keyword getStateKeyword_2()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameSystemKeyword_0_2;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameSystemKeyword_0_2()","old_args":"","old_implementation":"return cSystemKeyword_2;","old_return_type":"Keyword","old_signature":"Keyword getSystemKeyword_2()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameTableKeyword_0_6;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameTableKeyword_0_6()","old_args":"","old_implementation":"return cTableKeyword_6;","old_return_type":"Keyword","old_signature":"Keyword getTableKeyword_6()"},{"name":"nasa$certware","new_args":"","new_implementation":"return cTypeNameVerificationKeyword_0_3;","new_return_type":"Keyword","new_signature":"Keyword getTypeNameVerificationKeyword_0_3()","old_args":"","old_implementation":"return cVerificationKeyword_3;","old_return_type":"Keyword","old_signature":"Keyword getVerificationKeyword_3()"}],"string":"[\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameAlternatives_0;\",\n \"new_return_type\": \"Alternatives\",\n \"new_signature\": \"Alternatives getTypeNameAlternatives_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cAlternatives;\",\n \"old_return_type\": \"Alternatives\",\n \"old_signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameAlternatives_0;\",\n \"new_return_type\": \"Alternatives\",\n \"new_signature\": \"Alternatives getTypeNameAlternatives_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cAlternatives;\",\n \"old_return_type\": \"Alternatives\",\n \"old_signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameAlternatives_0;\",\n \"new_return_type\": \"Alternatives\",\n \"new_signature\": \"Alternatives getTypeNameAlternatives_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cAlternatives;\",\n \"old_return_type\": \"Alternatives\",\n \"old_signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameAlternatives_0;\",\n \"new_return_type\": \"Alternatives\",\n \"new_signature\": \"Alternatives getTypeNameAlternatives_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cAlternatives;\",\n \"old_return_type\": \"Alternatives\",\n \"old_signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameAlternatives_0;\",\n \"new_return_type\": \"Alternatives\",\n \"new_signature\": \"Alternatives getTypeNameAlternatives_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cAlternatives;\",\n \"old_return_type\": \"Alternatives\",\n \"old_signature\": \"Alternatives getAlternatives()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameBasicKeyword_0_0;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameBasicKeyword_0_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cBasicKeyword_0;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getBasicKeyword_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameBreakKeyword_0_2;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameBreakKeyword_0_2()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cBreakKeyword_2;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getBreakKeyword_2()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameConditionKeyword_0_0;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameConditionKeyword_0_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cConditionKeyword_0;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getConditionKeyword_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameConstraintKeyword_0_3;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameConstraintKeyword_0_3()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cConstraintKeyword_3;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getConstraintKeyword_3()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameDesignKeyword_0_4;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameDesignKeyword_0_4()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cDesignKeyword_4;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getDesignKeyword_4()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameEnvironmentKeyword_0_0;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameEnvironmentKeyword_0_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cEnvironmentKeyword_0;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getEnvironmentKeyword_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameFigureKeyword_0_1;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameFigureKeyword_0_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cFigureKeyword_1;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getFigureKeyword_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameFunctionKeyword_0_4;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameFunctionKeyword_0_4()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cFunctionKeyword_4;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getFunctionKeyword_4()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameGoalKeyword_0_1;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameGoalKeyword_0_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cGoalKeyword_1;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getGoalKeyword_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameHazardKeyword_0_2;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameHazardKeyword_0_2()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cHazardKeyword_2;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getHazardKeyword_2()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameAssignment_1;\",\n \"new_return_type\": \"Assignment\",\n \"new_signature\": \"Assignment getNameAssignment_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdAssignment_1;\",\n \"old_return_type\": \"Assignment\",\n \"old_signature\": \"Assignment getIdAssignment_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cNameIDTerminalRuleCall_1_0;\",\n \"new_return_type\": \"RuleCall\",\n \"new_signature\": \"RuleCall getNameIDTerminalRuleCall_1_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cIdIDTerminalRuleCall_1_0;\",\n \"old_return_type\": \"RuleCall\",\n \"old_signature\": \"RuleCall getIdIDTerminalRuleCall_1_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameImplementationKeyword_0_5;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameImplementationKeyword_0_5()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cImplementationKeyword_5;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getImplementationKeyword_5()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameInputKeyword_0_5;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameInputKeyword_0_5()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cInputKeyword_5;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getInputKeyword_5()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameMacroKeyword_0_3;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameMacroKeyword_0_3()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cMacroKeyword_3;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getMacroKeyword_3()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameModeKeyword_0_1;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameModeKeyword_0_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cModeKeyword_1;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getModeKeyword_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameModelKeyword_0_3;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameModelKeyword_0_3()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cModelKeyword_3;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getModelKeyword_3()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameModelsKeyword_0_3;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameModelsKeyword_0_3()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cModelsKeyword_3;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getModelsKeyword_3()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameOperationKeyword_0_6;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameOperationKeyword_0_6()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cOperationKeyword_6;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getOperationKeyword_6()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameOperatorKeyword_0_1;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameOperatorKeyword_0_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cOperatorKeyword_1;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getOperatorKeyword_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameOutputKeyword_0_0;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameOutputKeyword_0_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cOutputKeyword_0;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getOutputKeyword_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameParagraphKeyword_0_4;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameParagraphKeyword_0_4()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cParagraphKeyword_4;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getParagraphKeyword_4()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNamePrinciplesKeyword_0_2;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNamePrinciplesKeyword_0_2()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cPrinciplesKeyword_2;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getPrinciplesKeyword_2()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNamePurposeKeyword_0_1;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNamePurposeKeyword_0_1()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cPurposeKeyword_1;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getPurposeKeyword_1()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameRequirementKeyword_0_0;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameRequirementKeyword_0_0()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cRequirementKeyword_0;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getRequirementKeyword_0()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameSectionKeyword_0_5;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameSectionKeyword_0_5()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cSectionKeyword_5;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getSectionKeyword_5()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameStateKeyword_0_2;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameStateKeyword_0_2()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cStateKeyword_2;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getStateKeyword_2()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameSystemKeyword_0_2;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameSystemKeyword_0_2()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cSystemKeyword_2;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getSystemKeyword_2()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameTableKeyword_0_6;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameTableKeyword_0_6()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cTableKeyword_6;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getTableKeyword_6()\"\n },\n {\n \"name\": \"nasa$certware\",\n \"new_args\": \"\",\n \"new_implementation\": \"return cTypeNameVerificationKeyword_0_3;\",\n \"new_return_type\": \"Keyword\",\n \"new_signature\": \"Keyword getTypeNameVerificationKeyword_0_3()\",\n \"old_args\": \"\",\n \"old_implementation\": \"return cVerificationKeyword_3;\",\n \"old_return_type\": \"Keyword\",\n \"old_signature\": \"Keyword getVerificationKeyword_3()\"\n }\n]"},"enhanced_diffs_count":{"kind":"number","value":47,"string":"47"},"diff_count":{"kind":"number","value":82,"string":"82"}}},{"rowIdx":16,"cells":{"commit_sha":{"kind":"string","value":"4249b9b8e406cfef551c36071a4c42528d0fe8a5"},"modifications":{"kind":"list like","value":[{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bJ()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bF()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void aA() {\n protected void bo() {","new_return_type":"void","new_signature":"void bK()","old_args":"","old_implementation":"protected void az() {\n protected void bk() {","old_return_type":"void","old_signature":"void bG()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bM()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bJ()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int cG()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int cC()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void cO()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void cK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"float f0","new_implementation":null,"new_return_type":"float","new_signature":"float p(float f0)","old_args":"float f0","old_implementation":null,"old_return_type":"float","old_signature":"float o(float f0)"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean aB()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean aA()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void aI()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void aF()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String aO()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String aL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void aV()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void aS()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"float","new_signature":"float ba()","old_args":"","old_implementation":null,"old_return_type":"float","old_signature":"float aX()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bb()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean aY()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void aA()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void az()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void aA() {\n protected void bo() {","new_return_type":"void","new_signature":"void bK()","old_args":"","old_implementation":"protected void az() {\n protected void bk() {","old_return_type":"void","old_signature":"void bG()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"Entity","new_signature":"Entity bL()","old_args":"","old_implementation":null,"old_return_type":"Entity","old_signature":"Entity bH()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"Entity","new_signature":"Entity bL()","old_args":"","old_implementation":null,"old_return_type":"Entity","old_signature":"Entity bH()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"Entity","new_signature":"Entity bL()","old_args":"","old_implementation":null,"old_return_type":"Entity","old_signature":"Entity bH()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"Entity","new_signature":"Entity bL()","old_args":"","old_implementation":null,"old_return_type":"Entity","old_signature":"Entity bH()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"Entity","new_signature":"Entity bL()","old_args":"","old_implementation":null,"old_return_type":"Entity","old_signature":"Entity bH()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"Entity","new_signature":"Entity bL()","old_args":"","old_implementation":null,"old_return_type":"Entity","old_signature":"Entity bH()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int bX()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bT()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bd()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void ba()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bd()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void ba()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean at()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"","new_return_type":"void","new_signature":"void bh()","old_args":"","old_implementation":"","old_return_type":"void","old_signature":"void be()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"","new_return_type":"void","new_signature":"void bh()","old_args":"","old_implementation":"","old_return_type":"void","old_signature":"void be()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public void U() {\n super.U();\n protected void bj() {","new_return_type":"void","new_signature":"void bi()","old_args":"","old_implementation":"public void T() {\n super.T();\n protected void bg() {","old_return_type":"void","old_signature":"void bf()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","new_return_type":"void","new_signature":"void bj()","old_args":"","old_implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","old_return_type":"void","old_signature":"void bg()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","new_return_type":"void","new_signature":"void bj()","old_args":"","old_implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","old_return_type":"void","old_signature":"void bg()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","new_return_type":"void","new_signature":"void bj()","old_args":"","old_implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","old_return_type":"void","old_signature":"void bg()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bk()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bh()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bk()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bh()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bk()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bh()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bk()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bh()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bk()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bh()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bk()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bh()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bk()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bh()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public void c(PotionEffect potioneffect) {","new_return_type":"void","new_signature":"void bo()","old_args":"","old_implementation":"public void d(PotionEffect potioneffect) {","old_return_type":"void","old_signature":"void bk()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bw()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bs()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bw()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bs()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bw()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bs()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bw()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bs()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bx()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bt()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String cp()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String cl()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public boolean T() {\n public void U() {\n this.o.V();\n public void V() {\n this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\n public double W() {\n public double X() {\n public float Y() {\n public Vec3 Z() {\n public void aa() {\n this.ao = this.ab();\n public int ab() {\n public ItemStack[] ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public boolean ai() {\n public int ak() {\n public void al() {\n public String am() {\n public Entity[] an() {\n public float ao() {\n public boolean ap() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)","new_return_type":"boolean","new_signature":"boolean S()","old_args":"","old_implementation":"public boolean S() {\n public void T() {\n this.o.U();\n this.A = (float) ((double) this.A + d0);\n this.B = (float) ((double) this.B + d1);\n public void U() {\n this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\n public double V() {\n public double W() {\n public float X() {\n public Vec3 Y() {\n public void Z() {\n this.ao = this.aa();\n public int aa() {\n public ItemStack[] ac() {\n public boolean ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public int aj() {\n public void ak() {\n public String al() {\n public Entity[] am() {\n public float an() {\n public boolean ao() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)","old_return_type":"boolean","old_signature":"boolean R()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void U()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void T()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void U()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void T()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void V()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void U()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void V()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void U()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"double","new_signature":"double W()","old_args":"","old_implementation":null,"old_return_type":"double","old_signature":"double V()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"double","new_signature":"double W()","old_args":"","old_implementation":null,"old_return_type":"double","old_signature":"double V()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"double","new_signature":"double X()","old_args":"","old_implementation":null,"old_return_type":"double","old_signature":"double W()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"double","new_signature":"double X()","old_args":"","old_implementation":null,"old_return_type":"double","old_signature":"double W()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"float","new_signature":"float Y()","old_args":"","old_implementation":null,"old_return_type":"float","old_signature":"float X()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"Vec3","new_signature":"Vec3 Z()","old_args":"","old_implementation":null,"old_return_type":"Vec3","old_signature":"Vec3 Y()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean aL()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean aI()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"if (this.aq()) {","new_return_type":"int","new_signature":"int aP()","old_args":"","old_implementation":"if (this.ap()) {","old_return_type":"int","old_signature":"int aM()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"if (this.aq()) {","new_return_type":"int","new_signature":"int aP()","old_args":"","old_implementation":"if (this.ap()) {","old_return_type":"int","old_signature":"int aM()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"if (this.aq()) {","new_return_type":"int","new_signature":"int aP()","old_args":"","old_implementation":"if (this.ap()) {","old_return_type":"int","old_signature":"int aM()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"if (this.aq()) {","new_return_type":"int","new_signature":"int aP()","old_args":"","old_implementation":"if (this.ap()) {","old_return_type":"int","old_signature":"int aM()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"if (this.aq()) {","new_return_type":"int","new_signature":"int aP()","old_args":"","old_implementation":"if (this.ap()) {","old_return_type":"int","old_signature":"int aM()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"EnumCreatureAttribute","new_signature":"EnumCreatureAttribute aX()","old_args":"","old_implementation":null,"old_return_type":"EnumCreatureAttribute","old_signature":"EnumCreatureAttribute aU()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"EnumCreatureAttribute","new_signature":"EnumCreatureAttribute aX()","old_args":"","old_implementation":null,"old_return_type":"EnumCreatureAttribute","old_signature":"EnumCreatureAttribute aU()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"EnumCreatureAttribute","new_signature":"EnumCreatureAttribute aX()","old_args":"","old_implementation":null,"old_return_type":"EnumCreatureAttribute","old_signature":"EnumCreatureAttribute aU()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"EnumCreatureAttribute","new_signature":"EnumCreatureAttribute aX()","old_args":"","old_implementation":null,"old_return_type":"EnumCreatureAttribute","old_signature":"EnumCreatureAttribute aU()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"EnumCreatureAttribute","new_signature":"EnumCreatureAttribute aX()","old_args":"","old_implementation":null,"old_return_type":"EnumCreatureAttribute","old_signature":"EnumCreatureAttribute aU()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"ItemStack","new_signature":"ItemStack aY()","old_args":"","old_implementation":null,"old_return_type":"ItemStack","old_signature":"ItemStack aV()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"ItemStack","new_signature":"ItemStack aY()","old_args":"","old_implementation":null,"old_return_type":"ItemStack","old_signature":"ItemStack aV()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int ab()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int aa()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"ItemStack[]","new_signature":"ItemStack[] abstract()","old_args":"","old_implementation":null,"old_return_type":"ItemStack[]","old_signature":"ItemStack[] abstract()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"ItemStack[]","new_signature":"ItemStack[] ad()","old_args":"","old_implementation":null,"old_return_type":"ItemStack[]","old_signature":"ItemStack[] ac()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"ItemStack[]","new_signature":"ItemStack[] ad()","old_args":"","old_implementation":null,"old_return_type":"ItemStack[]","old_signature":"ItemStack[] ac()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean ae()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean ad()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean ae()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean ad()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean ae()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean ad()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String am()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String al()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String am()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String al()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String am()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String al()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String am()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String al()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"String","new_signature":"String am()","old_args":"","old_implementation":null,"old_return_type":"String","old_signature":"String al()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"Entity[]","new_signature":"Entity[] an()","old_args":"","old_implementation":null,"old_return_type":"Entity[]","old_signature":"Entity[] am()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"float","new_signature":"float ao()","old_args":"","old_implementation":null,"old_return_type":"float","old_signature":"float an()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean ap()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean ao()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean ap()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean ao()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean ap()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean ao()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean ap()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean ao()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean ap()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean ao()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int ar()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int aq()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int ar()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int aq()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean ay()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"World","new_signature":"World az()","old_args":"","old_implementation":null,"old_return_type":"World","old_signature":"World ay()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean az()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean ay()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bG()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bC()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void bk() {\n this.bn = this.bJ();\n Entity entity = this.bL();","new_return_type":"boolean","new_signature":"boolean bJ()","old_args":"","old_implementation":"protected void bh() {\n this.bn = this.bF();\n Entity entity = this.bH();","old_return_type":"boolean","old_signature":"boolean bF()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"ChunkCoordinates","new_signature":"ChunkCoordinates bP()","old_args":"","old_implementation":null,"old_return_type":"ChunkCoordinates","old_signature":"ChunkCoordinates bL()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int bR()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bN()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"Village","new_signature":"Village bT()","old_args":"","old_implementation":null,"old_return_type":"Village","old_signature":"Village bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bT()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bT()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bT()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bT()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bT()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bT()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.cJ();\n public int bU() {\n public String am() {\n if (this.bB()) {\n return this.bA();\n int i0 = this.bT();\n public boolean bV() {\n public boolean bW() {\n public boolean ca() {\n return this.bV();","new_return_type":"int","new_signature":"int bT()","old_args":"","old_implementation":"this.cF();\n public int bQ() {\n public String al() {\n if (this.bx()) {\n return this.bw();\n int i0 = this.bP();\n public boolean bR() {\n public boolean bS() {\n public boolean bW() {\n return this.bR();\n public float bY() {\n this.a(this.bY());\n public boolean bZ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bC() {\n return !this.cu() && super.bC();\n public boolean ca() {\n public int cb() {\n public boolean cc() {\n public boolean cd() {\n public boolean ce() {\n public boolean cf() {\n this.cF();\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public void o(boolean flag0) {\n public int cg() {\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n if (this.n != null && this.n.equals(entity)) {\n return false;","old_return_type":"int","old_signature":"int bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.cJ();\n public int bU() {\n public String am() {\n if (this.bB()) {\n return this.bA();\n int i0 = this.bT();\n public boolean bV() {\n public boolean bW() {\n public boolean ca() {\n return this.bV();","new_return_type":"int","new_signature":"int bT()","old_args":"","old_implementation":"this.cF();\n public int bQ() {\n public String al() {\n if (this.bx()) {\n return this.bw();\n int i0 = this.bP();\n public boolean bR() {\n public boolean bS() {\n public boolean bW() {\n return this.bR();\n public float bY() {\n this.a(this.bY());\n public boolean bZ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bC() {\n return !this.cu() && super.bC();\n public boolean ca() {\n public int cb() {\n public boolean cc() {\n public boolean cd() {\n public boolean ce() {\n public boolean cf() {\n this.cF();\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public void o(boolean flag0) {\n public int cg() {\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n if (this.n != null && this.n.equals(entity)) {\n return false;","old_return_type":"int","old_signature":"int bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bT()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bT()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"EntityAIControlledByPlayer","new_signature":"EntityAIControlledByPlayer bU()","old_args":"","old_implementation":null,"old_return_type":"EntityAIControlledByPlayer","old_signature":"EntityAIControlledByPlayer bQ()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bU()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bQ()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bU()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bQ()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int bU()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bQ()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int bU()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bQ()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bV()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bR()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bV()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bR()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bV()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bR()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bV()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bR()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int bV()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bR()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int bV()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bR()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int bV()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bR()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int bV()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bR()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bW()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bS()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bW()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bS()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int bW()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bS()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void bW()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void bS()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int ca()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean cc()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bY()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bG()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bZ()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int cd()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bZ()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"float","new_signature":"float bf()","old_args":"","old_implementation":null,"old_return_type":"float","old_signature":"float bc()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"float","new_signature":"float bf()","old_args":"","old_implementation":null,"old_return_type":"float","old_signature":"float bc()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bd()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bg()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bd()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","new_return_type":"void","new_signature":"void bj()","old_args":"","old_implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","old_return_type":"void","old_signature":"void bg()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bl()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bi()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"float","new_signature":"float bm()","old_args":"","old_implementation":null,"old_return_type":"float","old_signature":"float bj()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int bp()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bl()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int bp()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bl()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"int","new_signature":"int bp()","old_args":"","old_implementation":null,"old_return_type":"int","old_signature":"int bl()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bs()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bo()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bs()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bo()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bs()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bo()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bs()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bo()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bs()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bo()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bs()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bo()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bs()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bo()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bs()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bo()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bs()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bo()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bs()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bo()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bs()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bo()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bs()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bo()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {","new_return_type":"int","new_signature":"int bv()","old_args":"","old_implementation":"public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {","old_return_type":"int","old_signature":"int br()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {","new_return_type":"int","new_signature":"int bv()","old_args":"","old_implementation":"public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {","old_return_type":"int","old_signature":"int br()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {","new_return_type":"int","new_signature":"int bv()","old_args":"","old_implementation":"public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {","old_return_type":"int","old_signature":"int br()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {","new_return_type":"int","new_signature":"int bv()","old_args":"","old_implementation":"public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {","old_return_type":"int","old_signature":"int br()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean by()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bu()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean bB()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean bx()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"EntityLivingBase entitylivingbase","new_implementation":null,"new_return_type":"void","new_signature":"void d(EntityLivingBase entitylivingbase)","old_args":"EntityLivingBase entitylivingbase","old_implementation":null,"old_return_type":"void","old_signature":"void c(EntityLivingBase entitylivingbase)"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean ce()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean ca()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean cw()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean cs()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean cy()","old_args":"","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean cu()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"PotionEffect potioneffect","new_implementation":null,"new_return_type":"boolean","new_signature":"boolean d(PotionEffect potioneffect)","old_args":"PotionEffect potioneffect","old_implementation":null,"old_return_type":"boolean","old_signature":"boolean e(PotionEffect potioneffect)"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"boolean flag0,boolean flag1","new_implementation":null,"new_return_type":"void","new_signature":"void a(boolean flag0,boolean flag1)","old_args":"boolean flag0","old_implementation":null,"old_return_type":"void","old_signature":"void i(boolean flag0)"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"boolean flag0","new_implementation":null,"new_return_type":"void","new_signature":"void i(boolean flag0)","old_args":"boolean flag0","old_implementation":null,"old_return_type":"void","old_signature":"void j(boolean flag0)"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"boolean flag0","new_implementation":null,"new_return_type":"void","new_signature":"void i(boolean flag0)","old_args":"boolean flag0","old_implementation":null,"old_return_type":"void","old_signature":"void j(boolean flag0)"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"boolean flag0","new_implementation":null,"new_return_type":"void","new_signature":"void i(boolean flag0)","old_args":"boolean flag0","old_implementation":null,"old_return_type":"void","old_signature":"void j(boolean flag0)"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"boolean flag0","new_implementation":null,"new_return_type":"void","new_signature":"void i(boolean flag0)","old_args":"boolean flag0","old_implementation":null,"old_return_type":"void","old_signature":"void j(boolean flag0)"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"boolean flag0","new_implementation":null,"new_return_type":"void","new_signature":"void i(boolean flag0)","old_args":"boolean flag0","old_implementation":null,"old_return_type":"void","old_signature":"void k(boolean flag0)"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"boolean flag0","new_implementation":null,"new_return_type":"void","new_signature":"void j(boolean flag0)","old_args":"boolean flag0","old_implementation":null,"old_return_type":"void","old_signature":"void k(boolean flag0)"}],"string":"[\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bJ()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bF()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void aA() {\\n protected void bo() {\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bK()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void az() {\\n protected void bk() {\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bG()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bM()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bJ()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int cG()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int cC()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void cO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void cK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"float f0\",\n \"new_implementation\": null,\n \"new_return_type\": \"float\",\n \"new_signature\": \"float p(float f0)\",\n \"old_args\": \"float f0\",\n \"old_implementation\": null,\n \"old_return_type\": \"float\",\n \"old_signature\": \"float o(float f0)\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean aB()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean aA()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void aI()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void aF()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aO()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void aV()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void aS()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"float\",\n \"new_signature\": \"float ba()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aX()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bb()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean aY()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void aA()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void az()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void aA() {\\n protected void bo() {\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bK()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void az() {\\n protected void bk() {\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bG()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Entity\",\n \"new_signature\": \"Entity bL()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Entity\",\n \"old_signature\": \"Entity bH()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Entity\",\n \"new_signature\": \"Entity bL()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Entity\",\n \"old_signature\": \"Entity bH()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Entity\",\n \"new_signature\": \"Entity bL()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Entity\",\n \"old_signature\": \"Entity bH()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Entity\",\n \"new_signature\": \"Entity bL()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Entity\",\n \"old_signature\": \"Entity bH()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Entity\",\n \"new_signature\": \"Entity bL()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Entity\",\n \"old_signature\": \"Entity bH()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Entity\",\n \"new_signature\": \"Entity bL()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Entity\",\n \"old_signature\": \"Entity bH()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bX()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bT()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bd()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ba()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bd()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ba()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean at()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bh()\",\n \"old_args\": \"\",\n \"old_implementation\": \"\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void be()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bh()\",\n \"old_args\": \"\",\n \"old_implementation\": \"\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void be()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public void U() {\\n super.U();\\n protected void bj() {\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bi()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public void T() {\\n super.T();\\n protected void bg() {\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bf()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bj()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bg()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bj()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bg()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bj()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bg()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bk()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bh()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bk()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bh()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bk()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bh()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bk()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bh()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bk()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bh()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bk()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bh()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bk()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bh()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public void c(PotionEffect potioneffect) {\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bo()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public void d(PotionEffect potioneffect) {\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bk()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bw()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bs()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bw()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bs()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bw()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bs()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bw()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bs()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bx()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bt()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String cp()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String cl()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public boolean T() {\\n public void U() {\\n this.o.V();\\n public void V() {\\n this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\\n public double W() {\\n public double X() {\\n public float Y() {\\n public Vec3 Z() {\\n public void aa() {\\n this.ao = this.ab();\\n public int ab() {\\n public ItemStack[] ad() {\\n public boolean ae() {\\n public boolean af() {\\n public boolean ag() {\\n public boolean ah() {\\n public boolean ai() {\\n public int ak() {\\n public void al() {\\n public String am() {\\n public Entity[] an() {\\n public float ao() {\\n public boolean ap() {\\n return String.format(\\\"%s[\\\\'%s\\\\'/%d, l=\\\\'%s\\\\', x=%.2f, y=%.2f, z=%.2f]\\\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \\\"~NULL~\\\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean S()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public boolean S() {\\n public void T() {\\n this.o.U();\\n this.A = (float) ((double) this.A + d0);\\n this.B = (float) ((double) this.B + d1);\\n public void U() {\\n this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\\n public double V() {\\n public double W() {\\n public float X() {\\n public Vec3 Y() {\\n public void Z() {\\n this.ao = this.aa();\\n public int aa() {\\n public ItemStack[] ac() {\\n public boolean ad() {\\n public boolean ae() {\\n public boolean af() {\\n public boolean ag() {\\n public boolean ah() {\\n public int aj() {\\n public void ak() {\\n public String al() {\\n public Entity[] am() {\\n public float an() {\\n public boolean ao() {\\n return String.format(\\\"%s[\\\\'%s\\\\'/%d, l=\\\\'%s\\\\', x=%.2f, y=%.2f, z=%.2f]\\\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \\\"~NULL~\\\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean R()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void U()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void T()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void U()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void T()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void V()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void U()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void V()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void U()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"double\",\n \"new_signature\": \"double W()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"double\",\n \"old_signature\": \"double V()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"double\",\n \"new_signature\": \"double W()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"double\",\n \"old_signature\": \"double V()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"double\",\n \"new_signature\": \"double X()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"double\",\n \"old_signature\": \"double W()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"double\",\n \"new_signature\": \"double X()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"double\",\n \"old_signature\": \"double W()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"float\",\n \"new_signature\": \"float Y()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"float\",\n \"old_signature\": \"float X()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Vec3\",\n \"new_signature\": \"Vec3 Z()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Vec3\",\n \"old_signature\": \"Vec3 Y()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean aL()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean aI()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"if (this.aq()) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int aP()\",\n \"old_args\": \"\",\n \"old_implementation\": \"if (this.ap()) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aM()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"if (this.aq()) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int aP()\",\n \"old_args\": \"\",\n \"old_implementation\": \"if (this.ap()) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aM()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"if (this.aq()) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int aP()\",\n \"old_args\": \"\",\n \"old_implementation\": \"if (this.ap()) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aM()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"if (this.aq()) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int aP()\",\n \"old_args\": \"\",\n \"old_implementation\": \"if (this.ap()) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aM()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"if (this.aq()) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int aP()\",\n \"old_args\": \"\",\n \"old_implementation\": \"if (this.ap()) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aM()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EnumCreatureAttribute\",\n \"new_signature\": \"EnumCreatureAttribute aX()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EnumCreatureAttribute\",\n \"old_signature\": \"EnumCreatureAttribute aU()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EnumCreatureAttribute\",\n \"new_signature\": \"EnumCreatureAttribute aX()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EnumCreatureAttribute\",\n \"old_signature\": \"EnumCreatureAttribute aU()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EnumCreatureAttribute\",\n \"new_signature\": \"EnumCreatureAttribute aX()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EnumCreatureAttribute\",\n \"old_signature\": \"EnumCreatureAttribute aU()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EnumCreatureAttribute\",\n \"new_signature\": \"EnumCreatureAttribute aX()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EnumCreatureAttribute\",\n \"old_signature\": \"EnumCreatureAttribute aU()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EnumCreatureAttribute\",\n \"new_signature\": \"EnumCreatureAttribute aX()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EnumCreatureAttribute\",\n \"old_signature\": \"EnumCreatureAttribute aU()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"ItemStack\",\n \"new_signature\": \"ItemStack aY()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"ItemStack\",\n \"old_signature\": \"ItemStack aV()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"ItemStack\",\n \"new_signature\": \"ItemStack aY()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"ItemStack\",\n \"old_signature\": \"ItemStack aV()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int ab()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aa()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"ItemStack[]\",\n \"new_signature\": \"ItemStack[] abstract()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"ItemStack[]\",\n \"old_signature\": \"ItemStack[] abstract()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"ItemStack[]\",\n \"new_signature\": \"ItemStack[] ad()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"ItemStack[]\",\n \"old_signature\": \"ItemStack[] ac()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"ItemStack[]\",\n \"new_signature\": \"ItemStack[] ad()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"ItemStack[]\",\n \"old_signature\": \"ItemStack[] ac()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean ae()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean ad()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean ae()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean ad()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean ae()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean ad()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String am()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String al()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String am()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String al()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String am()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String al()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String am()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String al()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"String\",\n \"new_signature\": \"String am()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"String\",\n \"old_signature\": \"String al()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Entity[]\",\n \"new_signature\": \"Entity[] an()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Entity[]\",\n \"old_signature\": \"Entity[] am()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"float\",\n \"new_signature\": \"float ao()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"float\",\n \"old_signature\": \"float an()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean ap()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean ao()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean ap()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean ao()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean ap()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean ao()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean ap()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean ao()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean ap()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean ao()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int ar()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aq()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int ar()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aq()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean ay()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"World\",\n \"new_signature\": \"World az()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"World\",\n \"old_signature\": \"World ay()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean az()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean ay()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bG()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bC()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void bk() {\\n this.bn = this.bJ();\\n Entity entity = this.bL();\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bJ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void bh() {\\n this.bn = this.bF();\\n Entity entity = this.bH();\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bF()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"ChunkCoordinates\",\n \"new_signature\": \"ChunkCoordinates bP()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"ChunkCoordinates\",\n \"old_signature\": \"ChunkCoordinates bL()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bR()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bN()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"Village\",\n \"new_signature\": \"Village bT()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"Village\",\n \"old_signature\": \"Village bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bT()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bT()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bT()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bT()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bT()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bT()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.cJ();\\n public int bU() {\\n public String am() {\\n if (this.bB()) {\\n return this.bA();\\n int i0 = this.bT();\\n public boolean bV() {\\n public boolean bW() {\\n public boolean ca() {\\n return this.bV();\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bT()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.cF();\\n public int bQ() {\\n public String al() {\\n if (this.bx()) {\\n return this.bw();\\n int i0 = this.bP();\\n public boolean bR() {\\n public boolean bS() {\\n public boolean bW() {\\n return this.bR();\\n public float bY() {\\n this.a(this.bY());\\n public boolean bZ() {\\n public void j(boolean flag0) {\\n public void k(boolean flag0) {\\n public boolean bC() {\\n return !this.cu() && super.bC();\\n public boolean ca() {\\n public int cb() {\\n public boolean cc() {\\n public boolean cd() {\\n public boolean ce() {\\n public boolean cf() {\\n this.cF();\\n public void l(boolean flag0) {\\n public void m(boolean flag0) {\\n public void n(boolean flag0) {\\n public void o(boolean flag0) {\\n public int cg() {\\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\\n if (this.n != null && this.n.equals(entity)) {\\n return false;\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.cJ();\\n public int bU() {\\n public String am() {\\n if (this.bB()) {\\n return this.bA();\\n int i0 = this.bT();\\n public boolean bV() {\\n public boolean bW() {\\n public boolean ca() {\\n return this.bV();\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bT()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.cF();\\n public int bQ() {\\n public String al() {\\n if (this.bx()) {\\n return this.bw();\\n int i0 = this.bP();\\n public boolean bR() {\\n public boolean bS() {\\n public boolean bW() {\\n return this.bR();\\n public float bY() {\\n this.a(this.bY());\\n public boolean bZ() {\\n public void j(boolean flag0) {\\n public void k(boolean flag0) {\\n public boolean bC() {\\n return !this.cu() && super.bC();\\n public boolean ca() {\\n public int cb() {\\n public boolean cc() {\\n public boolean cd() {\\n public boolean ce() {\\n public boolean cf() {\\n this.cF();\\n public void l(boolean flag0) {\\n public void m(boolean flag0) {\\n public void n(boolean flag0) {\\n public void o(boolean flag0) {\\n public int cg() {\\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\\n if (this.n != null && this.n.equals(entity)) {\\n return false;\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bT()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bT()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"EntityAIControlledByPlayer\",\n \"new_signature\": \"EntityAIControlledByPlayer bU()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"EntityAIControlledByPlayer\",\n \"old_signature\": \"EntityAIControlledByPlayer bQ()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bU()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bQ()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bU()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bQ()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bU()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bQ()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bU()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bQ()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bV()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bR()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bV()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bR()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bV()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bR()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bV()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bR()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bV()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bR()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bV()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bR()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bV()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bR()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bV()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bR()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bW()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bS()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bW()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bS()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bW()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bS()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bW()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bS()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int ca()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean cc()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bY()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bG()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bZ()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int cd()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bZ()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"float\",\n \"new_signature\": \"float bf()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"float\",\n \"old_signature\": \"float bc()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"float\",\n \"new_signature\": \"float bf()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"float\",\n \"old_signature\": \"float bc()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bd()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bg()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bd()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bj()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bg()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bl()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bi()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"float\",\n \"new_signature\": \"float bm()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"float\",\n \"old_signature\": \"float bj()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bp()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bl()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bp()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bl()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bp()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bl()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bs()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bo()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bs()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bo()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bs()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bo()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bs()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bo()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bs()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bo()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bs()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bo()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bs()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bo()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bs()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bo()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bs()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bo()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bs()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bo()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bs()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bo()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bs()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bo()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public boolean cc() {\\n public void l(boolean flag0) {\\n public int cd() {\\n entitywolf.j(true);\\n public void m(boolean flag0) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bv()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public boolean bY() {\\n public void m(boolean flag0) {\\n public int bZ() {\\n entitywolf.k(true);\\n public void n(boolean flag0) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int br()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public boolean cc() {\\n public void l(boolean flag0) {\\n public int cd() {\\n entitywolf.j(true);\\n public void m(boolean flag0) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bv()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public boolean bY() {\\n public void m(boolean flag0) {\\n public int bZ() {\\n entitywolf.k(true);\\n public void n(boolean flag0) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int br()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public boolean cc() {\\n public void l(boolean flag0) {\\n public int cd() {\\n entitywolf.j(true);\\n public void m(boolean flag0) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bv()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public boolean bY() {\\n public void m(boolean flag0) {\\n public int bZ() {\\n entitywolf.k(true);\\n public void n(boolean flag0) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int br()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public boolean cc() {\\n public void l(boolean flag0) {\\n public int cd() {\\n entitywolf.j(true);\\n public void m(boolean flag0) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bv()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public boolean bY() {\\n public void m(boolean flag0) {\\n public int bZ() {\\n entitywolf.k(true);\\n public void n(boolean flag0) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int br()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean by()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bu()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bB()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bx()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"EntityLivingBase entitylivingbase\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void d(EntityLivingBase entitylivingbase)\",\n \"old_args\": \"EntityLivingBase entitylivingbase\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void c(EntityLivingBase entitylivingbase)\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean ce()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean ca()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean cw()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean cs()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean cy()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean cu()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"PotionEffect potioneffect\",\n \"new_implementation\": null,\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean d(PotionEffect potioneffect)\",\n \"old_args\": \"PotionEffect potioneffect\",\n \"old_implementation\": null,\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean e(PotionEffect potioneffect)\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"boolean flag0,boolean flag1\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void a(boolean flag0,boolean flag1)\",\n \"old_args\": \"boolean flag0\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void i(boolean flag0)\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"boolean flag0\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void i(boolean flag0)\",\n \"old_args\": \"boolean flag0\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void j(boolean flag0)\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"boolean flag0\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void i(boolean flag0)\",\n \"old_args\": \"boolean flag0\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void j(boolean flag0)\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"boolean flag0\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void i(boolean flag0)\",\n \"old_args\": \"boolean flag0\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void j(boolean flag0)\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"boolean flag0\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void i(boolean flag0)\",\n \"old_args\": \"boolean flag0\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void j(boolean flag0)\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"boolean flag0\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void i(boolean flag0)\",\n \"old_args\": \"boolean flag0\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void k(boolean flag0)\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"boolean flag0\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void j(boolean flag0)\",\n \"old_args\": \"boolean flag0\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void k(boolean flag0)\"\n }\n]"},"files":{"kind":"list like","value":[{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/pom.xml","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/pom.xml?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"pom.xml","new_code":" 1.6.2\n ${minecraft.server.version}","new_methods":[],"old_code":" 1.6.1\n ${minecraft.server.version}_1","old_methods":[],"patch":"@@ -14,7 +14,7 @@\n 2012\n \n UTF-8\n- 1.6.1\n+ 1.6.2\n 0.9\n \n \n@@ -75,7 +75,7 @@\n \n net.minecraft\n server\n- ${minecraft.server.version}_1\n+ ${minecraft.server.version}\n \n \n junit","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/pom.xml","sha":"9e4e17aa873ee96c5ab2c4a3d19a8af145fda798","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2FCanaryEntity.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2FCanaryEntity.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/canarymod/api/entity/CanaryEntity.java","new_code":" return entity.am();\n return entity.av();\n return ((net.minecraft.server.EntityLiving) entity).bs();","new_methods":[],"old_code":" return entity.al();\n return entity.au();\n return ((net.minecraft.server.EntityLiving) entity).bo();","old_methods":[],"patch":"@@ -259,7 +259,7 @@ public void setInvisible(boolean invisible) {\n \n @Override\n public String getName() {\n- return entity.al();\n+ return entity.am();\n }\n \n @Override\n@@ -279,7 +279,7 @@ public int getID() {\n \n @Override\n public UUID getUUID() {\n- return entity.au();\n+ return entity.av();\n }\n \n @Override\n@@ -302,7 +302,7 @@ public void translate(Vector3D factor) {\n @Override\n public boolean canSpawn() {\n if (this.isLiving()) {\n- return ((net.minecraft.server.EntityLiving) entity).bo();\n+ return ((net.minecraft.server.EntityLiving) entity).bs();\n }\n return true;\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2FCanaryEntity.java","sha":"961d85d064afbbf58e8acab4c51542d6c4695676","status":"modified"},{"additions":6,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryEntityLiving.java","changes":12,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryEntityLiving.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":6,"filename":"src/main/java/net/canarymod/api/entity/living/CanaryEntityLiving.java","new_code":" return getHandle().aY().getCanaryItem();\n return CanaryItem.stackArrayToItemArray(getHandle().ad());\n return getHandle().bD();\n return getHandle().bE();\n return getHandle().bB();\n return getHandle().bA();","new_methods":[],"old_code":" return getHandle().aV().getCanaryItem();\n return CanaryItem.stackArrayToItemArray(getHandle().ac());\n return getHandle().bz();\n return getHandle().bA();\n return getHandle().bx();\n return getHandle().bw();","old_methods":[],"patch":"@@ -92,15 +92,15 @@ public void setAttackTarget(LivingBase livingbase) {\n */\n @Override\n public Item getItemInHand() {\n- return getHandle().aV().getCanaryItem();\n+ return getHandle().aY().getCanaryItem();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public Item[] getEquipment() {\n- return CanaryItem.stackArrayToItemArray(getHandle().ac());\n+ return CanaryItem.stackArrayToItemArray(getHandle().ad());\n }\n \n /**\n@@ -166,7 +166,7 @@ public void setDropChance(int slot, float chance) {\n */\n @Override\n public boolean canPickUpLoot() {\n- return getHandle().bz();\n+ return getHandle().bD();\n }\n \n /**\n@@ -182,7 +182,7 @@ public void setCanPickUpLoot(boolean loot) {\n */\n @Override\n public boolean isPersistenceRequired() {\n- return getHandle().bA();\n+ return getHandle().bE();\n }\n \n /**\n@@ -206,15 +206,15 @@ public AIManager getAITaskManager() {\n */\n @Override\n public boolean hasDisplayName() {\n- return getHandle().bx();\n+ return getHandle().bB();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public String getDisplayName() {\n- return getHandle().bw();\n+ return getHandle().bA();\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryEntityLiving.java","sha":"8cec8599022a99ea59050d801b34f992b56d63a0","status":"modified"},{"additions":5,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryIronGolem.java","changes":10,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryIronGolem.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":5,"filename":"src/main/java/net/canarymod/api/entity/living/CanaryIronGolem.java","new_code":" return getHandle().bT().getCanaryVillage();\n return getHandle().bW();\n getHandle().i(created);\n return getHandle().bV() > 0;\n return getHandle().bV();","new_methods":[],"old_code":" return getHandle().bP().getCanaryVillage();\n return getHandle().bS();\n getHandle().j(created);\n return getHandle().bR() > 0;\n return getHandle().bR();","old_methods":[],"patch":"@@ -40,7 +40,7 @@ public String getFqName() {\n */\n @Override\n public Village getVillage() {\n- return getHandle().bP().getCanaryVillage();\n+ return getHandle().bT().getCanaryVillage();\n }\n \n /**\n@@ -56,23 +56,23 @@ public void setVillage(Village village) {\n */\n @Override\n public boolean isPlayerCreated() {\n- return getHandle().bS();\n+ return getHandle().bW();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setPlayerCreated(boolean created) {\n- getHandle().j(created);\n+ getHandle().i(created);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isHoldingRose() {\n- return getHandle().bR() > 0;\n+ return getHandle().bV() > 0;\n }\n \n /**\n@@ -88,7 +88,7 @@ public void setHoldingRose(boolean holding) {\n */\n @Override\n public int getHoldRoseTicks() {\n- return getHandle().bR();\n+ return getHandle().bV();\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryIronGolem.java","sha":"af206393a2afb24cc28853dcfd7c1acdaae1e894","status":"modified"},{"additions":4,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryLivingBase.java","changes":8,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryLivingBase.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":4,"filename":"src/main/java/net/canarymod/api/entity/living/CanaryLivingBase.java","new_code":" return getHandle().aM();\n Collection effect_collection = ((net.minecraft.server.EntityLivingBase) entity).aK();\n net.minecraft.server.EntityLivingBase target = getHandle().aD();\n return getHandle().aT();","new_methods":[],"old_code":" return getHandle().aJ();\n Collection effect_collection = ((net.minecraft.server.EntityLivingBase) entity).aH();\n net.minecraft.server.EntityLivingBase target = getHandle().aC();\n return getHandle().aQ();","old_methods":[],"patch":"@@ -32,7 +32,7 @@ public CanaryLivingBase(EntityLivingBase entity) {\n */\n @Override\n public float getHealth() {\n- return getHandle().aJ();\n+ return getHandle().aM();\n }\n \n /**\n@@ -182,7 +182,7 @@ public PotionEffect getActivePotionEffect(Potion potion) {\n @SuppressWarnings(\"unchecked\")\n @Override\n public List getAllActivePotionEffects() {\n- Collection effect_collection = ((net.minecraft.server.EntityLivingBase) entity).aH();\n+ Collection effect_collection = ((net.minecraft.server.EntityLivingBase) entity).aK();\n List list = new ArrayList();\n \n for (net.minecraft.server.PotionEffect nms_effect : effect_collection) {\n@@ -196,7 +196,7 @@ public List getAllActivePotionEffects() {\n */\n @Override\n public LivingBase getRevengeTarget() {\n- net.minecraft.server.EntityLivingBase target = getHandle().aC();\n+ net.minecraft.server.EntityLivingBase target = getHandle().aD();\n if (target != null) {\n return (LivingBase) target.getCanaryEntity();\n }\n@@ -298,7 +298,7 @@ public void lookAt(Entity entity) {\n */\n @Override\n public int getArrowCountInEntity() {\n- return getHandle().aQ();\n+ return getHandle().aT();\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryLivingBase.java","sha":"c16c0da2439db7e63042edf40c8daa38abce41f1","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryBat.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryBat.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/canarymod/api/entity/living/animal/CanaryBat.java","new_code":" return getHandle().bG();","new_methods":[],"old_code":" return getHandle().bF();","old_methods":[],"patch":"@@ -38,7 +38,7 @@ public String getFqName() {\n */\n @Override\n public boolean isHanging() {\n- return getHandle().bF();\n+ return getHandle().bG();\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryBat.java","sha":"47bb1aee2b860ddc751238cae3b89bc427bdf6bb","status":"modified"},{"additions":12,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryHorse.java","changes":24,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryHorse.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":12,"filename":"src/main/java/net/canarymod/api/entity/living/animal/CanaryHorse.java","new_code":" return getHandle().cg();\n return getHandle().ci();\n getHandle().k(bred);\n return getHandle().ce();\n getHandle().l(chested);\n return getHandle().cj();\n getHandle().m(reproduced);\n return getHandle().bT();\n return getHandle().bU();\n return getHandle().ck();\n return getHandle().bW();\n getHandle().i(tame);","new_methods":[],"old_code":" return getHandle().cc();\n return getHandle().ce();\n getHandle().l(bred);\n return getHandle().ca();\n getHandle().m(chested);\n return getHandle().cf();\n getHandle().n(reproduced);\n return getHandle().bP();\n return getHandle().bQ();\n return getHandle().cg();\n return getHandle().bS();\n getHandle().j(tame);","old_methods":[],"patch":"@@ -47,55 +47,55 @@ public String getFqName() {\n */\n @Override\n public boolean isEatingHay() {\n- return getHandle().cc();\n+ return getHandle().cg();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isBred() {\n- return getHandle().ce();\n+ return getHandle().ci();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setIsBred(boolean bred) {\n- getHandle().l(bred);\n+ getHandle().k(bred);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isChested() {\n- return getHandle().ca();\n+ return getHandle().ce();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setIsChested(boolean chested) {\n- getHandle().m(chested);\n+ getHandle().l(chested);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean hasReproduced() {\n- return getHandle().cf();\n+ return getHandle().cj();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setHasReproduced(boolean reproduced) {\n- getHandle().n(reproduced);\n+ getHandle().m(reproduced);\n }\n \n /**\n@@ -111,7 +111,7 @@ public HorseType getType() {\n */\n @Override\n public int getRawType() {\n- return getHandle().bP();\n+ return getHandle().bT();\n }\n \n /**\n@@ -135,7 +135,7 @@ public void setType(int type) {\n */\n @Override\n public int getVariant() {\n- return getHandle().bQ();\n+ return getHandle().bU();\n }\n \n /**\n@@ -151,7 +151,7 @@ public void setVariant(int variant) {\n */\n @Override\n public int getTemper() {\n- return getHandle().cg();\n+ return getHandle().ck();\n }\n \n /**\n@@ -167,15 +167,15 @@ public void setTemper(int temper) {\n */\n @Override\n public boolean isTame() {\n- return getHandle().bS();\n+ return getHandle().bW();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setTame(boolean tame) {\n- getHandle().j(tame);\n+ getHandle().i(tame);\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryHorse.java","sha":"6cdb2b79f6d32e35f6181f6d269d0fa6fad4b561","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryOcelot.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryOcelot.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/canarymod/api/entity/living/animal/CanaryOcelot.java","new_code":" return SkinType.values()[getHandle().ca()];","new_methods":[],"old_code":" return SkinType.values()[getHandle().bW()];","old_methods":[],"patch":"@@ -38,7 +38,7 @@ public String getFqName() {\n */\n @Override\n public SkinType getSkinType() {\n- return SkinType.values()[getHandle().bW()];\n+ return SkinType.values()[getHandle().ca()];\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryOcelot.java","sha":"2a1a82fd408aa307c835c407a3da83fecb33ab28","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryPig.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryPig.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/canarymod/api/entity/living/animal/CanaryPig.java","new_code":" return ((EntityPig) entity).bT();\n ((EntityPig) entity).i(saddled);","new_methods":[],"old_code":" return ((EntityPig) entity).bP();\n ((EntityPig) entity).j(saddled);","old_methods":[],"patch":"@@ -38,15 +38,15 @@ public String getFqName() {\n */\n @Override\n public boolean isSaddled() {\n- return ((EntityPig) entity).bP();\n+ return ((EntityPig) entity).bT();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setSaddled(boolean saddled) {\n- ((EntityPig) entity).j(saddled);\n+ ((EntityPig) entity).i(saddled);\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryPig.java","sha":"fb939b7946db09dc212b153ea9f4450a0b36ffb3","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanarySheep.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanarySheep.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/canarymod/api/entity/living/animal/CanarySheep.java","new_code":" return DyeColor.values()[getHandle().bT()];\n return getHandle().bU();\n getHandle().i(sheared);","new_methods":[],"old_code":" return DyeColor.values()[getHandle().bP()];\n return getHandle().bQ();\n getHandle().j(sheared);","old_methods":[],"patch":"@@ -47,7 +47,7 @@ public void eatGrass() {\n */\n @Override\n public DyeColor getColor() {\n- return DyeColor.values()[getHandle().bP()];\n+ return DyeColor.values()[getHandle().bT()];\n }\n \n /**\n@@ -63,15 +63,15 @@ public void setColor(DyeColor color) {\n */\n @Override\n public boolean isSheared() {\n- return getHandle().bQ();\n+ return getHandle().bU();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setSheared(boolean sheared) {\n- getHandle().j(sheared);\n+ getHandle().i(sheared);\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanarySheep.java","sha":"5b098e19e867b6c2ad9e854784c80982dab29b68","status":"modified"},{"additions":6,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryTameable.java","changes":12,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryTameable.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":6,"filename":"src/main/java/net/canarymod/api/entity/living/animal/CanaryTameable.java","new_code":" return (LivingBase) getHandle().bV().getCanaryEntity();\n getHandle().b(name);\n return getHandle().bT();\n getHandle().j(tamed);\n return getHandle().bU();\n ((EntityTameable) entity).k(sitting);","new_methods":[],"old_code":" return (LivingBase) getHandle().bR().getCanaryEntity();\n ((EntityTameable) entity).b(name);\n return ((EntityTameable) entity).bP();\n ((EntityTameable) entity).k(tamed);\n return ((EntityTameable) entity).bQ();\n ((EntityTameable) entity).l(sitting);","old_methods":[],"patch":"@@ -25,7 +25,7 @@ public CanaryTameable(EntityTameable entity) {\n */\n @Override\n public LivingBase getOwner() {\n- return (LivingBase) getHandle().bR().getCanaryEntity();\n+ return (LivingBase) getHandle().bV().getCanaryEntity();\n }\n \n /**\n@@ -49,39 +49,39 @@ public void setOwner(LivingBase entity) {\n */\n @Override\n public void setOwner(String name) {\n- ((EntityTameable) entity).b(name);\n+ getHandle().b(name);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isTamed() {\n- return ((EntityTameable) entity).bP();\n+ return getHandle().bT();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setTamed(boolean tamed) {\n- ((EntityTameable) entity).k(tamed);\n+ getHandle().j(tamed);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isSitting() {\n- return ((EntityTameable) entity).bQ();\n+ return getHandle().bU();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setSitting(boolean sitting) {\n- ((EntityTameable) entity).l(sitting);\n+ ((EntityTameable) entity).k(sitting);\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryTameable.java","sha":"b6df508cfa9cf3db9d161a6c458fd225afa5189c","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryWolf.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryWolf.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/canarymod/api/entity/living/animal/CanaryWolf.java","new_code":" return DyeColor.values()[getHandle().cd()];","new_methods":[],"old_code":" return DyeColor.values()[getHandle().bZ()];","old_methods":[],"patch":"@@ -63,7 +63,7 @@ public void setCollarColor(DyeColor color) {\n */\n @Override\n public DyeColor getCollarColor() {\n- return DyeColor.values()[getHandle().bZ()];\n+ return DyeColor.values()[getHandle().cd()];\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryWolf.java","sha":"4f26598264d2631b271fbc992bc2e271c571148d","status":"modified"},{"additions":8,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryPlayer.java","changes":16,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryPlayer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":8,"filename":"src/main/java/net/canarymod/api/entity/living/humanoid/CanaryPlayer.java","new_code":" ChunkCoordinates loc = ((EntityPlayerMP) entity).bE();\n getHandle().bH().a(exhaustion);\n getHandle().bH().setExhaustionLevel(exhaustion);\n return getHandle().bH().getExhaustionLevel();\n getHandle().bH().setFoodLevel(hunger);\n return getHandle().bH().a();\n return getHandle().bg();\n return getHandle().bC();","new_methods":[],"old_code":" ChunkCoordinates loc = ((EntityPlayerMP) entity).bA();\n getHandle().bD().a(exhaustion);\n getHandle().bD().setExhaustionLevel(exhaustion);\n return getHandle().bD().getExhaustionLevel();\n getHandle().bD().setFoodLevel(hunger);\n return getHandle().bD().a();\n return getHandle().bd();\n return getHandle().by();","old_methods":[],"patch":"@@ -116,7 +116,7 @@ public void notice(String message) {\n @Override\n public Location getSpawnPosition() {\n Location spawn = Canary.getServer().getDefaultWorld().getSpawnLocation();\n- ChunkCoordinates loc = ((EntityPlayerMP) entity).bA();\n+ ChunkCoordinates loc = ((EntityPlayerMP) entity).bE();\n \n if (loc != null) {\n spawn = new Location(Canary.getServer().getDefaultWorld(), loc.a, loc.b, loc.c, 0.0F, 0.0F);\n@@ -469,27 +469,27 @@ public void sendPlayerListEntry(PlayerListEntry plentry) {\n \n @Override\n public void addExhaustion(float exhaustion) {\n- getHandle().bD().a(exhaustion);\n+ getHandle().bH().a(exhaustion);\n }\n \n @Override\n public void setExhaustion(float exhaustion) {\n- getHandle().bD().setExhaustionLevel(exhaustion);\n+ getHandle().bH().setExhaustionLevel(exhaustion);\n }\n \n @Override\n public float getExhaustionLevel() {\n- return getHandle().bD().getExhaustionLevel();\n+ return getHandle().bH().getExhaustionLevel();\n }\n \n @Override\n public void setHunger(int hunger) {\n- getHandle().bD().setFoodLevel(hunger);\n+ getHandle().bH().setFoodLevel(hunger);\n }\n \n @Override\n public int getHunger() {\n- return getHandle().bD().a();\n+ return getHandle().bH().a();\n }\n \n @Override\n@@ -522,12 +522,12 @@ public int getLevel() {\n \n @Override\n public boolean isSleeping() {\n- return getHandle().bd();\n+ return getHandle().bg();\n }\n \n @Override\n public boolean isDeeplySleeping() {\n- return getHandle().by();\n+ return getHandle().bC();\n }\n \n @Override","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryPlayer.java","sha":"c2107a350390921dbde1e9ae596eab49b9fdd165","status":"modified"},{"additions":5,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryVillager.java","changes":10,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryVillager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":5,"filename":"src/main/java/net/canarymod/api/entity/living/humanoid/CanaryVillager.java","new_code":" return Profession.fromId(getHandle().bT());\n return getHandle().bU();\n getHandle().j(isMating);\n return getHandle().bS();\n getHandle().i(playing);","new_methods":[],"old_code":" return Profession.fromId(getHandle().bP());\n return getHandle().bQ();\n getHandle().i(isMating);\n return getHandle().bR();\n getHandle().j(playing);","old_methods":[],"patch":"@@ -44,7 +44,7 @@ public String getFqName() {\n */\n @Override\n public Profession getProfession() {\n- return Profession.fromId(getHandle().bP());\n+ return Profession.fromId(getHandle().bT());\n }\n \n /**\n@@ -60,31 +60,31 @@ public void setProfession(Profession profession) {\n */\n @Override\n public boolean isMating() {\n- return getHandle().bQ();\n+ return getHandle().bU();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setMating(boolean isMating) {\n- getHandle().i(isMating);\n+ getHandle().j(isMating);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isPlaying() {\n- return getHandle().bR();\n+ return getHandle().bS();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setPlaying(boolean playing) {\n- getHandle().j(playing);\n+ getHandle().i(playing);\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryVillager.java","sha":"f4dad2939c03e3bb25f87f5eb62e9f451f7f6823","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FEntityNonPlayableCharacter.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FEntityNonPlayableCharacter.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/canarymod/api/entity/living/humanoid/EntityNonPlayableCharacter.java","new_code":" protected void bh() {","new_methods":[],"old_code":" protected void be() {","old_methods":[],"patch":"@@ -97,7 +97,7 @@ public void w() {\n getNPC().destroyed();\n }\n \n- protected void be() {\n+ protected void bh() {\n this.move_helper.c();\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FEntityNonPlayableCharacter.java","sha":"6c61324142c515a8dec5234840315bbd2bdffefe","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryBlaze.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryBlaze.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/canarymod/api/entity/living/monster/CanaryBlaze.java","new_code":" return getHandle().bT();","new_methods":[],"old_code":" return getHandle().bP();","old_methods":[],"patch":"@@ -38,7 +38,7 @@ public String getFqName() {\n */\n @Override\n public boolean isBurning() {\n- return getHandle().bP();\n+ return getHandle().bT();\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryBlaze.java","sha":"cd3c32bb14a12d4dbb09d709c5d6693981a49345","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryCreeper.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryCreeper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/canarymod/api/entity/living/monster/CanaryCreeper.java","new_code":" return getHandle().bT();\n return getHandle().bV() == 1;","new_methods":[],"old_code":" return getHandle().bP();\n return getHandle().bR() == 1;","old_methods":[],"patch":"@@ -73,7 +73,7 @@ public boolean canDamageEntities() {\n */\n @Override\n public boolean isCharged() {\n- return getHandle().bP();\n+ return getHandle().bT();\n }\n \n /**\n@@ -145,7 +145,7 @@ public void decreaseFuse(int decrease) {\n */\n @Override\n public boolean isAgro() {\n- return getHandle().bR() == 1;\n+ return getHandle().bV() == 1;\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryCreeper.java","sha":"f858ec789f8aae374818bb8aaf3672009e34b2aa","status":"modified"},{"additions":4,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryEnderman.java","changes":8,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryEnderman.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":4,"filename":"src/main/java/net/canarymod/api/entity/living/monster/CanaryEnderman.java","new_code":" return (short) getHandle().bW();\n return (short) getHandle().bV();\n return getHandle().bT();\n return getHandle().bX();","new_methods":[],"old_code":" return (short) getHandle().bR();\n return (short) getHandle().bS();\n return getHandle().bP();\n return getHandle().bT();","old_methods":[],"patch":"@@ -38,7 +38,7 @@ public String getFqName() {\n */\n @Override\n public short getCarriedBlockID() {\n- return (short) getHandle().bR();\n+ return (short) getHandle().bW();\n }\n \n /**\n@@ -54,7 +54,7 @@ public void setCarriedBlockID(short blockId) {\n */\n @Override\n public short getCarriedBlockMetaData() {\n- return (short) getHandle().bS();\n+ return (short) getHandle().bV();\n }\n \n /**\n@@ -70,15 +70,15 @@ public void setCarriedBlockMetaData(short metadata) {\n */\n @Override\n public boolean randomTeleport() {\n- return getHandle().bP();\n+ return getHandle().bT();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isScreaming() {\n- return getHandle().bT();\n+ return getHandle().bX();\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryEnderman.java","sha":"5a0332f4853ae1da7ba5961ecc584726e4dc060a","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySkeleton.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySkeleton.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/canarymod/api/entity/living/monster/CanarySkeleton.java","new_code":" return getHandle().bV() == 1;","new_methods":[],"old_code":" return getHandle().bR() == 1;","old_methods":[],"patch":"@@ -38,7 +38,7 @@ public String getFqName() {\n */\n @Override\n public boolean isWitherSkeleton() {\n- return getHandle().bR() == 1;\n+ return getHandle().bV() == 1;\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySkeleton.java","sha":"92f6aae3d73ad00dbca0a265271c9bf3de72628d","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySlime.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySlime.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/canarymod/api/entity/living/monster/CanarySlime.java","new_code":" return Size.fromByte((byte) getHandle().bR());","new_methods":[],"old_code":" return Size.fromByte((byte) getHandle().bN());","old_methods":[],"patch":"@@ -39,7 +39,7 @@ public String getFqName() {\n */\n @Override\n public Size getSize() {\n- return Size.fromByte((byte) getHandle().bN());\n+ return Size.fromByte((byte) getHandle().bR());\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySlime.java","sha":"b2d70c199e66bf5b22f7046426c5476fbb82d08c","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryWitch.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryWitch.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/canarymod/api/entity/living/monster/CanaryWitch.java","new_code":" return getHandle().bT();","new_methods":[],"old_code":" return getHandle().bP();","old_methods":[],"patch":"@@ -38,7 +38,7 @@ public String getFqName() {\n */\n @Override\n public boolean isAgressive() {\n- return getHandle().bP();\n+ return getHandle().bT();\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryWitch.java","sha":"ecd83f37c24ce10338e97db9541b66ba91165fee","status":"modified"},{"additions":9,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryZombie.java","changes":18,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryZombie.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":9,"filename":"src/main/java/net/canarymod/api/entity/living/monster/CanaryZombie.java","new_code":" return getHandle().bT();\n getHandle().i(villager);\n return getHandle().g_();\n getHandle().a(child);\n return getHandle().getConvertTicks();\n getHandle().b(ticks);\n return getHandle().bV();\n getHandle().stopConversion();\n getHandle().bS();","new_methods":[],"old_code":" return ((EntityZombie) entity).bP();\n ((EntityZombie) entity).j(villager);\n return ((EntityZombie) entity).g_();\n ((EntityZombie) entity).a(child);\n return ((EntityZombie) entity).getConvertTicks();\n ((EntityZombie) entity).a(ticks);\n return ((EntityZombie) entity).bR();\n ((EntityZombie) entity).stopConversion();\n ((EntityZombie) entity).bS();","old_methods":[],"patch":"@@ -38,71 +38,71 @@ public String getFqName() {\n */\n @Override\n public boolean isVillager() {\n- return ((EntityZombie) entity).bP();\n+ return getHandle().bT();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setVillager(boolean villager) {\n- ((EntityZombie) entity).j(villager);\n+ getHandle().i(villager);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isChild() {\n- return ((EntityZombie) entity).g_();\n+ return getHandle().g_();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setChild(boolean child) {\n- ((EntityZombie) entity).a(child);\n+ getHandle().a(child);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public int getConversionTime() {\n- return ((EntityZombie) entity).getConvertTicks();\n+ return getHandle().getConvertTicks();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void setConversionTime(int ticks) {\n- ((EntityZombie) entity).a(ticks);\n+ getHandle().b(ticks);\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public boolean isConverting() {\n- return ((EntityZombie) entity).bR();\n+ return getHandle().bV();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void stopConverting() {\n- ((EntityZombie) entity).stopConversion();\n+ getHandle().stopConversion();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void convertToVillager() {\n- ((EntityZombie) entity).bS();\n+ getHandle().bS();\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryZombie.java","sha":"5ff93b49f5d7951cafaca6880ec9ec1c9b5d24a4","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fvehicle%2FCanaryHopperMinecart.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fvehicle%2FCanaryHopperMinecart.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/canarymod/api/entity/vehicle/CanaryHopperMinecart.java","new_code":" return getHandle().ay();","new_methods":[],"old_code":" return getHandle().ax();","old_methods":[],"patch":"@@ -67,7 +67,7 @@ public void setTransferCooldown(int cooldown) {\n */\n @Override\n public boolean isBlocked() {\n- return getHandle().ax();\n+ return getHandle().ay();\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fvehicle%2FCanaryHopperMinecart.java","sha":"2209cc177dbfb819f2006182452e0bf31a241fcc","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryComplexBlock.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryComplexBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/canarymod/api/world/blocks/CanaryComplexBlock.java","new_code":" return tileentity.az().getCanaryWorld();\n tileentity.az().j(getX(), getY(), getZ());","new_methods":[],"old_code":" return tileentity.ay().getCanaryWorld();\n tileentity.ay().j(getX(), getY(), getZ());","old_methods":[],"patch":"@@ -78,15 +78,15 @@ public int getZ() {\n */\n @Override\n public World getWorld() {\n- return tileentity.ay().getCanaryWorld();\n+ return tileentity.az().getCanaryWorld();\n }\n \n /**\n * {@inheritDoc}\n */\n @Override\n public void update() {\n- tileentity.ay().j(getX(), getY(), getZ());\n+ tileentity.az().j(getX(), getY(), getZ());\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryComplexBlock.java","sha":"1eaf3233e48838b5bd54da7b948bde0e12216a52","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryHopperBlock.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryHopperBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/canarymod/api/world/blocks/CanaryHopperBlock.java","new_code":" return this.getTileEntity().az().getCanaryWorld();","new_methods":[],"old_code":" return this.getTileEntity().ay().getCanaryWorld();","old_methods":[],"patch":"@@ -82,7 +82,7 @@ public boolean isOutputConnected() {\n */\n @Override\n public World getWorld() {\n- return this.getTileEntity().ay().getCanaryWorld();\n+ return this.getTileEntity().az().getCanaryWorld();\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryHopperBlock.java","sha":"8b90e9bdd26706f75bafd342a6cfc6430a3da2b3","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryNoteBlock.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryNoteBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/canarymod/api/world/blocks/CanaryNoteBlock.java","new_code":" Material material = tileentity.az().g(getX(), getY() - 1, getZ());\n getTileEntity().a(tileentity.az(), getX(), getY(), getZ());","new_methods":[],"old_code":" Material material = tileentity.ay().g(getX(), getY() - 1, getZ());\n getTileEntity().a(tileentity.ay(), getX(), getY(), getZ());","old_methods":[],"patch":"@@ -25,7 +25,7 @@ public CanaryNoteBlock(TileEntityNote tileentity) {\n */\n @Override\n public byte getInstrument() {\n- Material material = tileentity.ay().g(getX(), getY() - 1, getZ());\n+ Material material = tileentity.az().g(getX(), getY() - 1, getZ());\n byte instrument = 0;\n \n if (material == Material.e) {\n@@ -60,7 +60,7 @@ public byte getNote() {\n */\n @Override\n public void play() {\n- getTileEntity().a(tileentity.ay(), getX(), getY(), getZ());\n+ getTileEntity().a(tileentity.az(), getX(), getY(), getZ());\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryNoteBlock.java","sha":"ba03a53585304ba9babbca81a86e99bd0ba75d75","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAchievement.java","changes":1,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAchievement.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/Achievement.java","new_code":"","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class Achievement extends StatBase {\n \n public final int a;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAchievement.java","sha":"98d39ca093b920b83a7a8769f0434841841d03e6","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveConverter.java","changes":3,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveConverter.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/AnvilSaveConverter.java","new_code":"","new_methods":[],"old_code":"\n\n","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n import java.io.DataInput;\n import java.io.DataInputStream;\n import java.io.DataOutput;\n@@ -11,10 +10,8 @@\n import java.util.Collection;\n import java.util.Collections;\n import java.util.Iterator;\n-\n import net.canarymod.Canary;\n \n-\n public class AnvilSaveConverter extends SaveFormatOld {\n \n public AnvilSaveConverter(File file1, net.canarymod.api.world.DimensionType type) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveConverter.java","sha":"f288c413533d66a877ff8d1602fc7d89511a8f1e","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveHandler.java","changes":3,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveHandler.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/AnvilSaveHandler.java","new_code":"","new_methods":[],"old_code":"\n\n","old_methods":[],"patch":"@@ -1,11 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.io.File;\n-\n import net.canarymod.api.world.DimensionType;\n \n-\n public class AnvilSaveHandler extends SaveHandler {\n \n public AnvilSaveHandler(File file1, String s0, boolean flag0, DimensionType type) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveHandler.java","sha":"afa45f028bb470a52c92f4b5ca9761bc0c3ead83","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBehaviorDispenseMinecart.java","changes":1,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBehaviorDispenseMinecart.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/BehaviorDispenseMinecart.java","new_code":"","new_methods":[],"old_code":" // MERGE: This seems to be new - Chris","old_methods":[],"patch":"@@ -31,7 +31,6 @@ public ItemStack b(IBlockSource iblocksource, ItemStack itemstack) {\n }\n \n EntityMinecart entityminecart = EntityMinecart.a(world, d0, d1 + d3, d2, ((ItemMinecart) itemstack.b()).a);\n- // MERGE: This seems to be new - Chris\n if (itemstack.u()) {\n entityminecart.a(itemstack.s());\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBehaviorDispenseMinecart.java","sha":"b03753db03d2e3374d4df0878c3b5c36b3ca7a37","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlock.java","changes":3,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/Block.java","new_code":" protected final void a(float f0, float f1, float f2, float f3, float f4, float f5) {","new_methods":[],"old_code":" protected final void a(float f0, float f1, float f2, float f3, float f4,\n float f5) {","old_methods":[],"patch":"@@ -296,8 +296,7 @@ public boolean t() {\n return this.cL;\n }\n \n- protected final void a(float f0, float f1, float f2, float f3, float f4,\n- float f5) {\n+ protected final void a(float f0, float f1, float f2, float f3, float f4, float f5) {\n this.cM = (double) f0;\n this.cN = (double) f1;\n this.cO = (double) f2;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlock.java","sha":"ad5dbacac3903fe3043c3670251fc9ba1af76536","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockDoor.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockDoor.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/BlockDoor.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import java.util.Random;\n \n-\n public class BlockDoor extends Block {\n \n protected BlockDoor(int i0, Material material) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockDoor.java","sha":"32355c83cbb9391f6b71648065bf0a269e11e668","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockFluid.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockFluid.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/BlockFluid.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import java.util.Random;\n \n-\n public abstract class BlockFluid extends Block {\n \n protected BlockFluid(int i0, Material material) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockFluid.java","sha":"d5dd852f73c295ca5ad22e213f3e799117861994","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockHalfSlab.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockHalfSlab.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/BlockHalfSlab.java","new_code":" this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod cast to IBlockAccess","new_methods":[],"old_code":" this.a((IBlockAccess)world, i0, i1, i2); //CanaryMod cast to IBlockAccess","old_methods":[],"patch":"@@ -42,7 +42,7 @@ public void g() {\n }\n \n public void a(World world, int i0, int i1, int i2, AxisAlignedBB axisalignedbb, List list, Entity entity) {\n- this.a((IBlockAccess)world, i0, i1, i2); //CanaryMod cast to IBlockAccess\n+ this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod cast to IBlockAccess\n super.a(world, i0, i1, i2, axisalignedbb, list, entity);\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockHalfSlab.java","sha":"43da760086f787302eb3f1ab84ee2adb85998bf0","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLadder.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLadder.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/BlockLadder.java","new_code":" this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod: cast to IBlockAccess","new_methods":[],"old_code":" this.a((IBlockAccess) world, i0, i1, i2); //CanaryMod: cast to IBlockAccess","old_methods":[],"patch":"@@ -10,7 +10,7 @@ protected BlockLadder(int i0) {\n }\n \n public AxisAlignedBB b(World world, int i0, int i1, int i2) {\n- this.a((IBlockAccess) world, i0, i1, i2); //CanaryMod: cast to IBlockAccess\n+ this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod: cast to IBlockAccess\n return super.b(world, i0, i1, i2);\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLadder.java","sha":"607dcebe225336b8082c1a5a272529ef5d35ebcf","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLeaves.java","changes":10,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLeaves.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":7,"filename":"src/main/java/net/minecraft/server/BlockLeaves.java","new_code":" public static final String[] a = new String[]{ \"oak\", \"spruce\", \"birch\", \"jungle\" };\n public static final String[][] b = new String[][]{ { \"leaves_oak\", \"leaves_spruce\", \"leaves_birch\", \"leaves_jungle\" }, { \"leaves_oak_opaque\", \"leaves_spruce_opaque\", \"leaves_birch_opaque\", \"leaves_jungle_opaque\" } };\n if (!world.I && entityplayer.bx() != null && entityplayer.bx().d == Item.bg.cv) {","new_methods":[],"old_code":" public static final String[] a = new String[]{ \"oak\", \"spruce\", \"birch\",\n \"jungle\" };\n public static final String[][] b = new String[][]{\n { \"leaves_oak\", \"leaves_spruce\", \"leaves_birch\", \"leaves_jungle\" },\n { \"leaves_oak_opaque\", \"leaves_spruce_opaque\",\n \"leaves_birch_opaque\", \"leaves_jungle_opaque\" } };\n if (!world.I && entityplayer.bt() != null && entityplayer.bt().d == Item.bg.cv) {","old_methods":[],"patch":"@@ -6,12 +6,8 @@\n \n public class BlockLeaves extends BlockLeavesBase {\n \n- public static final String[] a = new String[]{ \"oak\", \"spruce\", \"birch\",\n- \"jungle\" };\n- public static final String[][] b = new String[][]{\n- { \"leaves_oak\", \"leaves_spruce\", \"leaves_birch\", \"leaves_jungle\" },\n- { \"leaves_oak_opaque\", \"leaves_spruce_opaque\",\n- \"leaves_birch_opaque\", \"leaves_jungle_opaque\" } };\n+ public static final String[] a = new String[]{ \"oak\", \"spruce\", \"birch\", \"jungle\" };\n+ public static final String[][] b = new String[][]{ { \"leaves_oak\", \"leaves_spruce\", \"leaves_birch\", \"leaves_jungle\" }, { \"leaves_oak_opaque\", \"leaves_spruce_opaque\", \"leaves_birch_opaque\", \"leaves_jungle_opaque\" } };\n private Icon[][] cX = new Icon[2][];\n int[] c;\n \n@@ -179,7 +175,7 @@ public void a(World world, int i0, int i1, int i2, int i3, float f0, int i4) {\n }\n \n public void a(World world, EntityPlayer entityplayer, int i0, int i1, int i2, int i3) {\n- if (!world.I && entityplayer.bt() != null && entityplayer.bt().d == Item.bg.cv) {\n+ if (!world.I && entityplayer.bx() != null && entityplayer.bx().d == Item.bg.cv) {\n entityplayer.a(StatList.C[this.cF], 1);\n this.b(world, i0, i1, i2, new ItemStack(Block.P.cF, 1, i3 & 3));\n } else {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLeaves.java","sha":"88bb9e39274470f021972b4d76ce37c31ace7f30","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLever.java","changes":10,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLever.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":8,"filename":"src/main/java/net/minecraft/server/BlockLever.java","new_code":" return i3 == 0 && world.u(i0, i1 + 1, i2) ? true : (i3 == 1 && world.w(i0, i1 - 1, i2) ? true : (i3 == 2 && world.u(i0, i1, i2 + 1) ? true : (i3 == 3 && world.u(i0, i1, i2 - 1) ? true : (i3 == 4 && world.u(i0 + 1, i1, i2) ? true : i3 == 5 && world.u(i0 - 1, i1, i2)))));\n world.a((double) i0 + 0.5D, (double) i1 + 0.5D, (double) i2 + 0.5D, \"random.click\", 0.3F, i6 > 0 ? 0.6F : 0.5F);","new_methods":[],"old_code":" return i3 == 0 && world.u(i0, i1 + 1, i2) ? true : (i3 == 1\n && world.w(i0, i1 - 1, i2) ? true : (i3 == 2\n && world.u(i0, i1, i2 + 1) ? true : (i3 == 3\n && world.u(i0, i1, i2 - 1) ? true : (i3 == 4\n && world.u(i0 + 1, i1, i2) ? true : i3 == 5\n && world.u(i0 - 1, i1, i2)))));\n world.a((double) i0 + 0.5D, (double) i1 + 0.5D, (double) i2 + 0.5D,\n \"random.click\", 0.3F, i6 > 0 ? 0.6F : 0.5F);","old_methods":[],"patch":"@@ -26,12 +26,7 @@ public int d() {\n }\n \n public boolean c(World world, int i0, int i1, int i2, int i3) {\n- return i3 == 0 && world.u(i0, i1 + 1, i2) ? true : (i3 == 1\n- && world.w(i0, i1 - 1, i2) ? true : (i3 == 2\n- && world.u(i0, i1, i2 + 1) ? true : (i3 == 3\n- && world.u(i0, i1, i2 - 1) ? true : (i3 == 4\n- && world.u(i0 + 1, i1, i2) ? true : i3 == 5\n- && world.u(i0 - 1, i1, i2)))));\n+ return i3 == 0 && world.u(i0, i1 + 1, i2) ? true : (i3 == 1 && world.w(i0, i1 - 1, i2) ? true : (i3 == 2 && world.u(i0, i1, i2 + 1) ? true : (i3 == 3 && world.u(i0, i1, i2 - 1) ? true : (i3 == 4 && world.u(i0 + 1, i1, i2) ? true : i3 == 5 && world.u(i0 - 1, i1, i2)))));\n }\n \n public boolean c(World world, int i0, int i1, int i2) {\n@@ -210,8 +205,7 @@ public boolean a(World world, int i0, int i1, int i2, EntityPlayer entityplayer,\n } // CanaryMod: end\n \n world.b(i0, i1, i2, i5 + i6, 3);\n- world.a((double) i0 + 0.5D, (double) i1 + 0.5D, (double) i2 + 0.5D,\n- \"random.click\", 0.3F, i6 > 0 ? 0.6F : 0.5F);\n+ world.a((double) i0 + 0.5D, (double) i1 + 0.5D, (double) i2 + 0.5D, \"random.click\", 0.3F, i6 > 0 ? 0.6F : 0.5F);\n world.f(i0, i1, i2, this.cF);\n if (i5 == 1) {\n world.f(i0 - 1, i1, i2, this.cF);","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLever.java","sha":"e95a5c3cb77536f945e07978a73fb704cbb5959f","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPistonBase.java","changes":14,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPistonBase.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":12,"filename":"src/main/java/net/minecraft/server/BlockPistonBase.java","new_code":" return i3 != 0 && world.k(i0, i1 - 1, i2, 0) ? true : (i3 != 1 && world.k(i0, i1 + 1, i2, 1) ? true : (i3 != 2 && world.k(i0, i1, i2 - 1, 2) ? true : (i3 != 3 && world.k(i0, i1, i2 + 1, 3) ? true : (i3 != 5 && world.k(i0 + 1, i1, i2, 5) ? true : (i3 != 4 && world.k(i0 - 1, i1, i2, 4) ? true : (world.k(i0, i1, i2, 0) ? true : (world.k(i0, i1 + 2, i2,\n 1) ? true : (world.k(i0, i1 + 1, i2 - 1, 2) ? true : (world.k(i0, i1 + 1, i2 + 1, 3) ? true : (world.k(i0 - 1, i1 + 1, i2, 4) ? true : world.k(i0 + 1, i1 + 1, i2, 5)))))))))));","new_methods":[],"old_code":" return i3 != 0 && world.k(i0, i1 - 1, i2, 0) ? true : (i3 != 1\n && world.k(i0, i1 + 1, i2, 1) ? true : (i3 != 2\n && world.k(i0, i1, i2 - 1, 2) ? true : (i3 != 3\n && world.k(i0, i1, i2 + 1, 3) ? true : (i3 != 5\n && world.k(i0 + 1, i1, i2, 5) ? true : (i3 != 4\n && world.k(i0 - 1, i1, i2, 4) ? true\n : (world.k(i0, i1, i2, 0) ? true\n : (world.k(i0, i1 + 2, i2, 1) ? true : (world.k(i0,\n i1 + 1, i2 - 1, 2) ? true : (world.k(i0,\n i1 + 1, i2 + 1, 3) ? true : (world.k(i0 - 1,\n i1 + 1, i2, 4) ? true : world.k(i0 + 1, i1 + 1,\n i2, 5)))))))))));","old_methods":[],"patch":"@@ -87,18 +87,8 @@ private void k(World world, int i0, int i1, int i2) {\n }\n \n private boolean d(World world, int i0, int i1, int i2, int i3) {\n- return i3 != 0 && world.k(i0, i1 - 1, i2, 0) ? true : (i3 != 1\n- && world.k(i0, i1 + 1, i2, 1) ? true : (i3 != 2\n- && world.k(i0, i1, i2 - 1, 2) ? true : (i3 != 3\n- && world.k(i0, i1, i2 + 1, 3) ? true : (i3 != 5\n- && world.k(i0 + 1, i1, i2, 5) ? true : (i3 != 4\n- && world.k(i0 - 1, i1, i2, 4) ? true\n- : (world.k(i0, i1, i2, 0) ? true\n- : (world.k(i0, i1 + 2, i2, 1) ? true : (world.k(i0,\n- i1 + 1, i2 - 1, 2) ? true : (world.k(i0,\n- i1 + 1, i2 + 1, 3) ? true : (world.k(i0 - 1,\n- i1 + 1, i2, 4) ? true : world.k(i0 + 1, i1 + 1,\n- i2, 5)))))))))));\n+ return i3 != 0 && world.k(i0, i1 - 1, i2, 0) ? true : (i3 != 1 && world.k(i0, i1 + 1, i2, 1) ? true : (i3 != 2 && world.k(i0, i1, i2 - 1, 2) ? true : (i3 != 3 && world.k(i0, i1, i2 + 1, 3) ? true : (i3 != 5 && world.k(i0 + 1, i1, i2, 5) ? true : (i3 != 4 && world.k(i0 - 1, i1, i2, 4) ? true : (world.k(i0, i1, i2, 0) ? true : (world.k(i0, i1 + 2, i2,\n+ 1) ? true : (world.k(i0, i1 + 1, i2 - 1, 2) ? true : (world.k(i0, i1 + 1, i2 + 1, 3) ? true : (world.k(i0 - 1, i1 + 1, i2, 4) ? true : world.k(i0 + 1, i1 + 1, i2, 5)))))))))));\n }\n \n public boolean b(World world, int i0, int i1, int i2, int i3, int i4) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPistonBase.java","sha":"121e2fec9a9f21b1c274eb80e2c6aeee8e6fcedd","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPortal.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPortal.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/BlockPortal.java","new_code":" entity.ao = entity.ab();\n entity.aa();","new_methods":[],"old_code":" entity.ao = entity.aa();\n entity.Z();","old_methods":[],"patch":"@@ -24,7 +24,7 @@ public void a(World world, int i0, int i1, int i2, Random random) {\n Entity entity = ItemMonsterPlacer.a(world, 57, (double) i0 + 0.5D, (double) i3 + 1.1D, (double) i2 + 0.5D);\n \n if (entity != null) {\n- entity.ao = entity.aa();\n+ entity.ao = entity.ab();\n }\n }\n }\n@@ -167,7 +167,7 @@ public int a(Random random) {\n \n public void a(World world, int i0, int i1, int i2, Entity entity) {\n if (entity.o == null && entity.n == null) {\n- entity.Z();\n+ entity.aa();\n }\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPortal.java","sha":"82f2ea0f912a91db791ded28df23ce51ed9e7518","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockRedstoneTorch.java","changes":7,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockRedstoneTorch.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":6,"filename":"src/main/java/net/minecraft/server/BlockRedstoneTorch.java","new_code":" world.a((double) ((float) i0 + 0.5F), (double) ((float) i1 + 0.5F), (double) ((float) i2 + 0.5F), \"random.fizz\", 0.5F, 2.6F + (world.s.nextFloat() - world.s.nextFloat()) * 0.8F);","new_methods":[],"old_code":" world.a((double) ((float) i0 + 0.5F),\n (double) ((float) i1 + 0.5F),\n (double) ((float) i2 + 0.5F),\n \"random.fizz\",\n 0.5F,\n 2.6F + (world.s.nextFloat() - world.s.nextFloat()) * 0.8F);","old_methods":[],"patch":"@@ -122,12 +122,7 @@ public void a(World world, int i0, int i1, int i2, Random random) {\n //\n world.f(i0, i1, i2, Block.aU.cF, world.h(i0, i1, i2), 3);\n if (this.a(world, i0, i1, i2, true)) {\n- world.a((double) ((float) i0 + 0.5F),\n- (double) ((float) i1 + 0.5F),\n- (double) ((float) i2 + 0.5F),\n- \"random.fizz\",\n- 0.5F,\n- 2.6F + (world.s.nextFloat() - world.s.nextFloat()) * 0.8F);\n+ world.a((double) ((float) i0 + 0.5F), (double) ((float) i1 + 0.5F), (double) ((float) i2 + 0.5F), \"random.fizz\", 0.5F, 2.6F + (world.s.nextFloat() - world.s.nextFloat()) * 0.8F);\n \n for (int i3 = 0; i3 < 5; ++i3) {\n double d0 = (double) i0 + random.nextDouble() * 0.6D + 0.2D;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockRedstoneTorch.java","sha":"3011fa0bff599685656a910e830e411df42a1b8c","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockStairs.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockStairs.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/BlockStairs.java","new_code":" private static final int[][] a = new int[][]{ { 2, 6 }, { 3, 7 }, { 2, 3 }, { 6, 7 }, { 0, 4 }, { 1, 5 }, { 0, 1 }, { 4, 5 } };","new_methods":[],"old_code":"\n\n private static final int[][] a = new int[][] { { 2, 6}, { 3, 7}, { 2, 3}, { 6, 7}, { 0, 4}, { 1, 5}, { 0, 1}, { 4, 5}};","old_methods":[],"patch":"@@ -1,13 +1,11 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n import java.util.Random;\n \n-\n public class BlockStairs extends Block {\n \n- private static final int[][] a = new int[][] { { 2, 6}, { 3, 7}, { 2, 3}, { 6, 7}, { 0, 4}, { 1, 5}, { 0, 1}, { 4, 5}};\n+ private static final int[][] a = new int[][]{ { 2, 6 }, { 3, 7 }, { 2, 3 }, { 6, 7 }, { 0, 4 }, { 1, 5 }, { 0, 1 }, { 4, 5 } };\n private final Block b;\n private final int c;\n private boolean d;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockStairs.java","sha":"88fcaf1eb81f769f4a40d2964a8a625ce715b142","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockTrapDoor.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockTrapDoor.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/BlockTrapDoor.java","new_code":" this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod Cast to IBlockAccess","new_methods":[],"old_code":" this.a((IBlockAccess)world, i0, i1, i2); //CanaryMod Cast to IBlockAccess","old_methods":[],"patch":"@@ -28,7 +28,7 @@ public int d() {\n }\n \n public AxisAlignedBB b(World world, int i0, int i1, int i2) {\n- this.a((IBlockAccess)world, i0, i1, i2); //CanaryMod Cast to IBlockAccess\n+ this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod Cast to IBlockAccess\n return super.b(world, i0, i1, i2);\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockTrapDoor.java","sha":"ae0023eccc9a2ca834b3d009b4d99a224e5c37d2","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockWall.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockWall.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/BlockWall.java","new_code":" public static final String[] a = new String[]{ \"normal\", \"mossy\" };\n this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod Cast to IBlockAccess","new_methods":[],"old_code":" public static final String[] a = new String[] { \"normal\", \"mossy\"};\n this.a((IBlockAccess) world, i0, i1, i2); //CanaryMod Cast to IBlockAccess","old_methods":[],"patch":"@@ -2,7 +2,7 @@\n \n public class BlockWall extends Block {\n \n- public static final String[] a = new String[] { \"normal\", \"mossy\"};\n+ public static final String[] a = new String[]{ \"normal\", \"mossy\" };\n \n public BlockWall(int i0, Block block) {\n super(i0, block.cU);\n@@ -69,7 +69,7 @@ public void a(IBlockAccess iblockaccess, int i0, int i1, int i2) {\n }\n \n public AxisAlignedBB b(World world, int i0, int i1, int i2) {\n- this.a((IBlockAccess) world, i0, i1, i2); //CanaryMod Cast to IBlockAccess\n+ this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod Cast to IBlockAccess\n this.cQ = 1.5D;\n return super.b(world, i0, i1, i2);\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockWall.java","sha":"1095fdd7b4fecdbe0e9f72f862eb53dba68bf9fb","status":"modified"},{"additions":9,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCallableSuspiciousClasses.java","changes":29,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCallableSuspiciousClasses.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":20,"filename":"src/main/java/net/minecraft/server/CallableSuspiciousClasses.java","new_code":" public String a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {\n if (s1 != null && !s1.startsWith(\"org.lwjgl.\") && !s1.startsWith(\"paulscode.\") && !s1.startsWith(\"org.bouncycastle.\") && !s1.startsWith(\"argo.\") && !s1.startsWith(\"com.jcraft.\") && !s1.startsWith(\"com.fasterxml.\") && !s1.startsWith(\"com.google.\") && !s1.startsWith(\"joptsimple.\") && !s1.startsWith(\"org.apache.\") && !s1.equals(\"util.GLX\")) {\n if (s1.length() <= 3 || s1.equals(\"net.minecraft.client.main.Main\") || s1.equals(\"net.minecraft.client.Minecraft\") || s1.equals(\"net.minecraft.client.ClientBrandRetriever\") || s1.equals(\"net.minecraft.server.MinecraftServer\")) {\n public Object call() {\n try {\n return this.a();\n } catch (Exception ex) {\n return null;\n }","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/CallableSuspiciousClasses.java","implementation":"try {\n return this.a();","signature":"Object call()"}],"old_code":"\n\n public String a() throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException { // CanaryMod: Throws Added\n if (s1 != null && !s1.startsWith(\"org.lwjgl.\")\n && !s1.startsWith(\"paulscode.\")\n && !s1.startsWith(\"org.bouncycastle.\")\n && !s1.startsWith(\"argo.\")\n && !s1.startsWith(\"com.jcraft.\")\n && !s1.startsWith(\"com.fasterxml.\")\n && !s1.startsWith(\"com.google.\")\n && !s1.startsWith(\"joptsimple.\")\n && !s1.startsWith(\"org.apache.\")\n && !s1.equals(\"util.GLX\")) {\n if (s1.length() <= 3\n || s1.equals(\"net.minecraft.client.main.Main\")\n || s1.equals(\"net.minecraft.client.Minecraft\")\n || s1.equals(\"net.minecraft.client.ClientBrandRetriever\")\n || s1.equals(\"net.minecraft.server.MinecraftServer\")) {\n public Object call() throws SecurityException, IllegalArgumentException, NoSuchFieldException, IllegalAccessException { // CanaryMod: Throws added\n return this.a();","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n import java.lang.reflect.Field;\n import java.util.ArrayList;\n import java.util.Collections;\n@@ -9,7 +8,6 @@\n import java.util.Vector;\n import java.util.concurrent.Callable;\n \n-\n class CallableSuspiciousClasses implements Callable {\n \n final CrashReport a;\n@@ -18,7 +16,7 @@ class CallableSuspiciousClasses implements Callable {\n this.a = crashreport;\n }\n \n- public String a() throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException { // CanaryMod: Throws Added\n+ public String a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {\n StringBuilder stringbuilder = new StringBuilder();\n Field field = ClassLoader.class.getDeclaredField(\"classes\");\n \n@@ -38,22 +36,9 @@ public String a() throws SecurityException, NoSuchFieldException, IllegalArgumen\n if (oclass0 != null) {\n String s1 = oclass0.getCanonicalName();\n \n- if (s1 != null && !s1.startsWith(\"org.lwjgl.\")\n- && !s1.startsWith(\"paulscode.\")\n- && !s1.startsWith(\"org.bouncycastle.\")\n- && !s1.startsWith(\"argo.\")\n- && !s1.startsWith(\"com.jcraft.\")\n- && !s1.startsWith(\"com.fasterxml.\")\n- && !s1.startsWith(\"com.google.\")\n- && !s1.startsWith(\"joptsimple.\")\n- && !s1.startsWith(\"org.apache.\")\n- && !s1.equals(\"util.GLX\")) {\n+ if (s1 != null && !s1.startsWith(\"org.lwjgl.\") && !s1.startsWith(\"paulscode.\") && !s1.startsWith(\"org.bouncycastle.\") && !s1.startsWith(\"argo.\") && !s1.startsWith(\"com.jcraft.\") && !s1.startsWith(\"com.fasterxml.\") && !s1.startsWith(\"com.google.\") && !s1.startsWith(\"joptsimple.\") && !s1.startsWith(\"org.apache.\") && !s1.equals(\"util.GLX\")) {\n if (flag1) {\n- if (s1.length() <= 3\n- || s1.equals(\"net.minecraft.client.main.Main\")\n- || s1.equals(\"net.minecraft.client.Minecraft\")\n- || s1.equals(\"net.minecraft.client.ClientBrandRetriever\")\n- || s1.equals(\"net.minecraft.server.MinecraftServer\")) {\n+ if (s1.length() <= 3 || s1.equals(\"net.minecraft.client.main.Main\") || s1.equals(\"net.minecraft.client.Minecraft\") || s1.equals(\"net.minecraft.client.ClientBrandRetriever\") || s1.equals(\"net.minecraft.server.MinecraftServer\")) {\n continue;\n }\n } else if (s1.startsWith(\"net.minecraft\")) {\n@@ -117,7 +102,11 @@ public String a() throws SecurityException, NoSuchFieldException, IllegalArgumen\n return stringbuilder.toString();\n }\n \n- public Object call() throws SecurityException, IllegalArgumentException, NoSuchFieldException, IllegalAccessException { // CanaryMod: Throws added\n- return this.a();\n+ public Object call() {\n+ try {\n+ return this.a();\n+ } catch (Exception ex) {\n+ return null;\n+ }\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCallableSuspiciousClasses.java","sha":"4a6297a1955fb2eee3260fdd81e09a1ee0bd7b8e","status":"modified"},{"additions":10,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FChunk.java","changes":40,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FChunk.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":30,"filename":"src/main/java/net/minecraft/server/Chunk.java","new_code":" entity.Q();\n if (entity1 != entity && entity1.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {\n Entity[] aentity = entity1.an();\n if (entity1 != entity && entity1.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {\n if (oclass0.isAssignableFrom(entity.getClass()) && entity.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity))) {\n return new Random(this.e.H() + (long) (this.g * this.g * 4987142) + (long) (this.g * 5947611) + (long) (this.h * this.h) * 4392871L + (long) (this.h * 389711) ^ i0);\n if (ichunkprovider.a(i0 - 1, i1) && !ichunkprovider.d(i0 - 1, i1).k && ichunkprovider.a(i0 - 1, i1 + 1) && ichunkprovider.a(i0, i1 + 1) && ichunkprovider.a(i0 - 1, i1 + 1)) {\n if (ichunkprovider.a(i0, i1 - 1) && !ichunkprovider.d(i0, i1 - 1).k && ichunkprovider.a(i0 + 1, i1 - 1) && ichunkprovider.a(i0 + 1, i1 - 1) && ichunkprovider.a(i0 + 1, i1)) {\n if (ichunkprovider.a(i0 - 1, i1 - 1) && !ichunkprovider.d(i0 - 1, i1 - 1).k && ichunkprovider.a(i0, i1 - 1) && ichunkprovider.a(i0 - 1, i1)) {\n if (this.r[i1] == null && (i6 == 0 || i6 == 15 || i2 == 0 || i2 == 15 || i3 == 0 || i3 == 15) || this.r[i1] != null && this.r[i1].a(i2, i6, i3) == 0) {","new_methods":[],"old_code":" // MERGE: entity.w() is probably not kill() anymore! - Chris\n entity.P();\n if (entity1 != entity\n && entity1.E.b(axisalignedbb)\n && (ientityselector == null || ientityselector\n .a(entity1))) {\n Entity[] aentity = entity1.am();\n if (entity1 != entity\n && entity1.E.b(axisalignedbb)\n && (ientityselector == null || ientityselector.a(entity1))) {\n if (oclass0.isAssignableFrom(entity.getClass())\n && entity.E.b(axisalignedbb)\n && (ientityselector == null || ientityselector.a(entity))) {\n return new Random(this.e.H() + (long) (this.g * this.g * 4987142)\n + (long) (this.g * 5947611) + (long) (this.h * this.h)\n * 4392871L + (long) (this.h * 389711) ^ i0);\n if (ichunkprovider.a(i0 - 1, i1) && !ichunkprovider.d(i0 - 1, i1).k\n && ichunkprovider.a(i0 - 1, i1 + 1)\n && ichunkprovider.a(i0, i1 + 1)\n && ichunkprovider.a(i0 - 1, i1 + 1)) {\n if (ichunkprovider.a(i0, i1 - 1) && !ichunkprovider.d(i0, i1 - 1).k\n && ichunkprovider.a(i0 + 1, i1 - 1)\n && ichunkprovider.a(i0 + 1, i1 - 1)\n && ichunkprovider.a(i0 + 1, i1)) {\n if (ichunkprovider.a(i0 - 1, i1 - 1)\n && !ichunkprovider.d(i0 - 1, i1 - 1).k\n && ichunkprovider.a(i0, i1 - 1) && ichunkprovider.a(i0 - 1, i1)) {\n if (this.r[i1] == null\n && (i6 == 0 || i6 == 15 || i2 == 0 || i2 == 15 || i3 == 0 || i3 == 15) || this.r[i1] != null\n && this.r[i1].a(i2, i6, i3) == 0) {","old_methods":[],"patch":"@@ -595,7 +595,6 @@ public void a(Entity entity) {\n if (i0 != this.g || i1 != this.h) {\n this.e.Y().c(\"Wrong location! \" + entity);\n // Thread.dumpStack();\n- // MERGE: entity.w() is probably not kill() anymore! - Chris\n entity.w();\n return;\n }\n@@ -714,7 +713,7 @@ public void c() {\n while (iterator.hasNext()) {\n Entity entity = (Entity) iterator.next();\n \n- entity.P();\n+ entity.Q();\n }\n \n this.e.a(this.j[i0]);\n@@ -760,19 +759,14 @@ public void a(Entity entity, AxisAlignedBB axisalignedbb, List list, IEntitySele\n for (int i3 = 0; i3 < list1.size(); ++i3) {\n Entity entity1 = (Entity) list1.get(i3);\n \n- if (entity1 != entity\n- && entity1.E.b(axisalignedbb)\n- && (ientityselector == null || ientityselector\n- .a(entity1))) {\n+ if (entity1 != entity && entity1.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {\n list.add(entity1);\n- Entity[] aentity = entity1.am();\n+ Entity[] aentity = entity1.an();\n \n if (aentity != null) {\n for (int i4 = 0; i4 < aentity.length; ++i4) {\n entity1 = aentity[i4];\n- if (entity1 != entity\n- && entity1.E.b(axisalignedbb)\n- && (ientityselector == null || ientityselector.a(entity1))) {\n+ if (entity1 != entity && entity1.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {\n list.add(entity1);\n }\n }\n@@ -804,9 +798,7 @@ public void a(Class oclass0, AxisAlignedBB axisalignedbb, List list, IEntitySele\n for (int i3 = 0; i3 < list1.size(); ++i3) {\n Entity entity = (Entity) list1.get(i3);\n \n- if (oclass0.isAssignableFrom(entity.getClass())\n- && entity.E.b(axisalignedbb)\n- && (ientityselector == null || ientityselector.a(entity))) {\n+ if (oclass0.isAssignableFrom(entity.getClass()) && entity.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity))) {\n list.add(entity);\n }\n }\n@@ -826,9 +818,7 @@ public boolean a(boolean flag0) {\n }\n \n public Random a(long i0) {\n- return new Random(this.e.H() + (long) (this.g * this.g * 4987142)\n- + (long) (this.g * 5947611) + (long) (this.h * this.h)\n- * 4392871L + (long) (this.h * 389711) ^ i0);\n+ return new Random(this.e.H() + (long) (this.g * this.g * 4987142) + (long) (this.g * 5947611) + (long) (this.h * this.h) * 4392871L + (long) (this.h * 389711) ^ i0);\n }\n \n public boolean g() {\n@@ -840,23 +830,15 @@ public void a(IChunkProvider ichunkprovider, IChunkProvider ichunkprovider1, int\n ichunkprovider.a(ichunkprovider1, i0, i1);\n }\n \n- if (ichunkprovider.a(i0 - 1, i1) && !ichunkprovider.d(i0 - 1, i1).k\n- && ichunkprovider.a(i0 - 1, i1 + 1)\n- && ichunkprovider.a(i0, i1 + 1)\n- && ichunkprovider.a(i0 - 1, i1 + 1)) {\n+ if (ichunkprovider.a(i0 - 1, i1) && !ichunkprovider.d(i0 - 1, i1).k && ichunkprovider.a(i0 - 1, i1 + 1) && ichunkprovider.a(i0, i1 + 1) && ichunkprovider.a(i0 - 1, i1 + 1)) {\n ichunkprovider.a(ichunkprovider1, i0 - 1, i1);\n }\n \n- if (ichunkprovider.a(i0, i1 - 1) && !ichunkprovider.d(i0, i1 - 1).k\n- && ichunkprovider.a(i0 + 1, i1 - 1)\n- && ichunkprovider.a(i0 + 1, i1 - 1)\n- && ichunkprovider.a(i0 + 1, i1)) {\n+ if (ichunkprovider.a(i0, i1 - 1) && !ichunkprovider.d(i0, i1 - 1).k && ichunkprovider.a(i0 + 1, i1 - 1) && ichunkprovider.a(i0 + 1, i1 - 1) && ichunkprovider.a(i0 + 1, i1)) {\n ichunkprovider.a(ichunkprovider1, i0, i1 - 1);\n }\n \n- if (ichunkprovider.a(i0 - 1, i1 - 1)\n- && !ichunkprovider.d(i0 - 1, i1 - 1).k\n- && ichunkprovider.a(i0, i1 - 1) && ichunkprovider.a(i0 - 1, i1)) {\n+ if (ichunkprovider.a(i0 - 1, i1 - 1) && !ichunkprovider.d(i0 - 1, i1 - 1).k && ichunkprovider.a(i0, i1 - 1) && ichunkprovider.a(i0 - 1, i1)) {\n ichunkprovider.a(ichunkprovider1, i0 - 1, i1 - 1);\n }\n }\n@@ -963,9 +945,7 @@ public void o() {\n for (int i6 = 0; i6 < 16; ++i6) {\n int i7 = (i1 << 4) + i6;\n \n- if (this.r[i1] == null\n- && (i6 == 0 || i6 == 15 || i2 == 0 || i2 == 15 || i3 == 0 || i3 == 15) || this.r[i1] != null\n- && this.r[i1].a(i2, i6, i3) == 0) {\n+ if (this.r[i1] == null && (i6 == 0 || i6 == 15 || i2 == 0 || i2 == 15 || i3 == 0 || i3 == 15) || this.r[i1] != null && this.r[i1].a(i2, i6, i3) == 0) {\n if (Block.w[this.e.a(i4, i7 - 1, i5)] > 0) {\n this.e.A(i4, i7 - 1, i5);\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FChunk.java","sha":"774c136c03b9e65c9054e0ee83f0d49800dacdf4","status":"modified"},{"additions":11,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandBase.java","changes":40,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandBase.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":29,"filename":"src/main/java/net/minecraft/server/CommandBase.java","new_code":" throw new NumberInvalidException(\"commands.generic.double.invalid\", new Object[]{ s0 });\n public static double a(ICommandSender icommandsender, String s0, double d0, double d1) {\n throw new NumberInvalidException(\"commands.generic.double.tooSmall\", new Object[]{ Double.valueOf(d2), Double.valueOf(d0) });\n throw new NumberInvalidException(\"commands.generic.double.tooBig\", new Object[]{ Double.valueOf(d2), Double.valueOf(d1) });\n throw new CommandException(\"commands.generic.boolean.invalid\", new Object[]{ s0 });\n return entityplayermp.am();\n public static double a(ICommandSender icommandsender, double d0, String s0, int i0, int i1) {\n throw new NumberInvalidException(\"commands.generic.num.invalid\", new Object[]{ Double.valueOf(d0) });\n throw new NumberInvalidException(\"commands.generic.double.tooSmall\", new Object[]{ Double.valueOf(d1), Integer.valueOf(i0) });\n throw new NumberInvalidException(\"commands.generic.double.tooBig\", new Object[]{ Double.valueOf(d1), Integer.valueOf(i1) });\n for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i0++] = entitylivingbase.ax()) {","new_methods":[{"arguments":["ICommandSender icommandsender"," String s0"," double d0"," double d1"],"filename":"src/main/java/net/minecraft/server/CommandBase.java","implementation":"throw new NumberInvalidException(\"commands.generic.double.tooSmall\", new Object[]{ Double.valueOf(d2), Double.valueOf(d0)","signature":"double a(ICommandSender icommandsender, String s0, double d0, double d1)"},{"arguments":["ICommandSender icommandsender"," double d0"," String s0"," int i0"," int i1"],"filename":"src/main/java/net/minecraft/server/CommandBase.java","implementation":"throw new NumberInvalidException(\"commands.generic.num.invalid\", new Object[]{ Double.valueOf(d0)","signature":"double a(ICommandSender icommandsender, double d0, String s0, int i0, int i1)"}],"old_code":" // MERGE Is this deprecated now? - Chris\n // public String a(ICommandSender icommandsender) {\n // return \"/\" + this.c();\n // }\n\n throw new NumberInvalidException(\n \"commands.generic.double.invalid\", new Object[]{ s0 });\n public static double a(ICommandSender icommandsender, String s0, double d0,\n double d1) {\n throw new NumberInvalidException(\n \"commands.generic.double.tooSmall\", new Object[]{\n Double.valueOf(d2), Double.valueOf(d0) });\n throw new NumberInvalidException(\"commands.generic.double.tooBig\",\n new Object[]{ Double.valueOf(d2), Double.valueOf(d1) });\n throw new CommandException(\"commands.generic.boolean.invalid\",\n new Object[]{ s0 });\n return entityplayermp.al();\n public static double a(ICommandSender icommandsender, double d0, String s0,\n int i0, int i1) {\n throw new NumberInvalidException(\"commands.generic.num.invalid\",\n new Object[]{ Double.valueOf(d0) });\n throw new NumberInvalidException(\n \"commands.generic.double.tooSmall\", new Object[]{\n Double.valueOf(d1), Integer.valueOf(i0) });\n throw new NumberInvalidException(\n \"commands.generic.double.tooBig\", new Object[]{\n Double.valueOf(d1), Integer.valueOf(i1) });\n for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i0++] = entitylivingbase\n .aw()) {","old_methods":[{"arguments":["ICommandSender icommandsender"],"filename":"src/main/java/net/minecraft/server/CommandBase.java","implementation":"// return \"/\" + this.c();\n //","signature":"String a(ICommandSender icommandsender)"},{"arguments":["ICommandSender icommandsender"," String s0"," double d0","\n double d1"],"filename":"src/main/java/net/minecraft/server/CommandBase.java","implementation":"throw new NumberInvalidException(\n \"commands.generic.double.tooSmall\", new Object[]{\n Double.valueOf(d2), Double.valueOf(d0)","signature":"double a(ICommandSender icommandsender, String s0, double d0,\n double d1)"},{"arguments":["ICommandSender icommandsender"," double d0"," String s0","\n int i0"," int i1"],"filename":"src/main/java/net/minecraft/server/CommandBase.java","implementation":"throw new NumberInvalidException(\"commands.generic.num.invalid\",\n new Object[]{ Double.valueOf(d0)","signature":"double a(ICommandSender icommandsender, double d0, String s0,\n int i0, int i1)"}],"patch":"@@ -16,11 +16,6 @@ public int a() {\n return 4;\n }\n \n- // MERGE Is this deprecated now? - Chris\n- // public String a(ICommandSender icommandsender) {\n- // return \"/\" + this.c();\n- // }\n-\n public List b() {\n return null;\n }\n@@ -62,8 +57,7 @@ public static double b(ICommandSender icommandsender, String s0) {\n double d0 = Double.parseDouble(s0);\n \n if (!Doubles.isFinite(d0)) {\n- throw new NumberInvalidException(\n- \"commands.generic.double.invalid\", new Object[]{ s0 });\n+ throw new NumberInvalidException(\"commands.generic.double.invalid\", new Object[]{ s0 });\n } else {\n return d0;\n }\n@@ -76,17 +70,13 @@ public static double a(ICommandSender icommandsender, String s0, double d0) {\n return a(icommandsender, s0, d0, Double.MAX_VALUE);\n }\n \n- public static double a(ICommandSender icommandsender, String s0, double d0,\n- double d1) {\n+ public static double a(ICommandSender icommandsender, String s0, double d0, double d1) {\n double d2 = b(icommandsender, s0);\n \n if (d2 < d0) {\n- throw new NumberInvalidException(\n- \"commands.generic.double.tooSmall\", new Object[]{\n- Double.valueOf(d2), Double.valueOf(d0) });\n+ throw new NumberInvalidException(\"commands.generic.double.tooSmall\", new Object[]{ Double.valueOf(d2), Double.valueOf(d0) });\n } else if (d2 > d1) {\n- throw new NumberInvalidException(\"commands.generic.double.tooBig\",\n- new Object[]{ Double.valueOf(d2), Double.valueOf(d1) });\n+ throw new NumberInvalidException(\"commands.generic.double.tooBig\", new Object[]{ Double.valueOf(d2), Double.valueOf(d1) });\n } else {\n return d2;\n }\n@@ -95,8 +85,7 @@ public static double a(ICommandSender icommandsender, String s0, double d0,\n public static boolean c(ICommandSender icommandsender, String s0) {\n if (!s0.equals(\"true\") && !s0.equals(\"1\")) {\n if (!s0.equals(\"false\") && !s0.equals(\"0\")) {\n- throw new CommandException(\"commands.generic.boolean.invalid\",\n- new Object[]{ s0 });\n+ throw new CommandException(\"commands.generic.boolean.invalid\", new Object[]{ s0 });\n } else {\n return false;\n }\n@@ -132,7 +121,7 @@ public static String e(ICommandSender icommandsender, String s0) {\n EntityPlayerMP entityplayermp = PlayerSelector.a(icommandsender, s0);\n \n if (entityplayermp != null) {\n- return entityplayermp.al();\n+ return entityplayermp.am();\n } else if (PlayerSelector.b(s0)) {\n throw new PlayerNotFoundException();\n } else {\n@@ -174,13 +163,11 @@ public static double a(ICommandSender icommandsender, double d0, String s0) {\n return a(icommandsender, d0, s0, -30000000, 30000000);\n }\n \n- public static double a(ICommandSender icommandsender, double d0, String s0,\n- int i0, int i1) {\n+ public static double a(ICommandSender icommandsender, double d0, String s0, int i0, int i1) {\n boolean flag0 = s0.startsWith(\"~\");\n \n if (flag0 && Double.isNaN(d0)) {\n- throw new NumberInvalidException(\"commands.generic.num.invalid\",\n- new Object[]{ Double.valueOf(d0) });\n+ throw new NumberInvalidException(\"commands.generic.num.invalid\", new Object[]{ Double.valueOf(d0) });\n } else {\n double d1 = flag0 ? d0 : 0.0D;\n \n@@ -199,15 +186,11 @@ public static double a(ICommandSender icommandsender, double d0, String s0,\n \n if (i0 != 0 || i1 != 0) {\n if (d1 < (double) i0) {\n- throw new NumberInvalidException(\n- \"commands.generic.double.tooSmall\", new Object[]{\n- Double.valueOf(d1), Integer.valueOf(i0) });\n+ throw new NumberInvalidException(\"commands.generic.double.tooSmall\", new Object[]{ Double.valueOf(d1), Integer.valueOf(i0) });\n }\n \n if (d1 > (double) i1) {\n- throw new NumberInvalidException(\n- \"commands.generic.double.tooBig\", new Object[]{\n- Double.valueOf(d1), Integer.valueOf(i1) });\n+ throw new NumberInvalidException(\"commands.generic.double.tooBig\", new Object[]{ Double.valueOf(d1), Integer.valueOf(i1) });\n }\n }\n \n@@ -245,8 +228,7 @@ public static String b(Collection collection) {\n \n EntityLivingBase entitylivingbase;\n \n- for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i0++] = entitylivingbase\n- .aw()) {\n+ for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i0++] = entitylivingbase.ax()) {\n entitylivingbase = (EntityLivingBase) iterator.next();\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandBase.java","sha":"9f9936d97627194a0408b1409aa337f8a5d28e10","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveAll.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveAll.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/CommandServerSaveAll.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.CanaryWorld;\n \n-\n public class CommandServerSaveAll extends CommandBase {\n \n public CommandServerSaveAll() {}","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveAll.java","sha":"8e96a26759fe068ce5acefbefa6dc9e3539c148c","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOff.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOff.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/CommandServerSaveOff.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.CanaryWorld;\n \n-\n public class CommandServerSaveOff extends CommandBase {\n \n public CommandServerSaveOff() {}","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOff.java","sha":"e57fef4f657e36a3ea4c93acb7237ba828e4fa36","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOn.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOn.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/CommandServerSaveOn.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.CanaryWorld;\n \n-\n public class CommandServerSaveOn extends CommandBase {\n \n public CommandServerSaveOn() {}","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOn.java","sha":"9ffc776da59b74e84ad5607d3c2647c32661f239","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerTp.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerTp.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/CommandServerTp.java","new_code":" a(icommandsender, \"commands.tp.success\", new Object[]{ entityplayermp.am(), entityplayermp1.am() });\n a(icommandsender, \"commands.tp.success.coordinates\", new Object[]{ entityplayermp.am(), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) });","new_methods":[],"old_code":" a(icommandsender, \"commands.tp.success\", new Object[]{ entityplayermp.al(), entityplayermp1.al() });\n a(icommandsender, \"commands.tp.success.coordinates\", new Object[]{ entityplayermp.al(), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) });","old_methods":[],"patch":"@@ -50,7 +50,7 @@ public void b(ICommandSender icommandsender, String[] astring) {\n entityplayermp.a((Entity) null);\n // CanaryMod: DERP (MultiWorld fix)\n entityplayermp.a.a(entityplayermp1.u, entityplayermp1.v, entityplayermp1.w, entityplayermp1.A, entityplayermp1.B, entityplayermp1.getCanaryWorld().getType().getId(), entityplayermp1.getCanaryWorld().getName(), TeleportHook.TeleportCause.COMMAND);\n- a(icommandsender, \"commands.tp.success\", new Object[]{ entityplayermp.al(), entityplayermp1.al() });\n+ a(icommandsender, \"commands.tp.success\", new Object[]{ entityplayermp.am(), entityplayermp1.am() });\n }\n } else if (entityplayermp.q != null) {\n int i0 = astring.length - 3;\n@@ -60,7 +60,7 @@ public void b(ICommandSender icommandsender, String[] astring) {\n \n entityplayermp.a((Entity) null);\n entityplayermp.a(d0, d1, d2);\n- a(icommandsender, \"commands.tp.success.coordinates\", new Object[]{ entityplayermp.al(), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) });\n+ a(icommandsender, \"commands.tp.success.coordinates\", new Object[]{ entityplayermp.am(), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) });\n }\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerTp.java","sha":"0b344e36078072b60c087464c2137bad43e53607","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandToggleDownfall.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandToggleDownfall.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/CommandToggleDownfall.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.CanaryWorld;\n import net.canarymod.api.world.DimensionType;\n \n-\n public class CommandToggleDownfall extends CommandBase {\n \n public CommandToggleDownfall() {}","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandToggleDownfall.java","sha":"a250aeb65266368410411a3285fbe502415f5744","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandWeather.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandWeather.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/CommandWeather.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,12 +1,10 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n import java.util.Random;\n import net.canarymod.api.world.CanaryWorld;\n import net.canarymod.api.world.DimensionType;\n \n-\n public class CommandWeather extends CommandBase {\n \n public CommandWeather() {}","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandWeather.java","sha":"b4d656a8c84c1c53344837cf985094c8945b2ec3","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FComponentStrongholdRightTurn.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FComponentStrongholdRightTurn.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/ComponentStrongholdRightTurn.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n import java.util.Random;\n \n-\n public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {\n \n public ComponentStrongholdRightTurn(int i0, Random random,","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FComponentStrongholdRightTurn.java","sha":"79a045c93b327870571017d6d72e479327d9ab80","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerChest.java","changes":1,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerChest.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/ContainerChest.java","new_code":"","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -2,7 +2,6 @@\n \n import net.canarymod.api.inventory.Inventory;\n \n-\n public class ContainerChest extends Container {\n \n private IInventory a;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerChest.java","sha":"92064b418ec56aba62126f7f0faa2f9cd4cb88e3","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerEnchantment.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerEnchantment.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/ContainerEnchantment.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import java.util.List;\n import java.util.Random;\n@@ -9,7 +8,6 @@\n import net.canarymod.api.world.blocks.EnchantmentTable;\n import net.canarymod.hook.player.EnchantHook;\n \n-\n public class ContainerEnchantment extends Container {\n \n public IInventory a = new SlotEnchantmentTable(this, \"Enchant\", true, 1);","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerEnchantment.java","sha":"071c3e00d24930786d520416bea58178fc105527","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventory.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventory.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/ContainerHorseInventory.java","new_code":" if (entityhorse.ce()) {\n return this.a.a(entityplayer) && this.f.S() && this.f.d((Entity) entityplayer) < 8.0F;\n } else if (this.a(1).a(itemstack1) && !this.a(1).e()) {","new_methods":[],"old_code":" if (entityhorse.ca()) {\n return this.a.a(entityplayer) && this.f.d(entityplayer) < 8.0F;\n } else if (this.a(1).a(itemstack1)) {","old_methods":[],"patch":"@@ -20,7 +20,7 @@ public ContainerHorseInventory(IInventory iinventory, IInventory iinventory1, En\n int i1;\n int i2;\n \n- if (entityhorse.ca()) {\n+ if (entityhorse.ce()) {\n for (i1 = 0; i1 < b0; ++i1) {\n for (i2 = 0; i2 < 5; ++i2) {\n this.a(new Slot(iinventory1, 2 + i2 + i1 * 5, 80 + i2 * 18, 18 + i1 * 18));\n@@ -40,7 +40,7 @@ public ContainerHorseInventory(IInventory iinventory, IInventory iinventory1, En\n }\n \n public boolean a(EntityPlayer entityplayer) {\n- return this.a.a(entityplayer) && this.f.d(entityplayer) < 8.0F;\n+ return this.a.a(entityplayer) && this.f.S() && this.f.d((Entity) entityplayer) < 8.0F;\n }\n \n public ItemStack b(EntityPlayer entityplayer, int i0) {\n@@ -55,7 +55,7 @@ public ItemStack b(EntityPlayer entityplayer, int i0) {\n if (!this.a(itemstack1, this.a.j_(), this.c.size(), true)) {\n return null;\n }\n- } else if (this.a(1).a(itemstack1)) {\n+ } else if (this.a(1).a(itemstack1) && !this.a(1).e()) {\n if (!this.a(itemstack1, 1, 2, false)) {\n return null;\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventory.java","sha":"e9ee4a038908ec4316ed7e906d980ca944338ee1","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventorySlotArmor.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventorySlotArmor.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/ContainerHorseInventorySlotArmor.java","new_code":" return super.a(itemstack) && this.a.cv() && EntityHorse.v(itemstack.d);","new_methods":[],"old_code":" return super.a(itemstack) && this.a.cr() && EntityHorse.v(itemstack.d) && !this.e();","old_methods":[],"patch":"@@ -13,6 +13,6 @@ public class ContainerHorseInventorySlotArmor extends Slot { // CanaryMod: packa\n }\n \n public boolean a(ItemStack itemstack) {\n- return super.a(itemstack) && this.a.cr() && EntityHorse.v(itemstack.d) && !this.e();\n+ return super.a(itemstack) && this.a.cv() && EntityHorse.v(itemstack.d);\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventorySlotArmor.java","sha":"aa33a84977ccb68d0740b6a3d57ff07cecf90e91","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerMerchant.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerMerchant.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/ContainerMerchant.java","new_code":" entityplayer.b(itemstack);","new_methods":[],"old_code":" entityplayer.c(itemstack);","old_methods":[],"patch":"@@ -107,7 +107,7 @@ public void b(EntityPlayer entityplayer) {\n \n itemstack = this.f.a_(1);\n if (itemstack != null) {\n- entityplayer.c(itemstack);\n+ entityplayer.b(itemstack);\n }\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerMerchant.java","sha":"250db67406c90e89a23ade29921663944450ced5","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerPlayer.java","changes":1,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerPlayer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/ContainerPlayer.java","new_code":"","new_methods":[],"old_code":" // MERGE: This might contain wrong calls! - Chris","old_methods":[],"patch":"@@ -46,7 +46,6 @@ public ContainerPlayer(InventoryPlayer inventoryplayer, boolean flag0, EntityPla\n }\n \n public void a(IInventory iinventory) {\n- // MERGE: This might contain wrong calls! - Chris\n ItemStack result = CraftingManager.a().a(this.a, this.h.q);\n \n // CanaryMod: Send custom recipe results to client","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerPlayer.java","sha":"2c66131b115532aa54f8a6356d3399d0edc07ee5","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerRepairINNER2.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerRepairINNER2.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/ContainerRepairINNER2.java","new_code":" if (!entityplayer.bG.d && !this.a.I && this.a.a(this.b, this.c, this.d) == Block.cm.cF && entityplayer.aC().nextFloat() < 0.12F) {","new_methods":[],"old_code":" if (!entityplayer.bG.d && !this.a.I && this.a.a(this.b, this.c, this.d) == Block.cm.cF && entityplayer.aB().nextFloat() < 0.12F) {","old_methods":[],"patch":"@@ -49,7 +49,7 @@ public void a(EntityPlayer entityplayer, ItemStack itemstack) {\n }\n \n this.e.a = 0;\n- if (!entityplayer.bG.d && !this.a.I && this.a.a(this.b, this.c, this.d) == Block.cm.cF && entityplayer.aB().nextFloat() < 0.12F) {\n+ if (!entityplayer.bG.d && !this.a.I && this.a.a(this.b, this.c, this.d) == Block.cm.cF && entityplayer.aC().nextFloat() < 0.12F) {\n int i0 = this.a.h(this.b, this.c, this.d);\n int i1 = i0 & 3;\n int i2 = i0 >> 2;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerRepairINNER2.java","sha":"c05fd463053c08fe7dce86f56e2ec65dc06e0971","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerWorkbench.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerWorkbench.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/ContainerWorkbench.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,11 +1,9 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.inventory.CanaryItem;\n import net.canarymod.api.world.blocks.CanaryWorkbench;\n import net.canarymod.hook.player.CraftHook;\n \n-\n public class ContainerWorkbench extends Container {\n \n public InventoryCrafting a = new InventoryCrafting(this, 3, 3);","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerWorkbench.java","sha":"c537c5f988dfffb3f5f9ad5517e04ee6e00b6f30","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCraftingManager.java","changes":3,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCraftingManager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/CraftingManager.java","new_code":"","new_methods":[],"old_code":"\n\n this.a(new ItemStack(Block.cB, 1), new Object[]{ \"###\", \"###\", \"###\", Character.valueOf('#'), Item.V });","old_methods":[],"patch":"@@ -1,12 +1,10 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import java.util.Collections;\n import java.util.HashMap;\n import java.util.List;\n \n-\n public class CraftingManager {\n \n private static final CraftingManager a = new CraftingManager();\n@@ -38,7 +36,6 @@ private CraftingManager() {\n this.a(new ItemStack(Block.bA, 1), new Object[]{ \"#W#\", \"#W#\", Character.valueOf('#'), Item.F, Character.valueOf('W'), Block.C });\n this.a(new ItemStack(Block.bd, 1), new Object[]{ \"###\", \"#X#\", \"###\", Character.valueOf('#'), Block.C, Character.valueOf('X'), Item.p });\n this.a(new ItemStack(Item.ch, 2), new Object[]{ \"~~ \", \"~O \", \" ~\", Character.valueOf('~'), Item.M, Character.valueOf('O'), Item.aO });\n- this.a(new ItemStack(Block.cB, 1), new Object[]{ \"###\", \"###\", \"###\", Character.valueOf('#'), Item.V });\n this.a(new ItemStack(Block.W, 1), new Object[]{ \"###\", \"#X#\", \"###\", Character.valueOf('#'), Block.C, Character.valueOf('X'), Item.aE });\n this.a(new ItemStack(Block.as, 1), new Object[]{ \"###\", \"XXX\", \"###\", Character.valueOf('#'), Block.C, Character.valueOf('X'), Item.aN });\n this.a(new ItemStack(Block.aZ, 1), new Object[]{ \"##\", \"##\", Character.valueOf('#'), Item.aF });","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCraftingManager.java","sha":"6d870b89c8d00b729befca51f378f7f143a9ef8d","status":"modified"},{"additions":6,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDamageSource.java","changes":10,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDamageSource.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":4,"filename":"src/main/java/net/minecraft/server/DamageSource.java","new_code":"\n EntityLivingBase entitylivingbase1 = entitylivingbase.aR();\n return entitylivingbase1 != null && StatCollector.b(s1) ? ChatMessageComponent.b(s1, new Object[]{ entitylivingbase.ax(), entitylivingbase1.ax() }) : ChatMessageComponent.b(s0, new Object[]{ entitylivingbase.ax() });\n * \n * \n * ","new_methods":[],"old_code":"\n\n EntityLivingBase entitylivingbase1 = entitylivingbase.aO();\n return entitylivingbase1 != null && StatCollector.b(s1) ? ChatMessageComponent.b(s1, new Object[]{ entitylivingbase.aw(), entitylivingbase1.aw() }) : ChatMessageComponent.b(s0, new Object[]{ entitylivingbase.aw() });","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.CanaryDamageSource;\n \n-\n public class DamageSource {\n \n public static DamageSource a = (new DamageSource(\"inFire\")).l();\n@@ -32,6 +30,7 @@ public class DamageSource {\n \n // CanaryMod\n protected CanaryDamageSource damageSource;\n+\n public static DamageSource a(EntityLivingBase entitylivingbase) {\n return new EntityDamageSource(\"mob\", entitylivingbase);\n }\n@@ -124,11 +123,11 @@ protected DamageSource l() {\n }\n \n public ChatMessageComponent b(EntityLivingBase entitylivingbase) {\n- EntityLivingBase entitylivingbase1 = entitylivingbase.aO();\n+ EntityLivingBase entitylivingbase1 = entitylivingbase.aR();\n String s0 = \"death.attack.\" + this.o;\n String s1 = s0 + \".player\";\n \n- return entitylivingbase1 != null && StatCollector.b(s1) ? ChatMessageComponent.b(s1, new Object[]{ entitylivingbase.aw(), entitylivingbase1.aw() }) : ChatMessageComponent.b(s0, new Object[]{ entitylivingbase.aw() });\n+ return entitylivingbase1 != null && StatCollector.b(s1) ? ChatMessageComponent.b(s1, new Object[]{ entitylivingbase.ax(), entitylivingbase1.ax() }) : ChatMessageComponent.b(s0, new Object[]{ entitylivingbase.ax() });\n }\n \n public boolean m() {\n@@ -159,6 +158,7 @@ public DamageSource r() {\n \n /**\n * Gets the CanaryMod damagesource wrapper\n+ * \n * @return\n */\n public CanaryDamageSource getCanaryDamageSource() {\n@@ -167,6 +167,7 @@ public CanaryDamageSource getCanaryDamageSource() {\n \n /**\n * Set hunger damage\n+ * \n * @param f\n */\n public void setHungerDamage(float f) {\n@@ -175,6 +176,7 @@ public void setHungerDamage(float f) {\n \n /**\n * Set unblockable\n+ * \n * @param b\n */\n public void setUnblockable(boolean b) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDamageSource.java","sha":"f5895ba7f526da9b005699fd4ffa683b146b2f16","status":"modified"},{"additions":31,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedPlayerList.java","changes":62,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedPlayerList.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":31,"filename":"src/main/java/net/minecraft/server/DedicatedPlayerList.java","new_code":" // CanaryMod removed whitelist\n // CanaryMod re-route to our whitelist\n // Canary, re-route to our whitelist\n // Load whitelist\n // try {\n // this.h().clear();\n // BufferedReader bufferedreader = new BufferedReader(new FileReader(this.e));\n // String s0 = \"\";\n //\n // while ((s0 = bufferedreader.readLine()) != null) {\n // this.h().add(s0.trim().toLowerCase());\n // }\n //\n // bufferedreader.close();\n // } catch (Exception exception) {\n // this.s().an().b(\"Failed to load white-list: \" + exception);\n // }\n // try {\n // PrintWriter printwriter = new PrintWriter(new FileWriter(this.e, false));\n // Iterator iterator = this.h().iterator();\n //\n // while (iterator.hasNext()) {\n // String s0 = (String) iterator.next();\n //\n // printwriter.println(s0);\n // }\n //\n // printwriter.close();\n // } catch (Exception exception) {\n // this.s().an().b(\"Failed to save white-list: \" + exception);\n // }","new_methods":[],"old_code":" // CanaryMod removed whitelist\n //CanaryMod re-route to our whitelist\n //Canary, re-route to our whitelist\n //Load whitelist\n// try {\n// this.h().clear();\n// BufferedReader bufferedreader = new BufferedReader(new FileReader(this.e));\n// String s0 = \"\";\n//\n// while ((s0 = bufferedreader.readLine()) != null) {\n// this.h().add(s0.trim().toLowerCase());\n// }\n//\n// bufferedreader.close();\n// } catch (Exception exception) {\n// this.s().an().b(\"Failed to load white-list: \" + exception);\n// }\n// try {\n// PrintWriter printwriter = new PrintWriter(new FileWriter(this.e, false));\n// Iterator iterator = this.h().iterator();\n//\n// while (iterator.hasNext()) {\n// String s0 = (String) iterator.next();\n//\n// printwriter.println(s0);\n// }\n//\n// printwriter.close();\n// } catch (Exception exception) {\n// this.s().an().b(\"Failed to save white-list: \" + exception);\n// }","old_methods":[],"patch":"@@ -5,7 +5,7 @@\n \n public class DedicatedPlayerList extends ServerConfigurationManager {\n \n- // CanaryMod removed whitelist\n+ // CanaryMod removed whitelist\n // CanaryMod: removed ops\n \n public DedicatedPlayerList(DedicatedServer dedicatedserver) {\n@@ -31,17 +31,17 @@ public void c(String s0) {\n }\n \n public void h(String s0) {\n- //CanaryMod re-route to our whitelist\n+ // CanaryMod re-route to our whitelist\n Canary.whitelist().removePlayer(s0);\n }\n \n public void g(String s0) {\n- //Canary, re-route to our whitelist\n+ // Canary, re-route to our whitelist\n Canary.whitelist().addPlayer(s0);\n }\n \n public void j() {\n- //Load whitelist\n+ // Load whitelist\n throw new UnsupportedOperationException(\"Minecraft whitelist is disabled! Cannot load\");\n }\n \n@@ -79,36 +79,36 @@ private void u() {\n }\n \n private void v() {\n-// try {\n-// this.h().clear();\n-// BufferedReader bufferedreader = new BufferedReader(new FileReader(this.e));\n-// String s0 = \"\";\n-//\n-// while ((s0 = bufferedreader.readLine()) != null) {\n-// this.h().add(s0.trim().toLowerCase());\n-// }\n-//\n-// bufferedreader.close();\n-// } catch (Exception exception) {\n-// this.s().an().b(\"Failed to load white-list: \" + exception);\n-// }\n+ // try {\n+ // this.h().clear();\n+ // BufferedReader bufferedreader = new BufferedReader(new FileReader(this.e));\n+ // String s0 = \"\";\n+ //\n+ // while ((s0 = bufferedreader.readLine()) != null) {\n+ // this.h().add(s0.trim().toLowerCase());\n+ // }\n+ //\n+ // bufferedreader.close();\n+ // } catch (Exception exception) {\n+ // this.s().an().b(\"Failed to load white-list: \" + exception);\n+ // }\n }\n \n private void w() {\n-// try {\n-// PrintWriter printwriter = new PrintWriter(new FileWriter(this.e, false));\n-// Iterator iterator = this.h().iterator();\n-//\n-// while (iterator.hasNext()) {\n-// String s0 = (String) iterator.next();\n-//\n-// printwriter.println(s0);\n-// }\n-//\n-// printwriter.close();\n-// } catch (Exception exception) {\n-// this.s().an().b(\"Failed to save white-list: \" + exception);\n-// }\n+ // try {\n+ // PrintWriter printwriter = new PrintWriter(new FileWriter(this.e, false));\n+ // Iterator iterator = this.h().iterator();\n+ //\n+ // while (iterator.hasNext()) {\n+ // String s0 = (String) iterator.next();\n+ //\n+ // printwriter.println(s0);\n+ // }\n+ //\n+ // printwriter.close();\n+ // } catch (Exception exception) {\n+ // this.s().an().b(\"Failed to save white-list: \" + exception);\n+ // }\n }\n \n public boolean d(String s0) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedPlayerList.java","sha":"57ec1cddc128ce776ca4e4563bde1a24bbf15fab","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedServer.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedServer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/DedicatedServer.java","new_code":" this.an().a(\"Starting minecraft server version 1.6.2\");\n // } else if (this.as().i().isEmpty()) { // CanaryMod: Empty Ops list shouldn't break spawn protections...","new_methods":[],"old_code":" this.an().a(\"Starting minecraft server version 1.6.1\");\n // } else if (this.ao().i().isEmpty()) { // CanaryMod: Empty Ops list shouldn't break spawn protections...","old_methods":[],"patch":"@@ -38,7 +38,7 @@ protected boolean d() throws IOException {\n \n dedicatedservercommandthread.setDaemon(true);\n dedicatedservercommandthread.start();\n- this.an().a(\"Starting minecraft server version 1.6.1\");\n+ this.an().a(\"Starting minecraft server version 1.6.2\");\n if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {\n this.an().b(\"To start the server with more ram, launch it as \\\"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\\\"\");\n }\n@@ -301,7 +301,7 @@ public boolean a(World world, int i0, int i1, int i2, EntityPlayer entityplayer)\n WorldConfiguration cfg = Configuration.getWorldConfig(world.getCanaryWorld().getFqName());\n if (world.t.i != 0) {\n return false;\n- // } else if (this.ao().i().isEmpty()) { // CanaryMod: Empty Ops list shouldn't break spawn protections...\n+ // } else if (this.as().i().isEmpty()) { // CanaryMod: Empty Ops list shouldn't break spawn protections...\n // return false;\n } else if (this.as().e(entityplayer.c_())) {\n return false;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedServer.java","sha":"ec559f58ebdff77617b73c77918a4a6002b3bf22","status":"modified"},{"additions":59,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntity.java","changes":108,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntity.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":49,"filename":"src/main/java/net/minecraft/server/Entity.java","new_code":" float f2;\n\n f2 = this.O;\n if (this.O > f2 && !this.e && !this.q.I) {\n this.d((double) (f2 - this.O), 0.0D, (double) (f2 - this.O));\n }\n f2 = f0 % 2.0F;\n this.ao = this.ab();\n if (this.ah() && !this.G()) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.b), 1.0F).call();\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.c), 4.0F).call();\n boolean flag0 = this.F && this.ag() && this instanceof EntityPlayer;\n if (this.aq()) {\n String s0 = this.P();\n String s0 = this.P();\n nbttagcompound.a(\"Air\", (short) this.ak());\n if (this.O()) {\n this.b(this.u, this.v, this.w);\n }\n protected boolean O() {\n return true;\n }\n\n protected final String P() {\n public void Q() {}\n public boolean S() {\n public boolean T() {\n public void U() {\n this.o.V();\n public void V() {\n this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\n public double W() {\n public double X() {\n public float Y() {\n public Vec3 Z() {\n public void aa() {\n this.ao = this.ab();\n public int ab() {\n public ItemStack[] ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public boolean ai() {\n public int ak() {\n public void al() {\n public String am() {\n public Entity[] an() {\n public float ao() {\n public boolean ap() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w) });\n public boolean aq() {\n public int ar() {\n public int as() {\n public boolean at() {\n public UUID av() {\n public boolean aw() {\n public String ax() {\n return this.am();","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/Entity.java","implementation":"return true;","signature":"boolean O()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/Entity.java","implementation":"public void Q() {","signature":"String P()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/Entity.java","implementation":"public boolean T() {\n public void U() {\n this.o.V();\n public void V() {\n this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\n public double W() {\n public double X() {\n public float Y() {\n public Vec3 Z() {\n public void aa() {\n this.ao = this.ab();\n public int ab() {\n public ItemStack[] ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public boolean ai() {\n public int ak() {\n public void al() {\n public String am() {\n public Entity[] an() {\n public float ao() {\n public boolean ap() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)","signature":"boolean S()"}],"old_code":" float f2 = f0 % 2.0F;\n\n this.ao = this.aa();\n if (this.ag() && !this.G()) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.b), 1).call();\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.c), 4).call();\n boolean flag0 = this.F && this.af() && this instanceof EntityPlayer;\n if (this.ap()) {\n String s0 = this.O();\n String s0 = this.O();\n nbttagcompound.a(\"Air\", (short) this.aj());\n protected final String O() {\n public void P() {}\n public boolean R() {\n public boolean S() {\n public void T() {\n this.o.U();\n this.A = (float) ((double) this.A + d0);\n this.B = (float) ((double) this.B + d1);\n public void U() {\n this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\n public double V() {\n public double W() {\n public float X() {\n public Vec3 Y() {\n public void Z() {\n this.ao = this.aa();\n public int aa() {\n public ItemStack[] ac() {\n public boolean ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public int aj() {\n public void ak() {\n public String al() {\n public Entity[] am() {\n public float an() {\n public boolean ao() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w) });\n public boolean ap() {\n public int aq() {\n public int ar() {\n public boolean as() {\n public UUID au() {\n public boolean av() {\n public String aw() {\n return this.al();","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/Entity.java","implementation":"public void P() {","signature":"String O()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/Entity.java","implementation":"public boolean S() {\n public void T() {\n this.o.U();\n this.A = (float) ((double) this.A + d0);\n this.B = (float) ((double) this.B + d1);\n public void U() {\n this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\n public double V() {\n public double W() {\n public float X() {\n public Vec3 Y() {\n public void Z() {\n this.ao = this.aa();\n public int aa() {\n public ItemStack[] ac() {\n public boolean ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public int aj() {\n public void ak() {\n public String al() {\n public Entity[] am() {\n public float an() {\n public boolean ao() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)","signature":"boolean R()"}],"patch":"@@ -157,16 +157,21 @@ public void w() {\n }\n \n protected void a(float f0, float f1) {\n+ float f2;\n+\n if (f0 != this.O || f1 != this.P) {\n+ f2 = this.O;\n this.O = f0;\n this.P = f1;\n this.E.d = this.E.a + (double) this.O;\n this.E.f = this.E.c + (double) this.O;\n this.E.e = this.E.b + (double) this.P;\n+ if (this.O > f2 && !this.e && !this.q.I) {\n+ this.d((double) (f2 - this.O), 0.0D, (double) (f2 - this.O));\n+ }\n }\n \n- float f2 = f0 % 2.0F;\n-\n+ f2 = f0 % 2.0F;\n if ((double) f2 < 0.375D) {\n this.at = EnumEntitySize.a;\n } else if ((double) f2 < 0.75D) {\n@@ -224,7 +229,7 @@ public void x() {\n if (Configuration.getWorldConfig(getCanaryWorld().getFqName()).isNetherAllowed()) {\n if (this.o == null && this.aq++ >= i0) {\n this.aq = i0;\n- this.ao = this.aa();\n+ this.ao = this.ab();\n byte b0;\n \n if (this.q.t.i == -1) {\n@@ -255,7 +260,7 @@ public void x() {\n this.q.C.b();\n }\n \n- if (this.ag() && !this.G()) {\n+ if (this.ah() && !this.G()) {\n int i1 = MathHelper.c(this.u);\n \n i0 = MathHelper.c(this.v - 0.20000000298023224D - (double) this.N);\n@@ -279,7 +284,7 @@ public void x() {\n } else {\n if (this.d % 20 == 0) {\n // CanaryMod: call DamageHook (FireTick)\n- DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.b), 1).call();\n+ DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.b), 1.0F).call();\n if (!hook.isCanceled()) {\n this.a((((CanaryDamageSource) hook.getDamageSource()).getHandle()), hook.getDamageDealt());\n }\n@@ -314,7 +319,7 @@ public int y() {\n protected void z() {\n if (!this.ag) {\n // CanaryMod: call DamageHook (Lava)\n- DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.c), 4).call();\n+ DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.c), 4.0F).call();\n if (!hook.isCanceled()) {\n this.a((((CanaryDamageSource) hook.getDamageSource()).getHandle()), hook.getDamageDealt());\n this.d(15);\n@@ -374,7 +379,7 @@ public void d(double d0, double d1, double d2) {\n double d7 = d1;\n double d8 = d2;\n AxisAlignedBB axisalignedbb = this.E.c();\n- boolean flag0 = this.F && this.af() && this instanceof EntityPlayer;\n+ boolean flag0 = this.F && this.ag() && this instanceof EntityPlayer;\n \n if (flag0) {\n double d9;\n@@ -928,7 +933,7 @@ protected void J() {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n this.J();\n@@ -947,7 +952,7 @@ public boolean L() {\n public void b(Entity entity, int i0) {}\n \n public boolean c(NBTTagCompound nbttagcompound) {\n- String s0 = this.O();\n+ String s0 = this.P();\n \n if (!this.M && s0 != null) {\n nbttagcompound.a(\"id\", s0);\n@@ -959,7 +964,7 @@ public boolean c(NBTTagCompound nbttagcompound) {\n }\n \n public boolean d(NBTTagCompound nbttagcompound) {\n- String s0 = this.O();\n+ String s0 = this.P();\n \n if (!this.M && s0 != null && this.n == null) {\n nbttagcompound.a(\"id\", s0);\n@@ -977,7 +982,7 @@ public void e(NBTTagCompound nbttagcompound) {\n nbttagcompound.a(\"Rotation\", (NBTBase) this.a(new float[]{ this.A, this.B }));\n nbttagcompound.a(\"FallDistance\", this.T);\n nbttagcompound.a(\"Fire\", (short) this.d);\n- nbttagcompound.a(\"Air\", (short) this.aj());\n+ nbttagcompound.a(\"Air\", (short) this.ak());\n nbttagcompound.a(\"OnGround\", this.F);\n nbttagcompound.a(\"Dimension\", this.ar);\n nbttagcompound.a(\"Invulnerable\", this.h);\n@@ -1050,6 +1055,9 @@ public void f(NBTTagCompound nbttagcompound) {\n this.metadata = nbttagcompound.b(\"Canary\") ? new CanaryCompoundTag(nbttagcompound.l(\"Canary\")) : new CanaryCompoundTag(\"Canary\");\n // CanaryMod: END\n this.a(nbttagcompound);\n+ if (this.O()) {\n+ this.b(this.u, this.v, this.w);\n+ }\n } catch (Throwable throwable) {\n CrashReport crashreport = CrashReport.a(throwable, \"Loading entity NBT\");\n CrashReportCategory crashreportcategory = crashreport.a(\"Entity being loaded\");\n@@ -1059,15 +1067,19 @@ public void f(NBTTagCompound nbttagcompound) {\n }\n }\n \n- protected final String O() {\n+ protected boolean O() {\n+ return true;\n+ }\n+\n+ protected final String P() {\n return EntityList.b(this);\n }\n \n protected abstract void a(NBTTagCompound nbttagcompound);\n \n protected abstract void b(NBTTagCompound nbttagcompound);\n \n- public void P() {}\n+ public void Q() {}\n \n protected NBTTagList a(double... adouble) {\n NBTTagList nbttaglist = new NBTTagList();\n@@ -1117,11 +1129,11 @@ public EntityItem a(ItemStack itemstack, float f0) {\n }\n }\n \n- public boolean R() {\n+ public boolean S() {\n return !this.M;\n }\n \n- public boolean S() {\n+ public boolean T() {\n for (int i0 = 0; i0 < 8; ++i0) {\n float f0 = ((float) ((i0 >> 0) % 2) - 0.5F) * this.O * 0.8F;\n float f1 = ((float) ((i0 >> 1) % 2) - 0.5F) * 0.1F;\n@@ -1146,7 +1158,7 @@ public AxisAlignedBB g(Entity entity) {\n return null;\n }\n \n- public void T() {\n+ public void U() {\n if (this.o.M) {\n this.o = null;\n } else {\n@@ -1155,7 +1167,7 @@ public void T() {\n this.z = 0.0D;\n this.l_();\n if (this.o != null) {\n- this.o.U();\n+ this.o.V();\n this.g += (double) (this.o.A - this.o.C);\n \n for (this.f += (double) (this.o.B - this.o.D); this.g >= 180.0D; this.g -= 360.0D) {\n@@ -1196,23 +1208,21 @@ public void T() {\n \n this.g -= d0;\n this.f -= d1;\n- this.A = (float) ((double) this.A + d0);\n- this.B = (float) ((double) this.B + d1);\n }\n }\n }\n \n- public void U() {\n+ public void V() {\n if (this.n != null) {\n- this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\n+ this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\n }\n }\n \n- public double V() {\n+ public double W() {\n return (double) this.N;\n }\n \n- public double W() {\n+ public double X() {\n return (double) this.P * 0.75D;\n }\n \n@@ -1244,17 +1254,17 @@ public void a(Entity entity) {\n }\n }\n \n- public float X() {\n+ public float Y() {\n return 0.1F;\n }\n \n- public Vec3 Y() {\n+ public Vec3 Z() {\n return null;\n }\n \n- public void Z() {\n+ public void aa() {\n if (this.ao > 0) {\n- this.ao = this.aa();\n+ this.ao = this.ab();\n } else {\n double d0 = this.r - this.u;\n double d1 = this.t - this.w;\n@@ -1267,41 +1277,41 @@ public void Z() {\n }\n }\n \n- public int aa() {\n+ public int ab() {\n return 900;\n }\n \n- public ItemStack[] ac() {\n+ public ItemStack[] ad() {\n return null;\n }\n \n public void c(int i0, ItemStack itemstack) {}\n \n- public boolean ad() {\n+ public boolean ae() {\n return !this.ag && (this.d > 0 || this.f(0));\n }\n \n- public boolean ae() {\n+ public boolean af() {\n return this.o != null;\n }\n \n- public boolean af() {\n+ public boolean ag() {\n return this.f(1);\n }\n \n public void b(boolean flag0) {\n this.a(1, flag0);\n }\n \n- public boolean ag() {\n+ public boolean ah() {\n return this.f(3);\n }\n \n public void c(boolean flag0) {\n this.a(3, flag0);\n }\n \n- public boolean ah() {\n+ public boolean ai() {\n return this.f(5);\n }\n \n@@ -1327,7 +1337,7 @@ protected void a(int i0, boolean flag0) {\n }\n }\n \n- public int aj() {\n+ public int ak() {\n return this.ah.b(1);\n }\n \n@@ -1421,12 +1431,12 @@ protected boolean i(double d0, double d1, double d2) {\n }\n }\n \n- public void ak() {\n+ public void al() {\n this.K = true;\n this.T = 0.0F;\n }\n \n- public String al() {\n+ public String am() {\n String s0 = EntityList.b(this);\n \n if (s0 == null) {\n@@ -1436,19 +1446,19 @@ public String al() {\n return StatCollector.a(\"entity.\" + s0 + \".name\");\n }\n \n- public Entity[] am() {\n+ public Entity[] an() {\n return null;\n }\n \n public boolean h(Entity entity) {\n return this == entity;\n }\n \n- public float an() {\n+ public float ao() {\n return 0.0F;\n }\n \n- public boolean ao() {\n+ public boolean ap() {\n return true;\n }\n \n@@ -1457,10 +1467,10 @@ public boolean i(Entity entity) {\n }\n \n public String toString() {\n- return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w) });\n+ return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w) });\n }\n \n- public boolean ap() {\n+ public boolean aq() {\n return this.h;\n }\n \n@@ -1528,15 +1538,15 @@ public boolean a(Explosion explosion, World world, int i0, int i1, int i2, int i\n return true;\n }\n \n- public int aq() {\n+ public int ar() {\n return 3;\n }\n \n- public int ar() {\n+ public int as() {\n return this.as;\n }\n \n- public boolean as() {\n+ public boolean at() {\n return false;\n }\n \n@@ -1549,16 +1559,16 @@ public void a(CrashReportCategory crashreportcategory) {\n crashreportcategory.a(\"Entity\\'s Momentum\", String.format(\"%.2f, %.2f, %.2f\", new Object[]{ Double.valueOf(this.x), Double.valueOf(this.y), Double.valueOf(this.z) }));\n }\n \n- public UUID au() {\n+ public UUID av() {\n return this.i;\n }\n \n- public boolean av() {\n+ public boolean aw() {\n return true;\n }\n \n- public String aw() {\n- return this.al();\n+ public String ax() {\n+ return this.am();\n }\n \n /**","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntity.java","sha":"7e8584c1fbdbbc17a378632855cc0c0f9d83309d","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityArrow.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityArrow.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/EntityArrow.java","new_code":" if (this.ae() && !(movingobjectposition.g instanceof EntityEnderman)) {\n entitylivingbase.m(entitylivingbase.aT() + 1);\n public boolean ap() {","new_methods":[],"old_code":" if (this.ad() && !(movingobjectposition.g instanceof EntityEnderman)) {\n entitylivingbase.m(entitylivingbase.aQ() + 1);\n public boolean ao() {","old_methods":[],"patch":"@@ -226,7 +226,7 @@ public void l_() {\n damagesource = DamageSource.a(this, this.c);\n }\n \n- if (this.ad() && !(movingobjectposition.g instanceof EntityEnderman)) {\n+ if (this.ae() && !(movingobjectposition.g instanceof EntityEnderman)) {\n movingobjectposition.g.d(5);\n }\n \n@@ -235,7 +235,7 @@ public void l_() {\n EntityLivingBase entitylivingbase = (EntityLivingBase) movingobjectposition.g;\n \n if (!this.q.I) {\n- entitylivingbase.m(entitylivingbase.aQ() + 1);\n+ entitylivingbase.m(entitylivingbase.aT() + 1);\n }\n \n if (this.aw > 0) {\n@@ -404,7 +404,7 @@ public void a(int i0) {\n this.aw = i0;\n }\n \n- public boolean ao() {\n+ public boolean ap() {\n return false;\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityArrow.java","sha":"d3a81e844d7176417e4082bebe49b73d989abd6a","status":"modified"},{"additions":20,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBat.java","changes":40,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBat.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":20,"filename":"src/main/java/net/minecraft/server/EntityBat.java","new_code":" protected float aZ() {\n protected float ba() {\n return super.ba() * 0.95F;\n return this.bJ() && this.ab.nextInt(4) != 0 ? null : \"mob.bat.idle\";\n protected String aN() {\n protected String aO() {\n protected void bi() {}\n protected void ay() {\n super.ay();\n public boolean bJ() {\n protected boolean be() {\n if (this.bJ()) {\n protected void bh() {\n super.bh();\n if (this.bJ()) {\n public boolean at() {\n if (this.aq()) {\n if (!this.q.I && this.bJ()) {\n public boolean bs() {\n return i3 > this.ab.nextInt(b0) ? false : super.bs();","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityBat.java","implementation":"protected float ba() {\n return super.ba() * 0.95F;\n return this.bJ() && this.ab.nextInt(4) != 0 ? null : \"mob.bat.idle\";\n protected String aN() {\n protected String aO() {\n protected void bi() {","signature":"float aZ()"}],"old_code":" protected float aW() {\n protected float aX() {\n return super.aX() * 0.95F;\n return this.bF() && this.ab.nextInt(4) != 0 ? null : \"mob.bat.idle\";\n protected String aK() {\n protected String aL() {\n protected void bf() {}\n protected void ax() {\n super.ax();\n public boolean bF() {\n protected boolean bb() {\n if (this.bF()) {\n protected void be() {\n super.be();\n if (this.bF()) {\n public boolean as() {\n if (this.ap()) {\n if (!this.q.I && this.bF()) {\n public boolean bo() {\n return i3 > this.ab.nextInt(b0) ? false : super.bo();","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityBat.java","implementation":"protected float aX() {\n return super.aX() * 0.95F;\n return this.bF() && this.ab.nextInt(4) != 0 ? null : \"mob.bat.idle\";\n protected String aK() {\n protected String aL() {\n protected void bf() {","signature":"float aW()"}],"patch":"@@ -19,23 +19,23 @@ protected void a() {\n this.ah.a(16, new Byte((byte) 0));\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 0.1F;\n }\n \n- protected float aX() {\n- return super.aX() * 0.95F;\n+ protected float ba() {\n+ return super.ba() * 0.95F;\n }\n \n protected String r() {\n- return this.bF() && this.ab.nextInt(4) != 0 ? null : \"mob.bat.idle\";\n+ return this.bJ() && this.ab.nextInt(4) != 0 ? null : \"mob.bat.idle\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.bat.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.bat.death\";\n }\n \n@@ -45,14 +45,14 @@ public boolean L() {\n \n protected void n(Entity entity) {}\n \n- protected void bf() {}\n+ protected void bi() {}\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(6.0D);\n }\n \n- public boolean bF() {\n+ public boolean bJ() {\n return (this.ah.a(16) & 1) != 0;\n }\n \n@@ -66,23 +66,23 @@ public void a(boolean flag0) {\n }\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return true;\n }\n \n public void l_() {\n super.l_();\n- if (this.bF()) {\n+ if (this.bJ()) {\n this.x = this.y = this.z = 0.0D;\n this.v = (double) MathHelper.c(this.v) + 1.0D - (double) this.P;\n } else {\n this.y *= 0.6000000238418579D;\n }\n }\n \n- protected void be() {\n- super.be();\n- if (this.bF()) {\n+ protected void bh() {\n+ super.bh();\n+ if (this.bJ()) {\n if (!this.q.u(MathHelper.c(this.u), (int) this.v + 1, MathHelper.c(this.w))) {\n this.a(false);\n this.q.a((EntityPlayer) null, 1015, (int) this.u, (int) this.v, (int) this.w, 0);\n@@ -131,15 +131,15 @@ protected void b(float f0) {}\n \n protected void a(double d0, boolean flag0) {}\n \n- public boolean as() {\n+ public boolean at() {\n return true;\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n- if (!this.q.I && this.bF()) {\n+ if (!this.q.I && this.bJ()) {\n this.a(false);\n }\n \n@@ -157,7 +157,7 @@ public void b(NBTTagCompound nbttagcompound) {\n nbttagcompound.a(\"BatFlags\", this.ah.a(16));\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n int i0 = MathHelper.c(this.E.b);\n \n if (i0 >= 63) {\n@@ -177,7 +177,7 @@ public boolean bo() {\n b0 = 7;\n }\n \n- return i3 > this.ab.nextInt(b0) ? false : super.bo();\n+ return i3 > this.ab.nextInt(b0) ? false : super.bs();\n }\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBat.java","sha":"b6bda0ee223c3b9107ea1d48c9cf993c4858c150","status":"modified"},{"additions":8,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBlaze.java","changes":16,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBlaze.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":8,"filename":"src/main/java/net/minecraft/server/EntityBlaze.java","new_code":" protected void ay() {\n super.ay();\n protected String aN() {\n protected String aO() {\n if (this.bN() != null && this.bN().v + (double) this.bN().f() > this.v + (double) this.f() + (double) this.bp) {\n public boolean ae() {\n return this.bT();\n public boolean bT() {","new_methods":[],"old_code":" protected void ax() {\n super.ax();\n protected String aK() {\n protected String aL() {\n if (this.bJ() != null && this.bJ().v + (double) this.bJ().f() > this.v + (double) this.f() + (double) this.bp) {\n public boolean ad() {\n return this.bP();\n public boolean bP() {","old_methods":[],"patch":"@@ -15,8 +15,8 @@ public EntityBlaze(World world) {\n this.entity = new CanaryBlaze(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.e).a(6.0D);\n }\n \n@@ -29,11 +29,11 @@ protected String r() {\n return \"mob.blaze.breathe\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.blaze.hit\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.blaze.death\";\n }\n \n@@ -53,7 +53,7 @@ public void c() {\n this.bp = 0.5F + (float) this.ab.nextGaussian() * 3.0F;\n }\n \n- if (this.bJ() != null && this.bJ().v + (double) this.bJ().f() > this.v + (double) this.f() + (double) this.bp) {\n+ if (this.bN() != null && this.bN().v + (double) this.bN().f() > this.v + (double) this.f() + (double) this.bp) {\n this.y += (0.30000001192092896D - this.y) * 0.30000001192092896D;\n }\n }\n@@ -120,8 +120,8 @@ protected int s() {\n return Item.bq.cv;\n }\n \n- public boolean ad() {\n- return this.bP();\n+ public boolean ae() {\n+ return this.bT();\n }\n \n protected void b(boolean flag0, int i0) {\n@@ -134,7 +134,7 @@ protected void b(boolean flag0, int i0) {\n }\n }\n \n- public boolean bP() {\n+ public boolean bT() {\n return (this.ah.a(16) & 1) != 0;\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBlaze.java","sha":"b5c04c49945922fda6e8b42192ce97c80a9117e0","status":"modified"},{"additions":4,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBoat.java","changes":8,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBoat.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":4,"filename":"src/main/java/net/minecraft/server/EntityBoat.java","new_code":" public double X() {\n if (this.aq()) {\n public void V() {\n this.n.b(this.u + d0, this.v + this.X() + this.n.W(), this.w + d1);","new_methods":[],"old_code":" public double W() {\n if (this.ap()) {\n public void U() {\n this.n.b(this.u + d0, this.v + this.W() + this.n.V(), this.w + d1);","old_methods":[],"patch":"@@ -69,12 +69,12 @@ public EntityBoat(World world, double d0, double d1, double d2) {\n this.entity = new CanaryBoat(this); // CanaryMod: Wrap Entity\n }\n \n- public double W() {\n+ public double X() {\n return (double) this.P * 0.0D - 0.30000001192092896D;\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (!this.q.I && !this.M) {\n // CanaryMod: VehicleDamage\n@@ -340,12 +340,12 @@ public void l_() {\n }\n }\n \n- public void U() {\n+ public void V() {\n if (this.n != null) {\n double d0 = Math.cos((double) this.A * 3.141592653589793D / 180.0D) * 0.4D;\n double d1 = Math.sin((double) this.A * 3.141592653589793D / 180.0D) * 0.4D;\n \n- this.n.b(this.u + d0, this.v + this.W() + this.n.V(), this.w + d1);\n+ this.n.b(this.u + d0, this.v + this.X() + this.n.W(), this.w + d1);\n }\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBoat.java","sha":"cdcfa94647c782b1bdc002f5c4c2eda8c7f8b655","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCaveSpider.java","changes":8,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCaveSpider.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":5,"filename":"src/main/java/net/minecraft/server/EntityCaveSpider.java","new_code":" protected void ay() {\n super.ay();\n ((EntityLivingBase) entity).c(new PotionEffect(Potion.u.H, b0 * 20, 0));","new_methods":[],"old_code":"\n\n protected void ax() {\n super.ax();\n ((EntityLivingBase) entity).d(new PotionEffect(Potion.u.H, b0 * 20, 0));","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.monster.CanaryCaveSpider;\n \n-\n public class EntityCaveSpider extends EntitySpider {\n \n public EntityCaveSpider(World world) {\n@@ -12,8 +10,8 @@ public EntityCaveSpider(World world) {\n this.entity = new CanaryCaveSpider(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(12.0D);\n }\n \n@@ -31,7 +29,7 @@ public boolean m(Entity entity) {\n }\n \n if (b0 > 0) {\n- ((EntityLivingBase) entity).d(new PotionEffect(Potion.u.H, b0 * 20, 0));\n+ ((EntityLivingBase) entity).c(new PotionEffect(Potion.u.H, b0 * 20, 0));\n }\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCaveSpider.java","sha":"26ed27b82c39bc770035af57eaf494974f7af1ad","status":"modified"},{"additions":6,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityChicken.java","changes":14,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityChicken.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":8,"filename":"src/main/java/net/minecraft/server/EntityChicken.java","new_code":" public boolean be() {\n protected void ay() {\n super.ay();\n protected String aN() {\n protected String aO() {\n if (this.ae()) {","new_methods":[],"old_code":"\n\n public boolean bb() {\n protected void ax() {\n super.ax();\n protected String aK() {\n protected String aL() {\n if (this.ad()) {","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.animal.CanaryChicken;\n \n-\n public class EntityChicken extends EntityAnimal {\n \n public float bp;\n@@ -28,12 +26,12 @@ public EntityChicken(World world) {\n this.entity = new CanaryChicken(this); // CanaryMod: Wrap Entity\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(4.0D);\n this.a(SharedMonsterAttributes.d).a(0.25D);\n }\n@@ -74,11 +72,11 @@ protected String r() {\n return \"mob.chicken.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.chicken.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.chicken.hurt\";\n }\n \n@@ -97,7 +95,7 @@ protected void b(boolean flag0, int i0) {\n this.b(Item.N.cv, 1);\n }\n \n- if (this.ad()) {\n+ if (this.ae()) {\n this.b(Item.bn.cv, 1);\n } else {\n this.b(Item.bm.cv, 1);","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityChicken.java","sha":"07b756e1e9475f5d398aeeb5518f782b21e5b5bc","status":"modified"},{"additions":7,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCow.java","changes":14,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCow.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":7,"filename":"src/main/java/net/minecraft/server/EntityCow.java","new_code":" public boolean be() {\n protected void ay() {\n super.ay();\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (this.ae()) {","new_methods":[],"old_code":" public boolean bb() {\n protected void ax() {\n super.ax();\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (this.ad()) {","old_methods":[],"patch":"@@ -19,12 +19,12 @@ public EntityCow(World world) {\n this.entity = new CanaryCow(this); // CanaryMod: Wrap Entity\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(10.0D);\n this.a(SharedMonsterAttributes.d).a(0.20000000298023224D);\n }\n@@ -33,19 +33,19 @@ protected String r() {\n return \"mob.cow.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.cow.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.cow.hurt\";\n }\n \n protected void a(int i0, int i1, int i2, int i3) {\n this.a(\"mob.cow.step\", 0.15F, 1.0F);\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 0.4F;\n }\n \n@@ -65,7 +65,7 @@ protected void b(boolean flag0, int i0) {\n i1 = this.ab.nextInt(3) + 1 + this.ab.nextInt(1 + i0);\n \n for (i2 = 0; i2 < i1; ++i2) {\n- if (this.ad()) {\n+ if (this.ae()) {\n this.b(Item.bl.cv, 1);\n } else {\n this.b(Item.bk.cv, 1);","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCow.java","sha":"1385bc08a35d537c9c780df1a1384775605444ae","status":"modified"},{"additions":32,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreature.java","changes":61,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreature.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":29,"filename":"src/main/java/net/minecraft/server/EntityCreature.java","new_code":" private EntityAIBase bs = new EntityAIMoveTowardsRestriction(this, 1.0D);\n protected boolean bJ() {\n protected void bk() {\n this.bn = this.bJ();\n Entity entity = this.bL();\n } else if (this.j.S()) {\n this.bK();\n if (this.G && !this.bM()) {\n super.bk();\n protected void bK() {\n protected Entity bL() {\n public boolean bs() {\n return super.bs() && this.a(i0, i1, i2) >= 0.0F;\n public boolean bM() {\n public Entity bN() {\n public boolean bO() {\n public ChunkCoordinates bP() {\n public float bQ() {\n public void bR() {\n public boolean bS() {\n protected void bF() {\n super.bF();\n if (this.bH() && this.bI() != null && this.bI().q == this.q) {\n Entity entity = this.bI();\n if (this instanceof EntityTameable && ((EntityTameable) this).bU()) {\n this.a(true, true);\n this.o(f0);\n this.a(true, true);\n } else if (!this.bH() && this.bt) {\n this.bR();\n\n protected void o(float f0) {}","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityCreature.java","implementation":"protected void bk() {\n this.bn = this.bJ();\n Entity entity = this.bL();","signature":"boolean bJ()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityCreature.java","implementation":"protected Entity bL() {\n public boolean bs() {\n return super.bs() && this.a(i0, i1, i2) >= 0.0F;\n public boolean bM() {\n public Entity bN() {\n public boolean bO() {\n public ChunkCoordinates bP() {\n public float bQ() {\n public void bR() {\n public boolean bS() {\n protected void bF() {\n super.bF();\n if (this.bH() && this.bI() != null && this.bI().q == this.q) {\n Entity entity = this.bI();\n if (this instanceof EntityTameable && ((EntityTameable) this).bU()) {\n this.a(true, true);\n this.o(f0);\n this.a(true, true);","signature":"void bK()"},{"arguments":["float f0"],"filename":"src/main/java/net/minecraft/server/EntityCreature.java","implementation":"","signature":"void o(float f0)"}],"old_code":" private EntityAIBase bs = new EntityAIMoveTwardsRestriction(this, 1.0D);\n protected boolean bF() {\n protected void bh() {\n this.bn = this.bF();\n Entity entity = this.bH();\n } else if (this.j.R()) {\n this.bG();\n if (this.G && !this.bI()) {\n super.bh();\n protected void bG() {\n protected Entity bH() {\n public boolean bo() {\n return super.bo() && this.a(i0, i1, i2) >= 0.0F;\n public boolean bI() {\n public Entity bJ() {\n public boolean bK() {\n public ChunkCoordinates bL() {\n public float bM() {\n public void bN() {\n public boolean bO() {\n protected void bB() {\n super.bB();\n if (this.bD() && this.bE() != null && this.bE().q == this.q) {\n Entity entity = this.bE();\n if (this instanceof EntityTameable && ((EntityTameable) this).bQ()) {\n this.i(true);\n this.i(true);\n } else if (!this.bD() && this.bt) {\n this.bN();","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityCreature.java","implementation":"protected void bh() {\n this.bn = this.bF();\n Entity entity = this.bH();","signature":"boolean bF()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityCreature.java","implementation":"protected Entity bH() {\n public boolean bo() {\n return super.bo() && this.a(i0, i1, i2) >= 0.0F;\n public boolean bI() {\n public Entity bJ() {\n public boolean bK() {\n public ChunkCoordinates bL() {\n public float bM() {\n public void bN() {\n public boolean bO() {\n protected void bB() {\n super.bB();\n if (this.bD() && this.bE() != null && this.bE().q == this.q) {\n Entity entity = this.bE();\n if (this instanceof EntityTameable && ((EntityTameable) this).bQ()) {\n this.i(true);\n this.i(true);","signature":"void bG()"}],"patch":"@@ -13,31 +13,31 @@ public abstract class EntityCreature extends EntityLiving {\n protected int bo;\n private ChunkCoordinates bq = new ChunkCoordinates(0, 0, 0);\n private float br = -1.0F;\n- private EntityAIBase bs = new EntityAIMoveTwardsRestriction(this, 1.0D);\n+ private EntityAIBase bs = new EntityAIMoveTowardsRestriction(this, 1.0D);\n private boolean bt;\n \n public EntityCreature(World world) {\n super(world);\n }\n \n- protected boolean bF() {\n+ protected boolean bJ() {\n return false;\n }\n \n- protected void bh() {\n+ protected void bk() {\n this.q.C.a(\"ai\");\n if (this.bo > 0 && --this.bo == 0) {\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n \n attributeinstance.b(i);\n }\n \n- this.bn = this.bF();\n+ this.bn = this.bJ();\n float f11 = 16.0F;\n \n if (this.j == null) {\n // CanaryMod: MobTarget\n- Entity entity = this.bH();\n+ Entity entity = this.bL();\n if (entity != null && entity instanceof EntityLivingBase) {\n MobTargetHook hook = (MobTargetHook) new MobTargetHook((net.canarymod.api.entity.living.LivingBase) this.getCanaryEntity(), (net.canarymod.api.entity.living.LivingBase) entity.getCanaryEntity()).call();\n if (!hook.isCanceled()) {\n@@ -49,7 +49,7 @@ protected void bh() {\n if (this.j != null) {\n this.bp = this.q.a(this, this.j, f11, true, false, false, true);\n }\n- } else if (this.j.R()) {\n+ } else if (this.j.S()) {\n float f1 = this.j.d((Entity) this);\n \n if (this.o(this.j)) {\n@@ -63,7 +63,7 @@ protected void bh() {\n if (!this.bn && this.j != null && (this.bp == null || this.ab.nextInt(20) == 0)) {\n this.bp = this.q.a(this, this.j, f11, true, false, false, true);\n } else if (!this.bn && (this.bp == null && this.ab.nextInt(180) == 0 || this.ab.nextInt(120) == 0 || this.bo > 0) && this.aV < 100) {\n- this.bG();\n+ this.bK();\n }\n \n int i0 = MathHelper.c(this.E.b + 0.5D);\n@@ -124,7 +124,7 @@ protected void bh() {\n this.a(this.j, 30.0F, 30.0F);\n }\n \n- if (this.G && !this.bI()) {\n+ if (this.G && !this.bM()) {\n this.bd = true;\n }\n \n@@ -134,12 +134,12 @@ protected void bh() {\n \n this.q.C.b();\n } else {\n- super.bh();\n+ super.bk();\n this.bp = null;\n }\n }\n \n- protected void bG() {\n+ protected void bK() {\n this.q.C.a(\"stroll\");\n boolean flag0 = false;\n int i0 = -1;\n@@ -175,35 +175,35 @@ public float a(int i0, int i1, int i2) {\n return 0.0F;\n }\n \n- protected Entity bH() {\n+ protected Entity bL() {\n return null;\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n int i0 = MathHelper.c(this.u);\n int i1 = MathHelper.c(this.E.b);\n int i2 = MathHelper.c(this.w);\n \n- return super.bo() && this.a(i0, i1, i2) >= 0.0F;\n+ return super.bs() && this.a(i0, i1, i2) >= 0.0F;\n }\n \n- public boolean bI() {\n+ public boolean bM() {\n return this.bp != null;\n }\n \n public void a(PathEntity pathentity) {\n this.bp = pathentity;\n }\n \n- public Entity bJ() {\n+ public Entity bN() {\n return this.j;\n }\n \n public void b(Entity entity) {\n this.j = entity;\n }\n \n- public boolean bK() {\n+ public boolean bO() {\n return this.b(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w));\n }\n \n@@ -216,33 +216,33 @@ public void b(int i0, int i1, int i2, int i3) {\n this.br = (float) i3;\n }\n \n- public ChunkCoordinates bL() {\n+ public ChunkCoordinates bP() {\n return this.bq;\n }\n \n- public float bM() {\n+ public float bQ() {\n return this.br;\n }\n \n- public void bN() {\n+ public void bR() {\n this.br = -1.0F;\n }\n \n- public boolean bO() {\n+ public boolean bS() {\n return this.br != -1.0F;\n }\n \n- protected void bB() {\n- super.bB();\n- if (this.bD() && this.bE() != null && this.bE().q == this.q) {\n- Entity entity = this.bE();\n+ protected void bF() {\n+ super.bF();\n+ if (this.bH() && this.bI() != null && this.bI().q == this.q) {\n+ Entity entity = this.bI();\n \n this.b((int) entity.u, (int) entity.v, (int) entity.w, 5);\n float f0 = this.d(entity);\n \n- if (this instanceof EntityTameable && ((EntityTameable) this).bQ()) {\n+ if (this instanceof EntityTameable && ((EntityTameable) this).bU()) {\n if (f0 > 10.0F) {\n- this.i(true);\n+ this.a(true, true);\n }\n \n return;\n@@ -254,6 +254,7 @@ protected void bB() {\n this.bt = true;\n }\n \n+ this.o(f0);\n if (f0 > 4.0F) {\n this.k().a(entity, 1.0D);\n }\n@@ -269,13 +270,15 @@ protected void bB() {\n }\n \n if (f0 > 10.0F) {\n- this.i(true);\n+ this.a(true, true);\n }\n- } else if (!this.bD() && this.bt) {\n+ } else if (!this.bH() && this.bt) {\n this.bt = false;\n this.c.a(this.bs);\n this.k().a(true);\n- this.bN();\n+ this.bR();\n }\n }\n+\n+ protected void o(float f0) {}\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreature.java","sha":"67e482a46d55fde8833cbd96fe0c13d1c077961d","status":"modified"},{"additions":12,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreeper.java","changes":24,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreeper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":12,"filename":"src/main/java/net/minecraft/server/EntityCreeper.java","new_code":" protected void ay() {\n super.ay();\n public boolean be() {\n public int ar() {\n return this.m() == null ? 3 : 3 + (int) (this.aM() - 1.0F);\n if (this.S()) {\n int i0 = this.bV();\n if (this.bT()) {\n protected String aN() {\n protected String aO() {\n public boolean bT() {\n public int bV() {","new_methods":[],"old_code":" protected void ax() {\n super.ax();\n public boolean bb() {\n public int aq() {\n return this.m() == null ? 3 : 3 + (int) (this.aJ() - 1.0F);\n if (this.R()) {\n int i0 = this.bR();\n if (this.bP()) {\n protected String aK() {\n protected String aL() {\n public boolean bP() {\n public int bR() {","old_methods":[],"patch":"@@ -23,17 +23,17 @@ public EntityCreeper(World world) {\n this.entity = new CanaryCreeper(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.d).a(0.25D);\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- public int aq() {\n- return this.m() == null ? 3 : 3 + (int) (this.aJ() - 1.0F);\n+ public int ar() {\n+ return this.m() == null ? 3 : 3 + (int) (this.aM() - 1.0F);\n }\n \n protected void b(float f0) {\n@@ -73,9 +73,9 @@ public void a(NBTTagCompound nbttagcompound) {\n }\n \n public void l_() {\n- if (this.R()) {\n+ if (this.S()) {\n this.bp = this.bq;\n- int i0 = this.bR();\n+ int i0 = this.bV();\n \n if (i0 > 0 && this.bq == 0) {\n this.a(\"random.fuse\", 1.0F, 0.5F);\n@@ -91,7 +91,7 @@ public void l_() {\n if (!this.q.I) {\n boolean flag0 = this.q.O().b(\"mobGriefing\");\n \n- if (this.bP()) {\n+ if (this.bT()) {\n this.q.a(this, this.u, this.v, this.w, (float) (this.bs * 2), flag0);\n } else {\n this.q.a(this, this.u, this.v, this.w, (float) this.bs, flag0);\n@@ -105,11 +105,11 @@ public void l_() {\n super.l_();\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.creeper.say\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.creeper.death\";\n }\n \n@@ -126,15 +126,15 @@ public boolean m(Entity entity) {\n return true;\n }\n \n- public boolean bP() {\n+ public boolean bT() {\n return this.ah.a(17) == 1;\n }\n \n protected int s() {\n return Item.O.cv;\n }\n \n- public int bR() {\n+ public int bV() {\n return this.ah.a(16);\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreeper.java","sha":"f031de7d46e9ab20484cae8ce47a4dc2be5ded7e","status":"modified"},{"additions":16,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityDragon.java","changes":32,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityDragon.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":16,"filename":"src/main/java/net/minecraft/server/EntityDragon.java","new_code":" this.g(this.aS());\n protected void ay() {\n super.ay();\n if (this.aM() <= 0.0F) {\n if (this.aM() <= 0.0F) {\n this.bJ();\n this.bK();\n private void bJ() {\n } else if (this.ac % 10 == 0 && this.aM() < this.aS()) {\n this.g(this.aM() + 1.0F);\n private void bK() {\n protected void aA() {\n protected void bo() {}\n public Entity[] an() {\n protected String aN() {\n protected float aZ() {","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityDragon.java","implementation":"super.ay();\n if (this.aM() <= 0.0F) {\n if (this.aM() <= 0.0F) {\n this.bJ();\n this.bK();\n private void bJ() {","signature":"void ay()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityDragon.java","implementation":"protected void aA() {\n protected void bo() {","signature":"void bK()"}],"old_code":" this.g(this.aP());\n protected void ax() {\n super.ax();\n if (this.aJ() <= 0.0F) {\n if (this.aJ() <= 0.0F) {\n this.bF();\n this.bG();\n private void bF() {\n } else if (this.ac % 10 == 0 && this.aJ() < this.aP()) {\n this.g(this.aJ() + 1.0F);\n private void bG() {\n protected void az() {\n protected void bk() {}\n public Entity[] am() {\n protected String aK() {\n protected float aW() {","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityDragon.java","implementation":"super.ax();\n if (this.aJ() <= 0.0F) {\n if (this.aJ() <= 0.0F) {\n this.bF();\n this.bG();\n private void bF() {","signature":"void ax()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityDragon.java","implementation":"protected void az() {\n protected void bk() {","signature":"void bG()"}],"patch":"@@ -31,7 +31,7 @@ public EntityDragon(World world) {\n super(world);\n this.bp = new EntityDragonPart[]{ this.bq = new EntityDragonPart(this, \"head\", 6.0F, 6.0F), this.br = new EntityDragonPart(this, \"body\", 8.0F, 8.0F), this.bs = new EntityDragonPart(this, \"tail\", 4.0F, 4.0F), this.bt = new EntityDragonPart(this, \"tail\", 4.0F, 4.0F), this.bu = new EntityDragonPart(this, \"tail\", 4.0F, 4.0F),\n this.bv = new EntityDragonPart(this, \"wing\", 4.0F, 4.0F), this.bw = new EntityDragonPart(this, \"wing\", 4.0F, 4.0F) };\n- this.g(this.aP());\n+ this.g(this.aS());\n this.a(16.0F, 8.0F);\n this.Z = true;\n this.ag = true;\n@@ -40,8 +40,8 @@ public EntityDragon(World world) {\n this.entity = new CanaryEnderDragon(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(200.0D);\n }\n \n@@ -50,7 +50,7 @@ protected void a() {\n }\n \n public double[] b(int i0, float f0) {\n- if (this.aJ() <= 0.0F) {\n+ if (this.aM() <= 0.0F) {\n f0 = 0.0F;\n }\n \n@@ -84,13 +84,13 @@ public void c() {\n this.bx = this.by;\n float f2;\n \n- if (this.aJ() <= 0.0F) {\n+ if (this.aM() <= 0.0F) {\n f0 = (this.ab.nextFloat() - 0.5F) * 8.0F;\n f1 = (this.ab.nextFloat() - 0.5F) * 4.0F;\n f2 = (this.ab.nextFloat() - 0.5F) * 8.0F;\n this.q.a(\"largeexplode\", this.u + (double) f0, this.v + 2.0D + (double) f1, this.w + (double) f2, 0.0D, 0.0D, 0.0D);\n } else {\n- this.bF();\n+ this.bJ();\n f0 = 0.2F / (MathHelper.a(this.x * this.x + this.z * this.z) * 10.0F + 1.0F);\n f0 *= (float) Math.pow(2.0D, this.y);\n if (this.bA) {\n@@ -155,7 +155,7 @@ public void c() {\n }\n \n if (this.bz || d3 < 100.0D || d3 > 22500.0D || this.G || this.H) {\n- this.bG();\n+ this.bK();\n }\n \n d1 /= (double) MathHelper.a(d0 * d0 + d2 * d2);\n@@ -289,16 +289,16 @@ public void c() {\n }\n }\n \n- private void bF() {\n+ private void bJ() {\n if (this.bC != null) {\n if (this.bC.M) {\n if (!this.q.I) {\n this.a(this.bq, DamageSource.a((Explosion) null), 10.0F);\n }\n \n this.bC = null;\n- } else if (this.ac % 10 == 0 && this.aJ() < this.aP()) {\n- this.g(this.aJ() + 1.0F);\n+ } else if (this.ac % 10 == 0 && this.aM() < this.aS()) {\n+ this.g(this.aM() + 1.0F);\n }\n }\n \n@@ -351,7 +351,7 @@ private void b(List list) {\n }\n }\n \n- private void bG() {\n+ private void bK() {\n this.bz = false;\n if (this.ab.nextInt(2) == 0 && !this.q.h.isEmpty()) {\n this.bD = (Entity) this.q.h.get(this.ab.nextInt(this.q.h.size()));\n@@ -445,7 +445,7 @@ protected boolean e(DamageSource damagesource, float f0) {\n return super.a(damagesource, f0);\n }\n \n- protected void az() {\n+ protected void aA() {\n ++this.bB;\n if (this.bB >= 180 && this.bB <= 200) {\n float f0 = (this.ab.nextFloat() - 0.5F) * 8.0F;\n@@ -532,9 +532,9 @@ private void c(int i0, int i1) {\n BlockEndPortal.a = false;\n }\n \n- protected void bk() {}\n+ protected void bo() {}\n \n- public Entity[] am() {\n+ public Entity[] an() {\n return this.bp;\n }\n \n@@ -550,11 +550,11 @@ protected String r() {\n return \"mob.enderdragon.growl\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.enderdragon.hit\";\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 5.0F;\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityDragon.java","sha":"a1cb601944b6465e80b07592b07f945598dfa7fa","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEgg.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEgg.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/EntityEgg.java","new_code":" movingobjectposition.g.a(DamageSource.a((Entity) this, this.h()), 0.0F);","new_methods":[],"old_code":" movingobjectposition.g.a(DamageSource.a((Entity) this, this.h()), 0);","old_methods":[],"patch":"@@ -25,7 +25,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\n ProjectileHitHook hook = (ProjectileHitHook) new ProjectileHitHook(this.getCanaryEntity(), movingobjectposition == null || movingobjectposition.g == null ? null : movingobjectposition.g.getCanaryEntity()).call();\n if (!hook.isCanceled()) { //\n if (movingobjectposition.g != null) {\n- movingobjectposition.g.a(DamageSource.a((Entity) this, this.h()), 0);\n+ movingobjectposition.g.a(DamageSource.a((Entity) this, this.h()), 0.0F);\n }\n \n if (!this.q.I && this.ab.nextInt(8) == 0) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEgg.java","sha":"66b53dcb9d208db98879910b1c027e13891f38fc","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderCrystal.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderCrystal.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/EntityEnderCrystal.java","new_code":" if (this.aq()) {","new_methods":[],"old_code":" if (this.ap()) {","old_methods":[],"patch":"@@ -49,7 +49,7 @@ public boolean K() {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n if (!this.M && !this.q.I) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderCrystal.java","sha":"a52ffbaf4c9de4734ba4ec9028d8bdadf683c595","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderEye.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderEye.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/EntityEnderEye.java","new_code":" public boolean ap() {","new_methods":[],"old_code":" public boolean ao() {","old_methods":[],"patch":"@@ -129,7 +129,7 @@ public float d(float f0) {\n return 1.0F;\n }\n \n- public boolean ao() {\n+ public boolean ap() {\n return false;\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderEye.java","sha":"ece94c136959733906d79ede93ce9615b00bba68","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderPearl.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderPearl.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/EntityEnderPearl.java","new_code":" if (this.h().af()) {","new_methods":[],"old_code":"\n\n if (this.h().ae()) {","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.throwable.CanaryEnderPearl;\n \n-\n public class EntityEnderPearl extends EntityThrowable {\n \n public EntityEnderPearl(World world) {\n@@ -30,7 +28,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\n EntityPlayerMP entityplayermp = (EntityPlayerMP) this.h();\n \n if (!entityplayermp.a.b && entityplayermp.q == this.q) {\n- if (this.h().ae()) {\n+ if (this.h().af()) {\n this.h().a((Entity) null);\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderPearl.java","sha":"35a896a334755ff7f2ebbd4ee97cd20f6a743963","status":"modified"},{"additions":40,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderman.java","changes":80,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderman.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":40,"filename":"src/main/java/net/minecraft/server/EntityEnderman.java","new_code":" // private static boolean[] br = new boolean[256]; //CanaryMod: disabled\n protected void ay() {\n super.ay();\n nbttagcompound.a(\"carried\", (short) this.bV());\n nbttagcompound.a(\"carriedData\", (short) this.bW());\n protected Entity bL() {\n if (this.bV() == 0) {\n this.q.f(i0, i1, i2, this.bV(), this.bW(), 3);\n this.bT();\n if (this.F() || this.ae()) {\n this.bT();\n if (this.bX() && !this.bv && this.ab.nextInt(100) == 0) {\n if (!this.q.I && this.S()) {\n this.bT();\n public boolean bT() { // CanaryMod: protected -> public\n return this.bX() ? \"mob.endermen.scream\" : \"mob.endermen.idle\";\n protected String aN() {\n protected String aO() {\n public int bV() {\n public int bW() {\n if (this.aq()) {\n if (this.bT()) {\n public boolean bX() {\n /* CanaryMod: Disable all default allowed pick ups\n static {\n // br[Block.z.cF] = true;\n // br[Block.A.cF] = true;\n // br[Block.J.cF] = true;\n // br[Block.K.cF] = true;\n // br[Block.ai.cF] = true;\n // br[Block.aj.cF] = true;\n // br[Block.ak.cF] = true;\n // br[Block.al.cF] = true;\n // br[Block.ar.cF] = true;\n // br[Block.ba.cF] = true;\n // br[Block.bb.cF] = true;\n // br[Block.bf.cF] = true;\n // br[Block.bw.cF] = true;\n // br[Block.bD.cF] = true;\n } */","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityEnderman.java","implementation":"super.ay();\n nbttagcompound.a(\"carried\", (short) this.bV());\n nbttagcompound.a(\"carriedData\", (short) this.bW());\n protected Entity bL() {\n if (this.bV() == 0) {\n this.q.f(i0, i1, i2, this.bV(), this.bW(), 3);\n this.bT();\n if (this.F() || this.ae()) {\n this.bT();\n if (this.bX() && !this.bv && this.ab.nextInt(100) == 0) {\n if (!this.q.I && this.S()) {\n this.bT();\n public boolean bT() { // CanaryMod: protected -> public\n return this.bX() ? \"mob.endermen.scream\" : \"mob.endermen.idle\";\n protected String aN() {\n protected String aO() {\n public int bV() {\n public int bW() {\n if (this.aq()) {\n if (this.bT()) {\n public boolean bX() {\n /* CanaryMod: Disable all default allowed pick ups\n static {\n // br[Block.z.cF] = true;\n // br[Block.A.cF] = true;\n // br[Block.J.cF] = true;\n // br[Block.K.cF] = true;\n // br[Block.ai.cF] = true;\n // br[Block.aj.cF] = true;\n // br[Block.ak.cF] = true;\n // br[Block.al.cF] = true;\n // br[Block.ar.cF] = true;\n // br[Block.ba.cF] = true;\n // br[Block.bb.cF] = true;\n // br[Block.bf.cF] = true;\n // br[Block.bw.cF] = true;\n // br[Block.bD.cF] = true;","signature":"void ay()"}],"old_code":" private static boolean[] br = new boolean[256];\n protected void ax() {\n super.ax();\n nbttagcompound.a(\"carried\", (short) this.bR());\n nbttagcompound.a(\"carriedData\", (short) this.bS());\n protected Entity bH() {\n if (this.bR() == 0) {\n this.q.f(i0, i1, i2, this.bR(), this.bS(), 3);\n this.bP();\n if (this.F() || this.ad()) {\n this.bP();\n if (this.bT() && !this.bv && this.ab.nextInt(100) == 0) {\n if (!this.q.I && this.R()) {\n this.bP();\n public boolean bP() { // CanaryMod: protected -> public\n return this.bT() ? \"mob.endermen.scream\" : \"mob.endermen.idle\";\n protected String aK() {\n protected String aL() {\n public int bR() {\n public int bS() {\n if (this.ap()) {\n if (this.bP()) {\n public boolean bT() {\n static {\n // CanaryMod: Disable all default allowed pick ups\n // br[Block.z.cF] = true;\n // br[Block.A.cF] = true;\n // br[Block.J.cF] = true;\n // br[Block.K.cF] = true;\n // br[Block.ai.cF] = true;\n // br[Block.aj.cF] = true;\n // br[Block.ak.cF] = true;\n // br[Block.al.cF] = true;\n // br[Block.ar.cF] = true;\n // br[Block.ba.cF] = true;\n // br[Block.bb.cF] = true;\n // br[Block.bf.cF] = true;\n // br[Block.bw.cF] = true;\n // br[Block.bD.cF] = true;\n }","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityEnderman.java","implementation":"super.ax();\n nbttagcompound.a(\"carried\", (short) this.bR());\n nbttagcompound.a(\"carriedData\", (short) this.bS());\n protected Entity bH() {\n if (this.bR() == 0) {\n this.q.f(i0, i1, i2, this.bR(), this.bS(), 3);\n this.bP();\n if (this.F() || this.ad()) {\n this.bP();\n if (this.bT() && !this.bv && this.ab.nextInt(100) == 0) {\n if (!this.q.I && this.R()) {\n this.bP();\n public boolean bP() { // CanaryMod: protected -> public\n return this.bT() ? \"mob.endermen.scream\" : \"mob.endermen.idle\";\n protected String aK() {\n protected String aL() {\n public int bR() {\n public int bS() {\n if (this.ap()) {\n if (this.bP()) {\n public boolean bT() {\n static {\n // CanaryMod: Disable all default allowed pick ups\n // br[Block.z.cF] = true;\n // br[Block.A.cF] = true;\n // br[Block.J.cF] = true;\n // br[Block.K.cF] = true;\n // br[Block.ai.cF] = true;\n // br[Block.aj.cF] = true;\n // br[Block.ak.cF] = true;\n // br[Block.al.cF] = true;\n // br[Block.ar.cF] = true;\n // br[Block.ba.cF] = true;\n // br[Block.bb.cF] = true;\n // br[Block.bf.cF] = true;\n // br[Block.bw.cF] = true;\n // br[Block.bD.cF] = true;","signature":"void ax()"}],"patch":"@@ -12,7 +12,7 @@ public class EntityEnderman extends EntityMob {\n \n private static final UUID bp = UUID.fromString(\"020E0DFB-87AE-4653-9556-831010E291A0\");\n private static final AttributeModifier bq = (new AttributeModifier(bp, \"Attacking speed boost\", 6.199999809265137D, 0)).a(false);\n- private static boolean[] br = new boolean[256];\n+ // private static boolean[] br = new boolean[256]; //CanaryMod: disabled\n private int bs;\n private int bt;\n private Entity bu;\n@@ -25,8 +25,8 @@ public EntityEnderman(World world) {\n this.entity = new CanaryEnderman(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(40.0D);\n this.a(SharedMonsterAttributes.d).a(0.30000001192092896D);\n this.a(SharedMonsterAttributes.e).a(7.0D);\n@@ -41,8 +41,8 @@ protected void a() {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"carried\", (short) this.bR());\n- nbttagcompound.a(\"carriedData\", (short) this.bS());\n+ nbttagcompound.a(\"carried\", (short) this.bV());\n+ nbttagcompound.a(\"carriedData\", (short) this.bW());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n@@ -51,7 +51,7 @@ public void a(NBTTagCompound nbttagcompound) {\n this.c(nbttagcompound.d(\"carriedData\"));\n }\n \n- protected Entity bH() {\n+ protected Entity bL() {\n EntityPlayer entityplayer = this.q.b(this, 64.0D);\n \n if (entityplayer != null) {\n@@ -113,7 +113,7 @@ public void c() {\n int i2;\n int i3;\n \n- if (this.bR() == 0) {\n+ if (this.bV() == 0) {\n if (this.ab.nextInt(20) == 0) {\n i0 = MathHelper.c(this.u - 2.0D + this.ab.nextDouble() * 4.0D);\n i1 = MathHelper.c(this.v + this.ab.nextDouble() * 3.0D);\n@@ -144,7 +144,7 @@ public void c() {\n \n Canary.hooks().callHook(hook);\n if (!hook.isCanceled()) {\n- this.q.f(i0, i1, i2, this.bR(), this.bS(), 3);\n+ this.q.f(i0, i1, i2, this.bV(), this.bW(), 3);\n this.a(0);\n }\n //\n@@ -163,18 +163,18 @@ public void c() {\n this.j = null;\n this.a(false);\n this.bv = false;\n- this.bP();\n+ this.bT();\n }\n }\n \n- if (this.F() || this.ad()) {\n+ if (this.F() || this.ae()) {\n this.j = null;\n this.a(false);\n this.bv = false;\n- this.bP();\n+ this.bT();\n }\n \n- if (this.bT() && !this.bv && this.ab.nextInt(100) == 0) {\n+ if (this.bX() && !this.bv && this.ab.nextInt(100) == 0) {\n this.a(false);\n }\n \n@@ -183,11 +183,11 @@ public void c() {\n this.a(this.j, 100.0F, 100.0F);\n }\n \n- if (!this.q.I && this.R()) {\n+ if (!this.q.I && this.S()) {\n if (this.j != null) {\n if (this.j instanceof EntityPlayer && this.f((EntityPlayer) this.j)) {\n if (this.j.e((Entity) this) < 16.0D) {\n- this.bP();\n+ this.bT();\n }\n \n this.bs = 0;\n@@ -203,7 +203,7 @@ public void c() {\n super.c();\n }\n \n- public boolean bP() { // CanaryMod: protected -> public\n+ public boolean bT() { // CanaryMod: protected -> public\n double d0 = this.u + (this.ab.nextDouble() - 0.5D) * 64.0D;\n double d1 = this.v + (double) (this.ab.nextInt(64) - 32);\n double d2 = this.w + (this.ab.nextDouble() - 0.5D) * 64.0D;\n@@ -283,14 +283,14 @@ protected boolean j(double d0, double d1, double d2) {\n }\n \n protected String r() {\n- return this.bT() ? \"mob.endermen.scream\" : \"mob.endermen.idle\";\n+ return this.bX() ? \"mob.endermen.scream\" : \"mob.endermen.idle\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.endermen.hit\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.endermen.death\";\n }\n \n@@ -314,20 +314,20 @@ public void a(int i0) {\n this.ah.b(16, Byte.valueOf((byte) (i0 & 255)));\n }\n \n- public int bR() {\n+ public int bV() {\n return this.ah.a(16);\n }\n \n public void c(int i0) {\n this.ah.b(17, Byte.valueOf((byte) (i0 & 255)));\n }\n \n- public int bS() {\n+ public int bW() {\n return this.ah.a(17);\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n this.a(true);\n@@ -339,7 +339,7 @@ public boolean a(DamageSource damagesource, float f0) {\n this.bv = false;\n \n for (int i0 = 0; i0 < 64; ++i0) {\n- if (this.bP()) {\n+ if (this.bT()) {\n return true;\n }\n }\n@@ -351,29 +351,29 @@ public boolean a(DamageSource damagesource, float f0) {\n }\n }\n \n- public boolean bT() {\n+ public boolean bX() {\n return this.ah.a(18) > 0;\n }\n \n public void a(boolean flag0) {\n this.ah.b(18, Byte.valueOf((byte) (flag0 ? 1 : 0)));\n }\n \n- static {\n- // CanaryMod: Disable all default allowed pick ups\n- // br[Block.z.cF] = true;\n- // br[Block.A.cF] = true;\n- // br[Block.J.cF] = true;\n- // br[Block.K.cF] = true;\n- // br[Block.ai.cF] = true;\n- // br[Block.aj.cF] = true;\n- // br[Block.ak.cF] = true;\n- // br[Block.al.cF] = true;\n- // br[Block.ar.cF] = true;\n- // br[Block.ba.cF] = true;\n- // br[Block.bb.cF] = true;\n- // br[Block.bf.cF] = true;\n- // br[Block.bw.cF] = true;\n- // br[Block.bD.cF] = true;\n- }\n+ /* CanaryMod: Disable all default allowed pick ups\n+ static {\n+ // br[Block.z.cF] = true;\n+ // br[Block.A.cF] = true;\n+ // br[Block.J.cF] = true;\n+ // br[Block.K.cF] = true;\n+ // br[Block.ai.cF] = true;\n+ // br[Block.aj.cF] = true;\n+ // br[Block.ak.cF] = true;\n+ // br[Block.al.cF] = true;\n+ // br[Block.ar.cF] = true;\n+ // br[Block.ba.cF] = true;\n+ // br[Block.bb.cF] = true;\n+ // br[Block.bf.cF] = true;\n+ // br[Block.bw.cF] = true;\n+ // br[Block.bD.cF] = true;\n+ } */\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderman.java","sha":"f23e1b4e2a8c0278008a1d2afe8f65ad4be8cde3","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityExpBottle.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityExpBottle.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/EntityExpBottle.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.throwable.CanaryXPBottle;\n \n-\n public class EntityExpBottle extends EntityThrowable {\n \n public EntityExpBottle(World world) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityExpBottle.java","sha":"688219fa05d9e6cd39cafb310786abe2a20591ad","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireball.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireball.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/EntityFireball.java","new_code":" public float Y() {\n if (this.aq()) {\n Vec3 vec3 = damagesource.i().Z();","new_methods":[],"old_code":" public float X() {\n if (this.ap()) {\n Vec3 vec3 = damagesource.i().Y();","old_methods":[],"patch":"@@ -212,17 +212,17 @@ public boolean K() {\n return true;\n }\n \n- public float X() {\n+ public float Y() {\n return 1.0F;\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n this.J();\n if (damagesource.i() != null) {\n- Vec3 vec3 = damagesource.i().Y();\n+ Vec3 vec3 = damagesource.i().Z();\n \n if (vec3 != null) {\n this.x = vec3.c;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireball.java","sha":"3c08a0298fb65892713dcd09aeee6f3954223c2b","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireworkRocket.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireworkRocket.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/EntityFireworkRocket.java","new_code":" public boolean ap() {","new_methods":[],"old_code":" public boolean ao() {","old_methods":[],"patch":"@@ -126,7 +126,7 @@ public float d(float f0) {\n return super.d(f0);\n }\n \n- public boolean ao() {\n+ public boolean ap() {\n return false;\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireworkRocket.java","sha":"2a3a160997b896343f748d3876a992a02d1ad862","status":"modified"},{"additions":11,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGhast.java","changes":22,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGhast.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":11,"filename":"src/main/java/net/minecraft/server/EntityGhast.java","new_code":" if (this.aq()) {\n protected void ay() {\n super.ay();\n protected void bk() {\n this.bo();\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n public boolean bs() {\n return this.ab.nextInt(20) == 0 && super.bs() && this.q.r > 0;\n public int bv() {","new_methods":[],"old_code":" if (this.ap()) {\n protected void ax() {\n super.ax();\n protected void bh() {\n this.bk();\n protected String aK() {\n protected String aL() {\n protected float aW() {\n public boolean bo() {\n return this.ab.nextInt(20) == 0 && super.bo() && this.q.r > 0;\n public int br() {","old_methods":[],"patch":"@@ -24,7 +24,7 @@ public EntityGhast(World world) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (\"fireball\".equals(damagesource.n()) && damagesource.i() instanceof EntityPlayer) {\n super.a(damagesource, 1000.0F);\n@@ -40,17 +40,17 @@ protected void a() {\n this.ah.a(16, Byte.valueOf((byte) 0));\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(10.0D);\n }\n \n- protected void bh() {\n+ protected void bk() {\n if (!this.q.I && this.q.r == 0) {\n this.w();\n }\n \n- this.bk();\n+ this.bo();\n this.bo = this.bp;\n double d0 = this.i - this.u;\n double d1 = this.j - this.v;\n@@ -165,11 +165,11 @@ protected String r() {\n return \"mob.ghast.moan\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.ghast.scream\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.ghast.death\";\n }\n \n@@ -193,15 +193,15 @@ protected void b(boolean flag0, int i0) {\n }\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 10.0F;\n }\n \n- public boolean bo() {\n- return this.ab.nextInt(20) == 0 && super.bo() && this.q.r > 0;\n+ public boolean bs() {\n+ return this.ab.nextInt(20) == 0 && super.bs() && this.q.r > 0;\n }\n \n- public int br() {\n+ public int bv() {\n return 1;\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGhast.java","sha":"8e3002036d4dc6890decc1f85721722f91e99a12","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGiantZombie.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGiantZombie.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/EntityGiantZombie.java","new_code":" protected void ay() {\n super.ay();","new_methods":[],"old_code":" protected void ax() {\n super.ax();","old_methods":[],"patch":"@@ -11,8 +11,8 @@ public EntityGiantZombie(World world) {\n this.entity = new CanaryGiantZombie(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(100.0D);\n this.a(SharedMonsterAttributes.d).a(0.5D);\n this.a(SharedMonsterAttributes.e).a(50.0D);","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGiantZombie.java","sha":"b275cd88e27f1179a1a3134e516587ad1d1b68b1","status":"modified"},{"additions":5,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHanging.java","changes":8,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHanging.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/EntityHanging.java","new_code":" if (this.aq()) {\n protected boolean O() {\n return false;\n }\n","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityHanging.java","implementation":"return false;","signature":"boolean O()"}],"old_code":" this.e = 0;\n this.a = 0;\n if (this.ap()) {","old_methods":[],"patch":"@@ -15,8 +15,6 @@ public abstract class EntityHanging extends Entity {\n \n public EntityHanging(World world) {\n super(world);\n- this.e = 0;\n- this.a = 0;\n this.N = 0.0F;\n this.a(0.5F, 0.5F);\n }\n@@ -179,7 +177,7 @@ public boolean i(Entity entity) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n if (!this.M && !this.q.I) {\n@@ -278,6 +276,10 @@ public void a(NBTTagCompound nbttagcompound) {\n \n public abstract void b(Entity entity);\n \n+ protected boolean O() {\n+ return false;\n+ }\n+\n // CanaryMod\n public int getTickCounter() {\n return this.e;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHanging.java","sha":"0eea27efda191c4a0705307645326c9c58517b25","status":"modified"},{"additions":224,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHorse.java","changes":444,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHorse.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":220,"filename":"src/main/java/net/minecraft/server/EntityHorse.java","new_code":" this.l(false);\n this.cH();\n this.cJ();\n public int bT() {\n this.cJ();\n public int bU() {\n public String am() {\n if (this.bB()) {\n return this.bA();\n int i0 = this.bT();\n public boolean bV() {\n public boolean bW() {\n public boolean ca() {\n return this.bV();\n }\n\n public String cb() {\n return this.ah.e(21);\n public float cc() {\n this.a(this.cc());\n public boolean cd() {\n public void i(boolean flag0) {\n public void j(boolean flag0) {\n public boolean bG() {\n return !this.cy() && super.bG();\n protected void o(float f0) {\n if (f0 > 6.0F && this.cg()) {\n this.o(false);\n }\n }\n\n public boolean ce() {\n public int cf() {\n public boolean cg() {\n public boolean ch() {\n public boolean ci() {\n public boolean cj() {\n this.cJ();\n public void k(boolean flag0) {\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public int ck() {\n int i1 = MathHelper.a(this.ck() + i0, 0, this.cq());\n return this.n != null && this.n.equals(entity) ? false : super.a(damagesource, f0);\n public int aP() {\n return by[this.cf()];\n public boolean cl() {\n public void cm() {\n if (!this.q.I && this.ce()) {\n this.l(false);\n private void cF() {\n this.cM();\n private int cG() {\n int i0 = this.bT();\n return this.ce() && (i0 == 1 || i0 == 2) ? 17 : 2;\n private void cH() {\n this.bG = new AnimalChest(\"HorseChest\", this.cG());\n this.bG.a(this.am());\n this.cI();\n private void cI() {\n this.n(this.bG.a(0) != null);\n if (this.cv()) {\n int i0 = this.cf();\n boolean flag0 = this.co();\n this.cI();\n if (i0 == 0 && i0 != this.cf()) {\n if (!flag0 && this.co()) {\n public boolean bs() {\n this.cl();\n return super.bs();\n public double cn() {\n protected String aO() {\n this.cM();\n int i0 = this.bT();\n int i0 = this.bT();\n protected String aN() {\n this.cM();\n this.cO();\n int i0 = this.bT();\n public boolean co() {\n this.cM();\n if (this.ab.nextInt(10) == 0 && !this.bb()) {\n this.cO();\n int i0 = this.bT();\n protected String cp() {\n this.cM();\n this.cO();\n int i0 = this.bT();\n int i4 = this.bT();\n protected void ay() {\n super.ay();\n this.aW().b(bv);\n public int bv() {\n public int cq() {\n protected float aZ() {\n private void cJ() {\n if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bW()) {\n this.bG.a(this.am());\n } else if (!this.bW() && this.cy()) {\n } else if (this.bW() && this.bV() && entityplayer.ag()) {\n } else if (this.ca() && this.n != null) {\n if (this.cv()) {\n if (!this.bW()) {\n this.cD();\n if (!flag0 && !this.cy()) {\n if (this.bW() && this.b() == 0) {\n this.bX();\n if (this.bW() && this.b() == 0) {\n this.bX();\n if (this.aM() < this.aS() && f0 > 0.0F) {\n if (!this.bV() && short1 > 0) {\n if (b1 > 0 && (flag0 || !this.bW()) && b1 < this.cq()) {\n this.cF();\n if (!this.bW() && !flag0) {\n this.cD();\n if (!flag0 && this.cw() && !this.ce() && itemstack.d == Block.az.cF) {\n this.l(true);\n this.cH();\n if (!flag0 && this.ca() && !this.co() && itemstack.d == Item.aC.cv) {\n if (this.ca() && this.n == null) {\n this.o(false);\n public boolean cv() {\n return this.bT() == 0;\n public boolean cw() {\n int i0 = this.bT();\n protected boolean bb() {\n return this.n != null && this.co() ? true : this.cg() || this.ch();\n public boolean cy() {\n int i0 = this.bT();\n public boolean cz() {\n return this.cy() || this.bT() == 2;\n private void cL() {\n this.cE();\n this.cL();\n if (!this.cg() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\n this.o(true);\n if (this.cg() && ++this.bD > 50) {\n this.o(false);\n if (this.ci() && !this.bV() && !this.cg()) {\n this.cJ();\n this.p(false);\n if (this.cg()) {\n if (this.ch()) {\n private void cM() {\n private boolean cN() {\n return this.n == null && this.o == null && this.bW() && this.bV() && !this.cz() && this.aM() >= this.aS();\n public void o(boolean flag0) {\n public void p(boolean flag0) {\n this.o(false);\n private void cO() {\n this.p(true);\n public void cD() {\n this.cO();\n String s0 = this.cp();\n this.a(s0, this.aZ(), this.ba());\n public void cE() {\n this.cm();\n this.i(true);\n if (this.n != null && this.co()) {\n if (this.F && this.bt == 0.0F && this.ch() && !this.bI) {\n if (this.bt > 0.0F && !this.cd() && this.F) {\n this.y = this.cn() * (double) this.bt;\n this.j(true);\n this.aR = this.bf() * 0.1F;\n this.j(false);\n nbttagcompound.a(\"EatingHaystack\", this.cg());\n nbttagcompound.a(\"ChestedHorse\", this.ce());\n nbttagcompound.a(\"HasReproduced\", this.cj());\n nbttagcompound.a(\"Bred\", this.ci());\n nbttagcompound.a(\"Type\", this.bT());\n nbttagcompound.a(\"Variant\", this.bU());\n nbttagcompound.a(\"Temper\", this.ck());\n nbttagcompound.a(\"Tame\", this.bW());\n nbttagcompound.a(\"OwnerName\", this.cb());\n if (this.ce()) {\n this.o(nbttagcompound.n(\"EatingHaystack\"));\n this.k(nbttagcompound.n(\"Bred\"));\n this.l(nbttagcompound.n(\"ChestedHorse\"));\n this.m(nbttagcompound.n(\"HasReproduced\"));\n this.i(nbttagcompound.n(\"Tame\"));\n if (nbttagcompound.b(\"OwnerName\")) {\n this.b(nbttagcompound.i(\"OwnerName\"));\n }\n\n AttributeInstance attributeinstance = this.aW().a(\"Speed\");\n if (this.ce()) {\n this.cH();\n this.cI();\n if (this.cN() && entityhorse.cN()) {\n int i0 = this.bT();\n int i1 = entityhorse.bT();\n int i0 = this.bT();\n int i1 = entityhorse.bT();\n i4 = this.bU() & 255;\n i4 = entityhorse.bU() & 255;\n i4 |= this.bU() & '\\uff00';\n i4 |= entityhorse.bU() & '\\uff00';\n double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cP();\n double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cQ();\n double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cR();\n this.a(SharedMonsterAttributes.a).a((double) this.cP());\n this.a(SharedMonsterAttributes.d).a(this.cR());\n this.a(bv).a(this.cQ());\n this.g(this.aS());\n protected boolean be() {\n if (this.co()) {\n if (i0 < 0) {\n i0 = 0;\n } else {\n this.bI = true;\n this.cO();\n }\n if (i0 >= 90) {\n this.bt = 1.0F;\n } else {\n this.bt = 0.4F + 0.4F * (float) i0 / 90.0F;\n }\n public void V() {\n super.V();\n this.n.b(this.u + (double) (f2 * f0), this.v + this.X() + this.n.W() + (double) f3, this.w - (double) (f2 * f1));\n private float cP() {\n private double cQ() {\n private double cR() {","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityHorse.java","implementation":"this.cJ();\n public int bU() {\n public String am() {\n if (this.bB()) {\n return this.bA();\n int i0 = this.bT();\n public boolean bV() {\n public boolean bW() {\n public boolean ca() {\n return this.bV();","signature":"int bT()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityHorse.java","implementation":"return this.ah.e(21);\n public float cc() {\n this.a(this.cc());\n public boolean cd() {\n public void i(boolean flag0) {\n public void j(boolean flag0) {\n public boolean bG() {\n return !this.cy() && super.bG();\n protected void o(float f0) {\n if (f0 > 6.0F && this.cg()) {\n this.o(false);","signature":"String cb()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityHorse.java","implementation":"public int cf() {\n public boolean cg() {\n public boolean ch() {\n public boolean ci() {\n public boolean cj() {\n this.cJ();\n public void k(boolean flag0) {\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public int ck() {\n int i1 = MathHelper.a(this.ck() + i0, 0, this.cq());\n return this.n != null && this.n.equals(entity) ? false : super.a(damagesource, f0);\n public int aP() {\n return by[this.cf()];\n public boolean cl() {\n public void cm() {\n if (!this.q.I && this.ce()) {\n this.l(false);\n private void cF() {\n this.cM();\n private int cG() {\n int i0 = this.bT();\n return this.ce() && (i0 == 1 || i0 == 2) ? 17 : 2;\n private void cH() {\n this.bG = new AnimalChest(\"HorseChest\", this.cG());\n this.bG.a(this.am());\n this.cI();\n private void cI() {\n this.n(this.bG.a(0) != null);\n if (this.cv()) {\n int i0 = this.cf();\n boolean flag0 = this.co();\n this.cI();\n if (i0 == 0 && i0 != this.cf()) {\n if (!flag0 && this.co()) {\n public boolean bs() {\n this.cl();\n return super.bs();\n public double cn() {\n protected String aO() {\n this.cM();\n int i0 = this.bT();\n int i0 = this.bT();\n protected String aN() {\n this.cM();\n this.cO();\n int i0 = this.bT();\n public boolean co() {\n this.cM();\n if (this.ab.nextInt(10) == 0 && !this.bb()) {\n this.cO();\n int i0 = this.bT();\n protected String cp() {\n this.cM();\n this.cO();\n int i0 = this.bT();\n int i4 = this.bT();\n protected void ay() {\n super.ay();\n this.aW().b(bv);\n public int bv() {\n public int cq() {\n protected float aZ() {\n private void cJ() {\n if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bW()) {\n this.bG.a(this.am());","signature":"boolean ce()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityHorse.java","implementation":"return this.bT() == 0;\n public boolean cw() {\n int i0 = this.bT();\n protected boolean bb() {\n return this.n != null && this.co() ? true : this.cg() || this.ch();\n public boolean cy() {\n int i0 = this.bT();\n public boolean cz() {\n return this.cy() || this.bT() == 2;\n private void cL() {\n this.cE();\n this.cL();\n if (!this.cg() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\n this.o(true);\n if (this.cg() && ++this.bD > 50) {\n this.o(false);\n if (this.ci() && !this.bV() && !this.cg()) {\n this.cJ();\n this.p(false);\n if (this.cg()) {\n if (this.ch()) {\n private void cM() {\n private boolean cN() {\n return this.n == null && this.o == null && this.bW() && this.bV() && !this.cz() && this.aM() >= this.aS();\n public void o(boolean flag0) {\n public void p(boolean flag0) {\n this.o(false);\n private void cO() {\n this.p(true);\n public void cD() {\n this.cO();\n String s0 = this.cp();\n this.a(s0, this.aZ(), this.ba());\n public void cE() {\n this.cm();\n this.i(true);\n if (this.n != null && this.co()) {\n if (this.F && this.bt == 0.0F && this.ch() && !this.bI) {\n if (this.bt > 0.0F && !this.cd() && this.F) {\n this.y = this.cn() * (double) this.bt;\n this.j(true);\n this.aR = this.bf() * 0.1F;\n this.j(false);\n nbttagcompound.a(\"EatingHaystack\", this.cg());\n nbttagcompound.a(\"ChestedHorse\", this.ce());\n nbttagcompound.a(\"HasReproduced\", this.cj());\n nbttagcompound.a(\"Bred\", this.ci());\n nbttagcompound.a(\"Type\", this.bT());\n nbttagcompound.a(\"Variant\", this.bU());\n nbttagcompound.a(\"Temper\", this.ck());\n nbttagcompound.a(\"Tame\", this.bW());\n nbttagcompound.a(\"OwnerName\", this.cb());\n if (this.ce()) {\n this.o(nbttagcompound.n(\"EatingHaystack\"));\n this.k(nbttagcompound.n(\"Bred\"));\n this.l(nbttagcompound.n(\"ChestedHorse\"));\n this.m(nbttagcompound.n(\"HasReproduced\"));\n this.i(nbttagcompound.n(\"Tame\"));\n if (nbttagcompound.b(\"OwnerName\")) {\n this.b(nbttagcompound.i(\"OwnerName\"));","signature":"boolean cv()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityHorse.java","implementation":"if (this.co()) {\n if (i0 < 0) {\n i0 = 0;","signature":"boolean be()"}],"old_code":" this.m(false);\n this.cD();\n this.cF();\n public int bP() {\n this.cF();\n public int bQ() {\n public String al() {\n if (this.bx()) {\n return this.bw();\n int i0 = this.bP();\n public boolean bR() {\n public boolean bS() {\n public boolean bW() {\n return this.bR();\n public float bY() {\n this.a(this.bY());\n public boolean bZ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bC() {\n return !this.cu() && super.bC();\n public boolean ca() {\n public int cb() {\n public boolean cc() {\n public boolean cd() {\n public boolean ce() {\n public boolean cf() {\n this.cF();\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public void o(boolean flag0) {\n public int cg() {\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n if (this.n != null && this.n.equals(entity)) {\n return false;\n } else if (entity instanceof EntityWolf) {\n ((EntityWolf) entity).b((Entity) null);\n return false;\n } else {\n return super.a(damagesource, f0);\n }\n public int aM() {\n return by[this.cb()];\n public boolean ch() {\n public void ci() {\n if (!this.q.I && this.ca()) {\n this.m(false);\n private void cB() {\n this.cI();\n private int cC() {\n int i0 = this.bP();\n return this.ca() && (i0 == 1 || i0 == 2) ? 17 : 2;\n private void cD() {\n this.bG = new AnimalChest(\"HorseChest\", this.cC());\n this.bG.a(this.al());\n this.cE();\n private void cE() {\n this.o(this.bG.a(0) != null);\n if (this.cr()) {\n int i0 = this.cb();\n boolean flag0 = this.ck();\n this.cE();\n if (i0 == 0 && i0 != this.cb()) {\n if (!flag0 && this.ck()) {\n public boolean bo() {\n this.ch();\n return super.bo();\n public double cj() {\n protected String aL() {\n this.cI();\n int i0 = this.bP();\n int i0 = this.bP();\n protected String aK() {\n this.cI();\n this.cK();\n int i0 = this.bP();\n public boolean ck() {\n this.cI();\n if (this.ab.nextInt(10) == 0 && !this.aY()) {\n this.cK();\n int i0 = this.bP();\n protected String cl() {\n this.cI();\n this.cK();\n int i0 = this.bP();\n int i4 = this.bP();\n protected void ax() {\n super.ax();\n this.aT().b(bv);\n public int br() {\n public int cm() {\n protected float aW() {\n private void cF() {\n if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bS()) {\n this.bG.a(this.al());\n } else if (!this.bS() && this.cu()) {\n } else if (this.bS() && this.bR() && entityplayer.af()) {\n } else if (this.bW() && this.n != null) {\n if (this.cr()) {\n if (!this.bS()) {\n this.cz();\n if (!flag0 && !this.cu()) {\n if (this.bS() && this.b() == 0) {\n this.bT();\n if (this.bS() && this.b() == 0) {\n this.bT();\n if (this.aJ() < this.aP() && f0 > 0.0F) {\n if (!this.bR() && short1 > 0) {\n if (b1 > 0 && (flag0 || !this.bS()) && b1 < this.cm()) {\n this.cB();\n if (!this.bS() && !flag0) {\n this.cz();\n if (!flag0 && this.cs() && !this.ca() && itemstack.d == Block.az.cF) {\n this.m(true);\n this.cD();\n if (!flag0 && this.bW() && !this.ck() && itemstack.d == Item.aC.cv) {\n if (this.bW() && this.n == null) {\n this.q(false);\n public boolean cr() {\n return this.bP() == 0;\n public boolean cs() {\n int i0 = this.bP();\n protected boolean aY() {\n return this.n != null && this.ck() ? true : this.cc() || this.cd();\n public boolean cu() {\n int i0 = this.bP();\n public boolean cv() {\n return this.cu() || this.bP() == 2;\n private void cH() {\n this.cA();\n this.cH();\n if (!this.cc() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\n this.p(true);\n if (this.cc() && ++this.bD > 50) {\n this.p(false);\n if (this.ce() && !this.bR() && !this.cc()) {\n this.cF();\n this.q(false);\n if (this.cc()) {\n if (this.cd()) {\n private void cI() {\n private boolean cJ() {\n return this.n == null && this.o == null && this.bS() && this.bR() && !this.cv() && this.aJ() >= this.aP();\n }\n\n public void w() {\n if (this.q.I || !this.bS() && !this.ce() || this.aJ() <= 0.0F) {\n super.w();\n }\n public void p(boolean flag0) {\n public void q(boolean flag0) {\n this.p(false);\n private void cK() {\n this.q(true);\n public void cz() {\n this.cK();\n String s0 = this.cl();\n this.a(s0, this.aW(), this.aX());\n public void cA() {\n this.ci();\n this.j(true);\n if (this.n != null && this.ck()) {\n if (this.F && this.bt == 0.0F && this.cd() && !this.bI) {\n if (this.bt > 0.0F && !this.bZ() && this.F) {\n this.y = this.cj() * (double) this.bt;\n this.k(true);\n this.aR = this.bc() * 0.1F;\n this.k(false);\n nbttagcompound.a(\"EatingHaystack\", this.cc());\n nbttagcompound.a(\"ChestedHorse\", this.ca());\n nbttagcompound.a(\"HasReproduced\", this.cf());\n nbttagcompound.a(\"Bred\", this.ce());\n nbttagcompound.a(\"Type\", this.bP());\n nbttagcompound.a(\"Variant\", this.bQ());\n nbttagcompound.a(\"Temper\", this.cg());\n nbttagcompound.a(\"Tame\", this.bS());\n if (this.ca()) {\n this.p(nbttagcompound.n(\"EatingHaystack\"));\n this.l(nbttagcompound.n(\"Bred\"));\n this.m(nbttagcompound.n(\"ChestedHorse\"));\n this.n(nbttagcompound.n(\"HasReproduced\"));\n this.j(nbttagcompound.n(\"Tame\"));\n AttributeInstance attributeinstance = this.aT().a(\"Speed\");\n if (this.ca()) {\n this.cD();\n this.cE();\n if (this.cJ() && entityhorse.cJ()) {\n int i0 = this.bP();\n int i1 = entityhorse.bP();\n int i0 = this.bP();\n int i1 = entityhorse.bP();\n i4 = this.bQ() & 255;\n i4 = entityhorse.bQ() & 255;\n i4 |= this.bQ() & '\\uff00';\n i4 |= entityhorse.bQ() & '\\uff00';\n double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cL();\n double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cM();\n double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cN();\n this.a(SharedMonsterAttributes.a).a((double) this.cL());\n this.a(SharedMonsterAttributes.d).a(this.cN());\n this.a(bv).a(this.cM());\n this.g(this.aP());\n protected boolean bb() {\n if (i0 < 0) {\n i0 = 0;\n } else {\n this.bI = true;\n this.cK();\n }\n if (i0 >= 90) {\n this.bt = 1.0F;\n } else {\n this.bt = 0.4F + 0.4F * (float) i0 / 90.0F;\n public void U() {\n super.U();\n this.n.b(this.u + (double) (f2 * f0), this.v + this.W() + this.n.V() + (double) f3, this.w - (double) (f2 * f1));\n private float cL() {\n private double cM() {\n private double cN() {","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityHorse.java","implementation":"this.cF();\n public int bQ() {\n public String al() {\n if (this.bx()) {\n return this.bw();\n int i0 = this.bP();\n public boolean bR() {\n public boolean bS() {\n public boolean bW() {\n return this.bR();\n public float bY() {\n this.a(this.bY());\n public boolean bZ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bC() {\n return !this.cu() && super.bC();\n public boolean ca() {\n public int cb() {\n public boolean cc() {\n public boolean cd() {\n public boolean ce() {\n public boolean cf() {\n this.cF();\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public void o(boolean flag0) {\n public int cg() {\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n if (this.n != null && this.n.equals(entity)) {\n return false;","signature":"int bP()"},{"arguments":["entity instanceof EntityWolf"],"filename":"src/main/java/net/minecraft/server/EntityHorse.java","implementation":"((EntityWolf) entity).b((Entity) null);\n return false;","signature":"else if (entity instanceof EntityWolf)"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityHorse.java","implementation":"return by[this.cb()];\n public boolean ch() {\n public void ci() {\n if (!this.q.I && this.ca()) {\n this.m(false);\n private void cB() {\n this.cI();\n private int cC() {\n int i0 = this.bP();\n return this.ca() && (i0 == 1 || i0 == 2) ? 17 : 2;\n private void cD() {\n this.bG = new AnimalChest(\"HorseChest\", this.cC());\n this.bG.a(this.al());\n this.cE();\n private void cE() {\n this.o(this.bG.a(0) != null);\n if (this.cr()) {\n int i0 = this.cb();\n boolean flag0 = this.ck();\n this.cE();\n if (i0 == 0 && i0 != this.cb()) {\n if (!flag0 && this.ck()) {\n public boolean bo() {\n this.ch();\n return super.bo();\n public double cj() {\n protected String aL() {\n this.cI();\n int i0 = this.bP();\n int i0 = this.bP();\n protected String aK() {\n this.cI();\n this.cK();\n int i0 = this.bP();\n public boolean ck() {\n this.cI();\n if (this.ab.nextInt(10) == 0 && !this.aY()) {\n this.cK();\n int i0 = this.bP();\n protected String cl() {\n this.cI();\n this.cK();\n int i0 = this.bP();\n int i4 = this.bP();\n protected void ax() {\n super.ax();\n this.aT().b(bv);\n public int br() {\n public int cm() {\n protected float aW() {\n private void cF() {\n if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bS()) {\n this.bG.a(this.al());","signature":"int aM()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityHorse.java","implementation":"return this.bP() == 0;\n public boolean cs() {\n int i0 = this.bP();\n protected boolean aY() {\n return this.n != null && this.ck() ? true : this.cc() || this.cd();\n public boolean cu() {\n int i0 = this.bP();\n public boolean cv() {\n return this.cu() || this.bP() == 2;\n private void cH() {\n this.cA();\n this.cH();\n if (!this.cc() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\n this.p(true);\n if (this.cc() && ++this.bD > 50) {\n this.p(false);\n if (this.ce() && !this.bR() && !this.cc()) {\n this.cF();\n this.q(false);\n if (this.cc()) {\n if (this.cd()) {\n private void cI() {\n private boolean cJ() {\n return this.n == null && this.o == null && this.bS() && this.bR() && !this.cv() && this.aJ() >= this.aP();","signature":"boolean cr()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityHorse.java","implementation":"if (this.q.I || !this.bS() && !this.ce() || this.aJ() <= 0.0F) {\n super.w();","signature":"void w()"},{"arguments":["boolean flag0"],"filename":"src/main/java/net/minecraft/server/EntityHorse.java","implementation":"public void q(boolean flag0) {\n this.p(false);\n private void cK() {\n this.q(true);\n public void cz() {\n this.cK();\n String s0 = this.cl();\n this.a(s0, this.aW(), this.aX());\n public void cA() {\n this.ci();\n this.j(true);\n if (this.n != null && this.ck()) {\n if (this.F && this.bt == 0.0F && this.cd() && !this.bI) {\n if (this.bt > 0.0F && !this.bZ() && this.F) {\n this.y = this.cj() * (double) this.bt;\n this.k(true);\n this.aR = this.bc() * 0.1F;\n this.k(false);\n nbttagcompound.a(\"EatingHaystack\", this.cc());\n nbttagcompound.a(\"ChestedHorse\", this.ca());\n nbttagcompound.a(\"HasReproduced\", this.cf());\n nbttagcompound.a(\"Bred\", this.ce());\n nbttagcompound.a(\"Type\", this.bP());\n nbttagcompound.a(\"Variant\", this.bQ());\n nbttagcompound.a(\"Temper\", this.cg());\n nbttagcompound.a(\"Tame\", this.bS());\n if (this.ca()) {\n this.p(nbttagcompound.n(\"EatingHaystack\"));\n this.l(nbttagcompound.n(\"Bred\"));\n this.m(nbttagcompound.n(\"ChestedHorse\"));\n this.n(nbttagcompound.n(\"HasReproduced\"));\n this.j(nbttagcompound.n(\"Tame\"));\n AttributeInstance attributeinstance = this.aT().a(\"Speed\");\n if (this.ca()) {\n this.cD();\n this.cE();\n if (this.cJ() && entityhorse.cJ()) {\n int i0 = this.bP();\n int i1 = entityhorse.bP();\n int i0 = this.bP();\n int i1 = entityhorse.bP();\n i4 = this.bQ() & 255;\n i4 = entityhorse.bQ() & 255;\n i4 |= this.bQ() & '\\uff00';\n i4 |= entityhorse.bQ() & '\\uff00';\n double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cL();\n double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cM();\n double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cN();\n this.a(SharedMonsterAttributes.a).a((double) this.cL());\n this.a(SharedMonsterAttributes.d).a(this.cN());\n this.a(bv).a(this.cM());\n this.g(this.aP());\n protected boolean bb() {\n if (i0 < 0) {\n i0 = 0;","signature":"void p(boolean flag0)"}],"patch":"@@ -40,7 +40,7 @@ public EntityHorse(World world) {\n super(world);\n this.a(1.4F, 1.6F);\n this.ag = false;\n- this.m(false);\n+ this.l(false);\n this.k().a(true);\n this.c.a(0, new EntityAISwimming(this));\n this.c.a(1, new EntityAIPanic(this, 1.2D));\n@@ -50,7 +50,7 @@ public EntityHorse(World world) {\n this.c.a(6, new EntityAIWander(this, 0.7D));\n this.c.a(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));\n this.c.a(8, new EntityAILookIdle(this));\n- this.cD();\n+ this.cH();\n this.entity = new CanaryHorse(this); // CanaryMod: wrap entity\n }\n \n@@ -65,27 +65,27 @@ protected void a() {\n \n public void p(int i0) {\n this.ah.b(19, Byte.valueOf((byte) i0));\n- this.cF();\n+ this.cJ();\n }\n \n- public int bP() {\n+ public int bT() {\n return this.ah.a(19);\n }\n \n public void q(int i0) {\n this.ah.b(20, Integer.valueOf(i0));\n- this.cF();\n+ this.cJ();\n }\n \n- public int bQ() {\n+ public int bU() {\n return this.ah.c(20);\n }\n \n- public String al() {\n- if (this.bx()) {\n- return this.bw();\n+ public String am() {\n+ if (this.bB()) {\n+ return this.bA();\n } else {\n- int i0 = this.bP();\n+ int i0 = this.bT();\n \n switch (i0) {\n case 0:\n@@ -121,102 +121,112 @@ private void b(int i0, boolean flag0) {\n }\n }\n \n- public boolean bR() {\n+ public boolean bV() {\n return !this.g_();\n }\n \n- public boolean bS() {\n+ public boolean bW() {\n return this.w(2);\n }\n \n- public boolean bW() {\n- return this.bR();\n+ public boolean ca() {\n+ return this.bV();\n+ }\n+\n+ public String cb() {\n+ return this.ah.e(21);\n }\n \n public void b(String s0) {\n this.ah.b(21, s0);\n }\n \n- public float bY() {\n+ public float cc() {\n int i0 = this.b();\n \n return i0 >= 0 ? 1.0F : 0.5F + (float) (-24000 - i0) / -24000.0F * 0.5F;\n }\n \n public void a(boolean flag0) {\n if (flag0) {\n- this.a(this.bY());\n+ this.a(this.cc());\n } else {\n this.a(1.0F);\n }\n }\n \n- public boolean bZ() {\n+ public boolean cd() {\n return this.br;\n }\n \n- public void j(boolean flag0) {\n+ public void i(boolean flag0) {\n this.b(2, flag0);\n }\n \n- public void k(boolean flag0) {\n+ public void j(boolean flag0) {\n this.br = flag0;\n }\n \n- public boolean bC() {\n- return !this.cu() && super.bC();\n+ public boolean bG() {\n+ return !this.cy() && super.bG();\n }\n \n- public boolean ca() {\n+ protected void o(float f0) {\n+ if (f0 > 6.0F && this.cg()) {\n+ this.o(false);\n+ }\n+ }\n+\n+ public boolean ce() {\n return this.w(8);\n }\n \n- public int cb() {\n+ public int cf() {\n return this.ah.c(22);\n }\n \n public int d(ItemStack itemstack) {\n return itemstack == null ? 0 : (itemstack.d == Item.ce.cv ? 1 : (itemstack.d == Item.cf.cv ? 2 : (itemstack.d == Item.cg.cv ? 3 : 0)));\n }\n \n- public boolean cc() {\n+ public boolean cg() {\n return this.w(32);\n }\n \n- public boolean cd() {\n+ public boolean ch() {\n return this.w(64);\n }\n \n- public boolean ce() {\n+ public boolean ci() {\n return this.w(16);\n }\n \n- public boolean cf() {\n+ public boolean cj() {\n return this.bH;\n }\n \n public void r(int i0) {\n this.ah.b(22, Integer.valueOf(i0));\n- this.cF();\n+ this.cJ();\n }\n \n- public void l(boolean flag0) {\n+ public void k(boolean flag0) {\n this.b(16, flag0);\n }\n \n- public void m(boolean flag0) {\n+ public void l(boolean flag0) {\n this.b(8, flag0);\n }\n \n- public void n(boolean flag0) {\n+ public void m(boolean flag0) {\n this.bH = flag0;\n }\n \n- public void o(boolean flag0) {\n+ public void n(boolean flag0) {\n this.b(4, flag0);\n }\n \n- public int cg() {\n+ public int ck() {\n return this.bs;\n }\n \n@@ -225,7 +235,7 @@ public void s(int i0) {\n }\n \n public int t(int i0) {\n- int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n+ int i1 = MathHelper.a(this.ck() + i0, 0, this.cq());\n \n this.s(i1);\n return i1;\n@@ -234,41 +244,34 @@ public int t(int i0) {\n public boolean a(DamageSource damagesource, float f0) {\n Entity entity = damagesource.i();\n \n- if (this.n != null && this.n.equals(entity)) {\n- return false;\n- } else if (entity instanceof EntityWolf) {\n- ((EntityWolf) entity).b((Entity) null);\n- return false;\n- } else {\n- return super.a(damagesource, f0);\n- }\n+ return this.n != null && this.n.equals(entity) ? false : super.a(damagesource, f0);\n }\n \n- public int aM() {\n- return by[this.cb()];\n+ public int aP() {\n+ return by[this.cf()];\n }\n \n public boolean L() {\n return this.n == null;\n }\n \n- public boolean ch() {\n+ public boolean cl() {\n int i0 = MathHelper.c(this.u);\n int i1 = MathHelper.c(this.w);\n \n this.q.a(i0, i1);\n return true;\n }\n \n- public void ci() {\n- if (!this.q.I && this.ca()) {\n+ public void cm() {\n+ if (!this.q.I && this.ce()) {\n this.b(Block.az.cF, 1);\n- this.m(false);\n+ this.l(false);\n }\n }\n \n- private void cB() {\n- this.cI();\n+ private void cF() {\n+ this.cM();\n this.q.a((Entity) this, \"eating\", 1.0F, 1.0F + (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F);\n }\n \n@@ -295,17 +298,17 @@ protected void b(float f0) {\n }\n }\n \n- private int cC() {\n- int i0 = this.bP();\n+ private int cG() {\n+ int i0 = this.bT();\n \n- return this.ca() && (i0 == 1 || i0 == 2) ? 17 : 2;\n+ return this.ce() && (i0 == 1 || i0 == 2) ? 17 : 2;\n }\n \n- private void cD() {\n+ private void cH() {\n AnimalChest animalchest = this.bG;\n \n- this.bG = new AnimalChest(\"HorseChest\", this.cC());\n- this.bG.a(this.al());\n+ this.bG = new AnimalChest(\"HorseChest\", this.cG());\n+ this.bG.a(this.am());\n if (animalchest != null) {\n animalchest.b(this);\n int i0 = Math.min(animalchest.j_(), this.bG.j_());\n@@ -322,37 +325,37 @@ private void cD() {\n }\n \n this.bG.a(this);\n- this.cE();\n+ this.cI();\n }\n \n- private void cE() {\n+ private void cI() {\n if (!this.q.I) {\n- this.o(this.bG.a(0) != null);\n- if (this.cr()) {\n+ this.n(this.bG.a(0) != null);\n+ if (this.cv()) {\n this.r(this.d(this.bG.a(1)));\n }\n }\n }\n \n public void a(InventoryBasic inventorybasic) {\n- int i0 = this.cb();\n- boolean flag0 = this.ck();\n+ int i0 = this.cf();\n+ boolean flag0 = this.co();\n \n- this.cE();\n+ this.cI();\n if (this.ac > 20) {\n- if (i0 == 0 && i0 != this.cb()) {\n+ if (i0 == 0 && i0 != this.cf()) {\n this.a(\"mob.horse.armor\", 0.5F, 1.0F);\n }\n \n- if (!flag0 && this.ck()) {\n+ if (!flag0 && this.co()) {\n this.a(\"mob.horse.leather\", 0.5F, 1.0F);\n }\n }\n }\n \n- public boolean bo() {\n- this.ch();\n- return super.bo();\n+ public boolean bs() {\n+ this.cl();\n+ return super.bs();\n }\n \n protected EntityHorse a(Entity entity, double d0) {\n@@ -374,54 +377,54 @@ protected EntityHorse a(Entity entity, double d0) {\n return (EntityHorse) entity1;\n }\n \n- public double cj() {\n+ public double cn() {\n return this.a(bv).e();\n }\n \n- protected String aL() {\n- this.cI();\n- int i0 = this.bP();\n+ protected String aO() {\n+ this.cM();\n+ int i0 = this.bT();\n \n return i0 == 3 ? \"mob.horse.zombie.death\" : (i0 == 4 ? \"mob.horse.skeleton.death\" : (i0 != 1 && i0 != 2 ? \"mob.horse.death\" : \"mob.horse.donkey.death\"));\n }\n \n protected int s() {\n boolean flag0 = this.ab.nextInt(4) == 0;\n- int i0 = this.bP();\n+ int i0 = this.bT();\n \n return i0 == 4 ? Item.aZ.cv : (i0 == 3 ? (flag0 ? 0 : Item.bo.cv) : Item.aH.cv);\n }\n \n- protected String aK() {\n- this.cI();\n+ protected String aN() {\n+ this.cM();\n if (this.ab.nextInt(3) == 0) {\n- this.cK();\n+ this.cO();\n }\n \n- int i0 = this.bP();\n+ int i0 = this.bT();\n \n return i0 == 3 ? \"mob.horse.zombie.hit\" : (i0 == 4 ? \"mob.horse.skeleton.hit\" : (i0 != 1 && i0 != 2 ? \"mob.horse.hit\" : \"mob.horse.donkey.hit\"));\n }\n \n- public boolean ck() {\n+ public boolean co() {\n return this.w(4);\n }\n \n protected String r() {\n- this.cI();\n- if (this.ab.nextInt(10) == 0 && !this.aY()) {\n- this.cK();\n+ this.cM();\n+ if (this.ab.nextInt(10) == 0 && !this.bb()) {\n+ this.cO();\n }\n \n- int i0 = this.bP();\n+ int i0 = this.bT();\n \n return i0 == 3 ? \"mob.horse.zombie.idle\" : (i0 == 4 ? \"mob.horse.skeleton.idle\" : (i0 != 1 && i0 != 2 ? \"mob.horse.idle\" : \"mob.horse.donkey.idle\"));\n }\n \n- protected String cl() {\n- this.cI();\n- this.cK();\n- int i0 = this.bP();\n+ protected String cp() {\n+ this.cM();\n+ this.cO();\n+ int i0 = this.bT();\n \n return i0 != 3 && i0 != 4 ? (i0 != 1 && i0 != 2 ? \"mob.horse.angry\" : \"mob.horse.donkey.angry\") : null;\n }\n@@ -434,7 +437,7 @@ protected void a(int i0, int i1, int i2, int i3) {\n }\n \n if (!Block.s[i3].cU.d()) {\n- int i4 = this.bP();\n+ int i4 = this.bT();\n \n if (this.n != null && i4 != 1 && i4 != 2) {\n ++this.bP;\n@@ -454,36 +457,36 @@ protected void a(int i0, int i1, int i2, int i3) {\n }\n }\n \n- protected void ax() {\n- super.ax();\n- this.aT().b(bv);\n+ protected void ay() {\n+ super.ay();\n+ this.aW().b(bv);\n this.a(SharedMonsterAttributes.a).a(53.0D);\n this.a(SharedMonsterAttributes.d).a(0.22499999403953552D);\n }\n \n- public int br() {\n+ public int bv() {\n return 6;\n }\n \n- public int cm() {\n+ public int cq() {\n return 100;\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 0.8F;\n }\n \n public int o() {\n return 400;\n }\n \n- private void cF() {\n+ private void cJ() {\n this.bQ = null;\n }\n \n public void f(EntityPlayer entityplayer) {\n- if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bS()) {\n- this.bG.a(this.al());\n+ if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bW()) {\n+ this.bG.a(this.am());\n entityplayer.a(this, (IInventory) this.bG);\n }\n }\n@@ -493,18 +496,18 @@ public boolean a(EntityPlayer entityplayer) {\n \n if (itemstack != null && itemstack.d == Item.bE.cv) {\n return super.a(entityplayer);\n- } else if (!this.bS() && this.cu()) {\n+ } else if (!this.bW() && this.cy()) {\n return false;\n- } else if (this.bS() && this.bR() && entityplayer.af()) {\n+ } else if (this.bW() && this.bV() && entityplayer.ag()) {\n this.f(entityplayer);\n return true;\n- } else if (this.bW() && this.n != null) {\n+ } else if (this.ca() && this.n != null) {\n return super.a(entityplayer);\n } else {\n if (itemstack != null) {\n boolean flag0 = false;\n \n- if (this.cr()) {\n+ if (this.cv()) {\n byte b0 = -1;\n \n if (itemstack.d == Item.ce.cv) {\n@@ -516,8 +519,8 @@ public boolean a(EntityPlayer entityplayer) {\n }\n \n if (b0 >= 0) {\n- if (!this.bS()) {\n- this.cz();\n+ if (!this.bW()) {\n+ this.cD();\n return true;\n }\n \n@@ -526,7 +529,7 @@ public boolean a(EntityPlayer entityplayer) {\n }\n }\n \n- if (!flag0 && !this.cu()) {\n+ if (!flag0 && !this.cy()) {\n float f0 = 0.0F;\n short short1 = 0;\n byte b1 = 0;\n@@ -554,57 +557,57 @@ public boolean a(EntityPlayer entityplayer) {\n f0 = 4.0F;\n short1 = 60;\n b1 = 5;\n- if (this.bS() && this.b() == 0) {\n+ if (this.bW() && this.b() == 0) {\n flag0 = true;\n- this.bT();\n+ this.bX();\n }\n } else if (itemstack.d == Item.av.cv) {\n f0 = 10.0F;\n short1 = 240;\n b1 = 10;\n- if (this.bS() && this.b() == 0) {\n+ if (this.bW() && this.b() == 0) {\n flag0 = true;\n- this.bT();\n+ this.bX();\n }\n }\n \n- if (this.aJ() < this.aP() && f0 > 0.0F) {\n+ if (this.aM() < this.aS() && f0 > 0.0F) {\n this.f(f0);\n flag0 = true;\n }\n \n- if (!this.bR() && short1 > 0) {\n+ if (!this.bV() && short1 > 0) {\n this.a(short1);\n flag0 = true;\n }\n \n- if (b1 > 0 && (flag0 || !this.bS()) && b1 < this.cm()) {\n+ if (b1 > 0 && (flag0 || !this.bW()) && b1 < this.cq()) {\n flag0 = true;\n this.t(b1);\n }\n \n if (flag0) {\n- this.cB();\n+ this.cF();\n }\n }\n \n- if (!this.bS() && !flag0) {\n+ if (!this.bW() && !flag0) {\n if (itemstack != null && itemstack.a(entityplayer, (EntityLivingBase) this)) {\n return true;\n }\n \n- this.cz();\n+ this.cD();\n return true;\n }\n \n- if (!flag0 && this.cs() && !this.ca() && itemstack.d == Block.az.cF) {\n- this.m(true);\n+ if (!flag0 && this.cw() && !this.ce() && itemstack.d == Block.az.cF) {\n+ this.l(true);\n this.a(\"mob.chickenplop\", 1.0F, (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n flag0 = true;\n- this.cD();\n+ this.cH();\n }\n \n- if (!flag0 && this.bW() && !this.ck() && itemstack.d == Item.aC.cv) {\n+ if (!flag0 && this.ca() && !this.co() && itemstack.d == Item.aC.cv) {\n this.f(entityplayer);\n return true;\n }\n@@ -618,7 +621,7 @@ public boolean a(EntityPlayer entityplayer) {\n }\n }\n \n- if (this.bW() && this.n == null) {\n+ if (this.ca() && this.n == null) {\n if (itemstack != null && itemstack.a(entityplayer, (EntityLivingBase) this)) {\n return true;\n } else {\n@@ -634,55 +637,55 @@ public boolean a(EntityPlayer entityplayer) {\n private void h(EntityPlayer entityplayer) {\n entityplayer.A = this.A;\n entityplayer.B = this.B;\n+ this.o(false);\n this.p(false);\n- this.q(false);\n if (!this.q.I) {\n entityplayer.a((Entity) this);\n }\n }\n \n- public boolean cr() {\n- return this.bP() == 0;\n+ public boolean cv() {\n+ return this.bT() == 0;\n }\n \n- public boolean cs() {\n- int i0 = this.bP();\n+ public boolean cw() {\n+ int i0 = this.bT();\n \n return i0 == 2 || i0 == 1;\n }\n \n- protected boolean aY() {\n- return this.n != null && this.ck() ? true : this.cc() || this.cd();\n+ protected boolean bb() {\n+ return this.n != null && this.co() ? true : this.cg() || this.ch();\n }\n \n- public boolean cu() {\n- int i0 = this.bP();\n+ public boolean cy() {\n+ int i0 = this.bT();\n \n return i0 == 3 || i0 == 4;\n }\n \n- public boolean cv() {\n- return this.cu() || this.bP() == 2;\n+ public boolean cz() {\n+ return this.cy() || this.bT() == 2;\n }\n \n public boolean c(ItemStack itemstack) {\n return false;\n }\n \n- private void cH() {\n+ private void cL() {\n this.bp = 1;\n }\n \n public void a(DamageSource damagesource) {\n super.a(damagesource);\n if (!this.q.I) {\n- this.cA();\n+ this.cE();\n }\n }\n \n public void c() {\n if (this.ab.nextInt(200) == 0) {\n- this.cH();\n+ this.cL();\n }\n \n super.c();\n@@ -691,16 +694,16 @@ public void c() {\n this.f(1.0F);\n }\n \n- if (!this.cc() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\n- this.p(true);\n+ if (!this.cg() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\n+ this.o(true);\n }\n \n- if (this.cc() && ++this.bD > 50) {\n+ if (this.cg() && ++this.bD > 50) {\n this.bD = 0;\n- this.p(false);\n+ this.o(false);\n }\n \n- if (this.ce() && !this.bR() && !this.cc()) {\n+ if (this.ci() && !this.bV() && !this.cg()) {\n EntityHorse entityhorse = this.a(this, 16.0D);\n \n if (entityhorse != null && this.e(entityhorse) > 4.0D) {\n@@ -716,7 +719,7 @@ public void l_() {\n super.l_();\n if (this.q.I && this.ah.a()) {\n this.ah.e();\n- this.cF();\n+ this.cJ();\n }\n \n if (this.bE > 0 && ++this.bE > 30) {\n@@ -726,7 +729,7 @@ public void l_() {\n \n if (!this.q.I && this.bF > 0 && ++this.bF > 20) {\n this.bF = 0;\n- this.q(false);\n+ this.p(false);\n }\n \n if (this.bp > 0 && ++this.bp > 8) {\n@@ -741,7 +744,7 @@ public void l_() {\n }\n \n this.bK = this.bJ;\n- if (this.cc()) {\n+ if (this.cg()) {\n this.bJ += (1.0F - this.bJ) * 0.4F + 0.05F;\n if (this.bJ > 1.0F) {\n this.bJ = 1.0F;\n@@ -754,7 +757,7 @@ public void l_() {\n }\n \n this.bM = this.bL;\n- if (this.cd()) {\n+ if (this.ch()) {\n this.bK = this.bJ = 0.0F;\n this.bL += (1.0F - this.bL) * 0.4F + 0.05F;\n if (this.bL > 1.0F) {\n@@ -782,58 +785,52 @@ public void l_() {\n }\n }\n \n- private void cI() {\n+ private void cM() {\n if (!this.q.I) {\n this.bE = 1;\n this.b(128, true);\n }\n }\n \n- private boolean cJ() {\n- return this.n == null && this.o == null && this.bS() && this.bR() && !this.cv() && this.aJ() >= this.aP();\n- }\n-\n- public void w() {\n- if (this.q.I || !this.bS() && !this.ce() || this.aJ() <= 0.0F) {\n- super.w();\n- }\n+ private boolean cN() {\n+ return this.n == null && this.o == null && this.bW() && this.bV() && !this.cz() && this.aM() >= this.aS();\n }\n \n public void e(boolean flag0) {\n this.b(32, flag0);\n }\n \n- public void p(boolean flag0) {\n+ public void o(boolean flag0) {\n this.e(flag0);\n }\n \n- public void q(boolean flag0) {\n+ public void p(boolean flag0) {\n if (flag0) {\n- this.p(false);\n+ this.o(false);\n }\n \n this.b(64, flag0);\n }\n \n- private void cK() {\n+ private void cO() {\n if (!this.q.I) {\n this.bF = 1;\n- this.q(true);\n+ this.p(true);\n }\n }\n \n- public void cz() {\n- this.cK();\n- String s0 = this.cl();\n+ public void cD() {\n+ this.cO();\n+ String s0 = this.cp();\n \n if (s0 != null) {\n- this.a(s0, this.aW(), this.aX());\n+ this.a(s0, this.aZ(), this.ba());\n }\n }\n \n- public void cA() {\n+ public void cE() {\n this.a(this, this.bG);\n- this.ci();\n+ this.cm();\n }\n \n private void a(Entity entity, AnimalChest animalchest) {\n@@ -850,12 +847,12 @@ private void a(Entity entity, AnimalChest animalchest) {\n \n public boolean g(EntityPlayer entityplayer) {\n this.b(entityplayer.c_());\n- this.j(true);\n+ this.i(true);\n return true;\n }\n \n public void e(float f0, float f1) {\n- if (this.n != null && this.ck()) {\n+ if (this.n != null && this.co()) {\n this.C = this.A = this.n.A;\n this.B = this.n.B * 0.5F;\n this.b(this.A, this.B);\n@@ -867,18 +864,18 @@ public void e(float f0, float f1) {\n this.bP = 0;\n }\n \n- if (this.F && this.bt == 0.0F && this.cd() && !this.bI) {\n+ if (this.F && this.bt == 0.0F && this.ch() && !this.bI) {\n f0 = 0.0F;\n f1 = 0.0F;\n }\n \n- if (this.bt > 0.0F && !this.bZ() && this.F) {\n- this.y = this.cj() * (double) this.bt;\n+ if (this.bt > 0.0F && !this.cd() && this.F) {\n+ this.y = this.cn() * (double) this.bt;\n if (this.a(Potion.j)) {\n this.y += (double) ((float) (this.b(Potion.j).c() + 1) * 0.1F);\n }\n \n- this.k(true);\n+ this.j(true);\n this.an = true;\n if (f1 > 0.0F) {\n float f2 = MathHelper.a(this.A * 3.1415927F / 180.0F);\n@@ -893,15 +890,15 @@ public void e(float f0, float f1) {\n }\n \n this.Y = 1.0F;\n- this.aR = this.bc() * 0.1F;\n+ this.aR = this.bf() * 0.1F;\n if (!this.q.I) {\n this.i((float) this.a(SharedMonsterAttributes.d).e());\n super.e(f0, f1);\n }\n \n if (this.F) {\n this.bt = 0.0F;\n- this.k(false);\n+ this.j(false);\n }\n \n this.aF = this.aG;\n@@ -924,15 +921,16 @@ public void e(float f0, float f1) {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"EatingHaystack\", this.cc());\n- nbttagcompound.a(\"ChestedHorse\", this.ca());\n- nbttagcompound.a(\"HasReproduced\", this.cf());\n- nbttagcompound.a(\"Bred\", this.ce());\n- nbttagcompound.a(\"Type\", this.bP());\n- nbttagcompound.a(\"Variant\", this.bQ());\n- nbttagcompound.a(\"Temper\", this.cg());\n- nbttagcompound.a(\"Tame\", this.bS());\n- if (this.ca()) {\n+ nbttagcompound.a(\"EatingHaystack\", this.cg());\n+ nbttagcompound.a(\"ChestedHorse\", this.ce());\n+ nbttagcompound.a(\"HasReproduced\", this.cj());\n+ nbttagcompound.a(\"Bred\", this.ci());\n+ nbttagcompound.a(\"Type\", this.bT());\n+ nbttagcompound.a(\"Variant\", this.bU());\n+ nbttagcompound.a(\"Temper\", this.ck());\n+ nbttagcompound.a(\"Tame\", this.bW());\n+ nbttagcompound.a(\"OwnerName\", this.cb());\n+ if (this.ce()) {\n NBTTagList nbttaglist = new NBTTagList();\n \n for (int i0 = 2; i0 < this.bG.j_(); ++i0) {\n@@ -961,24 +959,28 @@ public void b(NBTTagCompound nbttagcompound) {\n \n public void a(NBTTagCompound nbttagcompound) {\n super.a(nbttagcompound);\n- this.p(nbttagcompound.n(\"EatingHaystack\"));\n- this.l(nbttagcompound.n(\"Bred\"));\n- this.m(nbttagcompound.n(\"ChestedHorse\"));\n- this.n(nbttagcompound.n(\"HasReproduced\"));\n+ this.o(nbttagcompound.n(\"EatingHaystack\"));\n+ this.k(nbttagcompound.n(\"Bred\"));\n+ this.l(nbttagcompound.n(\"ChestedHorse\"));\n+ this.m(nbttagcompound.n(\"HasReproduced\"));\n this.p(nbttagcompound.e(\"Type\"));\n this.q(nbttagcompound.e(\"Variant\"));\n this.s(nbttagcompound.e(\"Temper\"));\n- this.j(nbttagcompound.n(\"Tame\"));\n- AttributeInstance attributeinstance = this.aT().a(\"Speed\");\n+ this.i(nbttagcompound.n(\"Tame\"));\n+ if (nbttagcompound.b(\"OwnerName\")) {\n+ this.b(nbttagcompound.i(\"OwnerName\"));\n+ }\n+\n+ AttributeInstance attributeinstance = this.aW().a(\"Speed\");\n \n if (attributeinstance != null) {\n this.a(SharedMonsterAttributes.d).a(attributeinstance.b() * 0.25D);\n }\n \n- if (this.ca()) {\n+ if (this.ce()) {\n NBTTagList nbttaglist = nbttagcompound.m(\"Items\");\n \n- this.cD();\n+ this.cH();\n \n for (int i0 = 0; i0 < nbttaglist.c(); ++i0) {\n NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.b(i0);\n@@ -1008,7 +1010,7 @@ public void a(NBTTagCompound nbttagcompound) {\n this.bG.a(0, new ItemStack(Item.aC));\n }\n \n- this.cE();\n+ this.cI();\n }\n \n public boolean a(EntityAnimal entityanimal) {\n@@ -1019,9 +1021,9 @@ public boolean a(EntityAnimal entityanimal) {\n } else {\n EntityHorse entityhorse = (EntityHorse) entityanimal;\n \n- if (this.cJ() && entityhorse.cJ()) {\n- int i0 = this.bP();\n- int i1 = entityhorse.bP();\n+ if (this.cN() && entityhorse.cN()) {\n+ int i0 = this.bT();\n+ int i1 = entityhorse.bT();\n \n return i0 == i1 || i0 == 0 && i1 == 1 || i0 == 1 && i1 == 0;\n } else {\n@@ -1033,8 +1035,8 @@ public boolean a(EntityAnimal entityanimal) {\n public EntityAgeable a(EntityAgeable entityageable) {\n EntityHorse entityhorse = (EntityHorse) entityageable;\n EntityHorse entityhorse1 = new EntityHorse(this.q);\n- int i0 = this.bP();\n- int i1 = entityhorse.bP();\n+ int i0 = this.bT();\n+ int i1 = entityhorse.bT();\n int i2 = 0;\n \n if (i0 == i1) {\n@@ -1048,19 +1050,19 @@ public EntityAgeable a(EntityAgeable entityageable) {\n int i4;\n \n if (i3 < 4) {\n- i4 = this.bQ() & 255;\n+ i4 = this.bU() & 255;\n } else if (i3 < 8) {\n- i4 = entityhorse.bQ() & 255;\n+ i4 = entityhorse.bU() & 255;\n } else {\n i4 = this.ab.nextInt(7);\n }\n \n int i5 = this.ab.nextInt(5);\n \n if (i5 < 4) {\n- i4 |= this.bQ() & '\\uff00';\n+ i4 |= this.bU() & '\\uff00';\n } else if (i5 < 8) {\n- i4 |= entityhorse.bQ() & '\\uff00';\n+ i4 |= entityhorse.bU() & '\\uff00';\n } else {\n i4 |= this.ab.nextInt(5) << 8 & '\\uff00';\n }\n@@ -1069,13 +1071,13 @@ public EntityAgeable a(EntityAgeable entityageable) {\n }\n \n entityhorse1.p(i2);\n- double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cL();\n+ double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cP();\n \n entityhorse1.a(SharedMonsterAttributes.a).a(d0 / 3.0D);\n- double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cM();\n+ double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cQ();\n \n entityhorse1.a(bv).a(d1 / 3.0D);\n- double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cN();\n+ double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cR();\n \n entityhorse1.a(SharedMonsterAttributes.d).a(d2 / 3.0D);\n return entityhorse1;\n@@ -1111,9 +1113,9 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n }\n \n if (i1 != 4 && i1 != 3) {\n- this.a(SharedMonsterAttributes.a).a((double) this.cL());\n+ this.a(SharedMonsterAttributes.a).a((double) this.cP());\n if (i1 == 0) {\n- this.a(SharedMonsterAttributes.d).a(this.cN());\n+ this.a(SharedMonsterAttributes.d).a(this.cR());\n } else {\n this.a(SharedMonsterAttributes.d).a(0.17499999701976776D);\n }\n@@ -1123,58 +1125,60 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n }\n \n if (i1 != 2 && i1 != 1) {\n- this.a(bv).a(this.cM());\n+ this.a(bv).a(this.cQ());\n } else {\n this.a(bv).a(0.5D);\n }\n \n- this.g(this.aP());\n+ this.g(this.aS());\n return (EntityLivingData) object;\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return true;\n }\n \n public void u(int i0) {\n- if (i0 < 0) {\n- i0 = 0;\n- } else {\n- this.bI = true;\n- this.cK();\n- }\n+ if (this.co()) {\n+ if (i0 < 0) {\n+ i0 = 0;\n+ } else {\n+ this.bI = true;\n+ this.cO();\n+ }\n \n- if (i0 >= 90) {\n- this.bt = 1.0F;\n- } else {\n- this.bt = 0.4F + 0.4F * (float) i0 / 90.0F;\n+ if (i0 >= 90) {\n+ this.bt = 1.0F;\n+ } else {\n+ this.bt = 0.4F + 0.4F * (float) i0 / 90.0F;\n+ }\n }\n }\n \n- public void U() {\n- super.U();\n+ public void V() {\n+ super.V();\n if (this.bM > 0.0F) {\n float f0 = MathHelper.a(this.aN * 3.1415927F / 180.0F);\n float f1 = MathHelper.b(this.aN * 3.1415927F / 180.0F);\n float f2 = 0.7F * this.bM;\n float f3 = 0.15F * this.bM;\n \n- this.n.b(this.u + (double) (f2 * f0), this.v + this.W() + this.n.V() + (double) f3, this.w - (double) (f2 * f1));\n+ this.n.b(this.u + (double) (f2 * f0), this.v + this.X() + this.n.W() + (double) f3, this.w - (double) (f2 * f1));\n if (this.n instanceof EntityLivingBase) {\n ((EntityLivingBase) this.n).aN = this.aN;\n }\n }\n }\n \n- private float cL() {\n+ private float cP() {\n return 15.0F + (float) this.ab.nextInt(8) + (float) this.ab.nextInt(9);\n }\n \n- private double cM() {\n+ private double cQ() {\n return 0.4000000059604645D + this.ab.nextDouble() * 0.2D + this.ab.nextDouble() * 0.2D + this.ab.nextDouble() * 0.2D;\n }\n \n- private double cN() {\n+ private double cR() {\n return (0.44999998807907104D + this.ab.nextDouble() * 0.3D + this.ab.nextDouble() * 0.3D + this.ab.nextDouble() * 0.3D) * 0.25D;\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHorse.java","sha":"5572985b3444cac19e10bb5af9f1abd00ef77c89","status":"modified"},{"additions":19,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityIronGolem.java","changes":38,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityIronGolem.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":19,"filename":"src/main/java/net/minecraft/server/EntityIronGolem.java","new_code":" this.c.a(4, new EntityAIMoveTowardsRestriction(this, 1.0D));\n public boolean be() {\n protected void bj() {\n this.bR();\n super.bj();\n protected void ay() {\n super.ay();\n if (entity instanceof IMob && this.aC().nextInt(20) == 0) {\n this.d((EntityLivingBase) entity);\n return this.bW() && EntityPlayer.class.isAssignableFrom(oclass0) ? false : super.a(oclass0);\n nbttagcompound.a(\"PlayerCreated\", this.bW());\n this.i(nbttagcompound.n(\"PlayerCreated\"));\n public Village bT() {\n protected String aN() {\n protected String aO() {\n public int bV() {\n public boolean bW() {\n public void i(boolean flag0) {\n if (!this.bW() && this.aS != null && this.bp != null) {","new_methods":[],"old_code":" this.c.a(4, new EntityAIMoveTwardsRestriction(this, 1.0D));\n public boolean bb() {\n protected void bg() {\n this.bN();\n super.bg();\n protected void ax() {\n super.ax();\n if (entity instanceof IMob && this.aB().nextInt(20) == 0) {\n this.c((EntityLivingBase) entity);\n return this.bS() && EntityPlayer.class.isAssignableFrom(oclass0) ? false : super.a(oclass0);\n nbttagcompound.a(\"PlayerCreated\", this.bS());\n this.j(nbttagcompound.n(\"PlayerCreated\"));\n public Village bP() {\n protected String aK() {\n protected String aL() {\n public int bR() {\n public boolean bS() {\n public void j(boolean flag0) {\n if (!this.bS() && this.aS != null && this.bp != null) {","old_methods":[],"patch":"@@ -16,7 +16,7 @@ public EntityIronGolem(World world) {\n this.c.a(1, new EntityAIAttackOnCollide(this, 1.0D, true));\n this.c.a(2, new EntityAIMoveTowardsTarget(this, 0.9D, 32.0F));\n this.c.a(3, new EntityAIMoveThroughVillage(this, 0.6D, true));\n- this.c.a(4, new EntityAIMoveTwardsRestriction(this, 1.0D));\n+ this.c.a(4, new EntityAIMoveTowardsRestriction(this, 1.0D));\n this.c.a(5, new EntityAILookAtVillager(this));\n this.c.a(6, new EntityAIWander(this, 0.6D));\n this.c.a(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));\n@@ -32,28 +32,28 @@ protected void a() {\n this.ah.a(16, Byte.valueOf((byte) 0));\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void bg() {\n+ protected void bj() {\n if (--this.bq <= 0) {\n this.bq = 70 + this.ab.nextInt(50);\n this.bp = this.q.A.a(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w), 32);\n if (this.bp == null) {\n- this.bN();\n+ this.bR();\n } else {\n ChunkCoordinates chunkcoordinates = this.bp.a();\n \n this.b(chunkcoordinates.a, chunkcoordinates.b, chunkcoordinates.c, (int) ((float) this.bp.b() * 0.6F));\n }\n }\n \n- super.bg();\n+ super.bj();\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(100.0D);\n this.a(SharedMonsterAttributes.d).a(0.25D);\n }\n@@ -63,8 +63,8 @@ protected int h(int i0) {\n }\n \n protected void n(Entity entity) {\n- if (entity instanceof IMob && this.aB().nextInt(20) == 0) {\n- this.c((EntityLivingBase) entity);\n+ if (entity instanceof IMob && this.aC().nextInt(20) == 0) {\n+ this.d((EntityLivingBase) entity);\n }\n \n super.n(entity);\n@@ -93,17 +93,17 @@ public void c() {\n }\n \n public boolean a(Class oclass0) {\n- return this.bS() && EntityPlayer.class.isAssignableFrom(oclass0) ? false : super.a(oclass0);\n+ return this.bW() && EntityPlayer.class.isAssignableFrom(oclass0) ? false : super.a(oclass0);\n }\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"PlayerCreated\", this.bS());\n+ nbttagcompound.a(\"PlayerCreated\", this.bW());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n super.a(nbttagcompound);\n- this.j(nbttagcompound.n(\"PlayerCreated\"));\n+ this.i(nbttagcompound.n(\"PlayerCreated\"));\n }\n \n public boolean m(Entity entity) {\n@@ -119,7 +119,7 @@ public boolean m(Entity entity) {\n return flag0;\n }\n \n- public Village bP() {\n+ public Village bT() {\n return this.bp;\n }\n \n@@ -132,11 +132,11 @@ protected String r() {\n return \"none\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.irongolem.hit\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.irongolem.death\";\n }\n \n@@ -160,15 +160,15 @@ protected void b(boolean flag0, int i0) {\n }\n }\n \n- public int bR() {\n+ public int bV() {\n return this.bs;\n }\n \n- public boolean bS() {\n+ public boolean bW() {\n return (this.ah.a(16) & 1) != 0;\n }\n \n- public void j(boolean flag0) {\n+ public void i(boolean flag0) {\n byte b0 = this.ah.a(16);\n \n if (flag0) {\n@@ -179,7 +179,7 @@ public void j(boolean flag0) {\n }\n \n public void a(DamageSource damagesource) {\n- if (!this.bS() && this.aS != null && this.bp != null) {\n+ if (!this.bW() && this.aS != null && this.bp != null) {\n this.bp.a(this.aS.c_(), -5);\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityIronGolem.java","sha":"ef4b9719f9283a625d95180a3e5deacb190edd4f","status":"modified"},{"additions":4,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItem.java","changes":8,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItem.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":4,"filename":"src/main/java/net/minecraft/server/EntityItem.java","new_code":" } else if (entityitem.S() && this.S()) {\n if (this.aq()) {\n public String am() {\n public boolean ap() {","new_methods":[],"old_code":" } else if (entityitem.R() && this.R()) {\n if (this.ap()) {\n public String al() {\n public boolean ao() {","old_methods":[],"patch":"@@ -131,7 +131,7 @@ private void e() {\n public boolean a(EntityItem entityitem) {\n if (entityitem == this) {\n return false;\n- } else if (entityitem.R() && this.R()) {\n+ } else if (entityitem.S() && this.S()) {\n ItemStack itemstack = this.d();\n ItemStack itemstack1 = entityitem.d();\n \n@@ -173,7 +173,7 @@ protected void e(int i0) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (this.d() != null && this.d().d == Item.bU.cv && damagesource.c()) {\n return false;\n@@ -240,11 +240,11 @@ public void b_(EntityPlayer entityplayer) {\n }\n }\n \n- public String al() {\n+ public String am() {\n return StatCollector.a(\"item.\" + this.d().a());\n }\n \n- public boolean ao() {\n+ public boolean ap() {\n return false;\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItem.java","sha":"0f4afee85fbfd5b698b071d75e69d9f3eb4e2fff","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItemFrame.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItemFrame.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/EntityItemFrame.java","new_code":" ItemStack itemstack = entityplayer.aY();","new_methods":[],"old_code":"\n\n ItemStack itemstack = entityplayer.aV();","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.hanging.CanaryItemFrame;\n \n-\n public class EntityItemFrame extends EntityHanging {\n \n public float e = 1.0F; // CanaryMod: private -> public\n@@ -110,7 +108,7 @@ public void a(NBTTagCompound nbttagcompound) {\n \n public boolean c(EntityPlayer entityplayer) {\n if (this.h() == null) {\n- ItemStack itemstack = entityplayer.aV();\n+ ItemStack itemstack = entityplayer.aY();\n \n if (itemstack != null && !this.q.I) {\n this.a(itemstack);","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItemFrame.java","sha":"5b91f99631886ab5c2a2210d9ef2526f49488f31","status":"modified"},{"additions":24,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLeashKnot.java","changes":32,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLeashKnot.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":8,"filename":"src/main/java/net/minecraft/server/EntityLeashKnot.java","new_code":" ItemStack itemstack = entityplayer.aY();\n double d0;\n List list;\n Iterator iterator;\n EntityLiving entityliving;\n d0 = 7.0D;\n list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\n iterator = list.iterator();\n entityliving = (EntityLiving) iterator.next();\n if (entityliving.bH() && entityliving.bI() == entityplayer) {\n if (entityplayer.bG.d) {\n d0 = 7.0D;\n list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\n if (list != null) {\n iterator = list.iterator();\n\n while (iterator.hasNext()) {\n entityliving = (EntityLiving) iterator.next();\n if (entityliving.bH() && entityliving.bI() == this) {\n entityliving.a(true, false);\n }\n }\n }\n }","new_methods":[],"old_code":" ItemStack itemstack = entityplayer.aV();\n double d0 = 7.0D;\n List list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\n\n Iterator iterator = list.iterator();\n EntityLiving entityliving = (EntityLiving) iterator.next();\n\n if (entityliving.bD() && entityliving.bE() == entityplayer) {","old_methods":[],"patch":"@@ -42,20 +42,22 @@ public void b(NBTTagCompound nbttagcompound) {}\n public void a(NBTTagCompound nbttagcompound) {}\n \n public boolean c(EntityPlayer entityplayer) {\n- ItemStack itemstack = entityplayer.aV();\n+ ItemStack itemstack = entityplayer.aY();\n boolean flag0 = false;\n+ double d0;\n+ List list;\n+ Iterator iterator;\n+ EntityLiving entityliving;\n \n if (itemstack != null && itemstack.d == Item.ch.cv && !this.q.I) {\n- double d0 = 7.0D;\n- List list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\n-\n+ d0 = 7.0D;\n+ list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\n if (list != null) {\n- Iterator iterator = list.iterator();\n+ iterator = list.iterator();\n \n while (iterator.hasNext()) {\n- EntityLiving entityliving = (EntityLiving) iterator.next();\n-\n- if (entityliving.bD() && entityliving.bE() == entityplayer) {\n+ entityliving = (EntityLiving) iterator.next();\n+ if (entityliving.bH() && entityliving.bI() == entityplayer) {\n entityliving.b(this, true);\n flag0 = true;\n }\n@@ -65,6 +67,20 @@ public boolean c(EntityPlayer entityplayer) {\n \n if (!this.q.I && !flag0) {\n this.w();\n+ if (entityplayer.bG.d) {\n+ d0 = 7.0D;\n+ list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\n+ if (list != null) {\n+ iterator = list.iterator();\n+\n+ while (iterator.hasNext()) {\n+ entityliving = (EntityLiving) iterator.next();\n+ if (entityliving.bH() && entityliving.bI() == this) {\n+ entityliving.a(true, false);\n+ }\n+ }\n+ }\n+ }\n }\n \n return true;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLeashKnot.java","sha":"5bbd664c045c40e792d703da696a4a3e2ece3726","status":"modified"},{"additions":61,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLiving.java","changes":122,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLiving.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":61,"filename":"src/main/java/net/minecraft/server/EntityLiving.java","new_code":" protected void ay() {\n super.ay();\n this.aW().b(SharedMonsterAttributes.b).a(16.0D);\n public void d(EntityLivingBase entitylivingbase) {\n this.a(s0, this.aZ(), this.ba());\n if (this.S() && this.ab.nextInt(1000) < this.a_++) {\n ItemStack[] aitemstack = this.ad();\n this.bF();\n if (this.be()) {\n nbttagcompound.a(\"CanPickUpLoot\", this.bD());\n nbttagcompound.a(\"CustomName\", this.bA());\n nbttagcompound.a(\"CustomNameVisible\", this.bC());\n nbttagcompound1.a(\"UUIDMost\", this.bw.av().getMostSignificantBits());\n nbttagcompound1.a(\"UUIDLeast\", this.bw.av().getLeastSignificantBits());\n if (!this.q.I && this.bD() && !this.aU && this.q.O().b(\"mobGriefing\")) {\n protected boolean be() {\n protected void bo() {\n protected void bh() {\n this.bo();\n this.bj();\n protected void bk() {\n super.bk();\n this.bo();\n this.a(this.bu, 10.0F, (float) this.bp());\n public int bp() {\n public boolean bs() {\n public int bv() {\n public int ar() {\n int i0 = (int) (this.aM() - this.aS() * 0.33F);\n public ItemStack aY() {\n public ItemStack[] ad() {\n for (int i1 = 0; i1 < this.ad().length; ++i1) {\n protected void bw() {\n protected void bx() {\n if (this.aY() != null && this.ab.nextFloat() < 0.25F * f0) {\n EnchantmentHelper.a(this.ab, this.aY(), (int) (5.0F + f0 * (float) this.ab.nextInt(18)));\n public boolean by() {\n public String am() {\n return this.bB() ? this.bA() : super.am();\n public void bz() {\n public String bA() {\n public boolean bB() {\n public boolean bC() {\n public boolean bD() {\n public boolean bE() {\n if (this.bH() && this.bI() == entityplayer) {\n this.a(true, !entityplayer.bG.d);\n if (itemstack != null && itemstack.d == Item.ch.cv && this.bG()) {\n if (!(this instanceof EntityTameable) || !((EntityTameable) this).bT()) {\n protected void bF() {\n this.bJ();\n this.a(true, true);\n public void a(boolean flag0, boolean flag1) {\n if (!this.q.I && flag1) {\n public boolean bG() {\n return !this.bH() && !(this instanceof IMob);\n public boolean bH() {\n public Entity bI() {\n private void bJ() {\n if (entitylivingbase.av().equals(uuid)) {\n this.a(false, true);","new_methods":[],"old_code":" protected void ax() {\n super.ax();\n this.aT().b(SharedMonsterAttributes.b).a(16.0D);\n public void c(EntityLivingBase entitylivingbase) {\n this.a(s0, this.aW(), this.aX());\n if (this.R() && this.ab.nextInt(1000) < this.a_++) {\n ItemStack[] aitemstack = this.ac();\n this.bB();\n if (this.bb()) {\n nbttagcompound.a(\"CanPickUpLoot\", this.bz());\n nbttagcompound.a(\"CustomName\", this.bw());\n nbttagcompound.a(\"CustomNameVisible\", this.by());\n nbttagcompound1.a(\"UUIDMost\", this.bw.au().getMostSignificantBits());\n nbttagcompound1.a(\"UUIDLeast\", this.bw.au().getLeastSignificantBits());\n if (!this.q.I && this.bz() && !this.aU && this.q.O().b(\"mobGriefing\")) {\n protected boolean bb() {\n protected void bk() {\n protected void be() {\n this.bk();\n this.bg();\n protected void bh() {\n super.bh();\n this.bk();\n this.a(this.bu, 10.0F, (float) this.bl());\n public int bl() {\n public boolean bo() {\n public int br() {\n public int aq() {\n int i0 = (int) (this.aJ() - this.aP() * 0.33F);\n public ItemStack aV() {\n public ItemStack[] ac() {\n for (int i1 = 0; i1 < this.ac().length; ++i1) {\n protected void bs() {\n protected void bt() {\n if (this.aV() != null && this.ab.nextFloat() < 0.25F * f0) {\n EnchantmentHelper.a(this.ab, this.aV(), (int) (5.0F + f0 * (float) this.ab.nextInt(18)));\n public boolean bu() {\n public String al() {\n return this.bx() ? this.bw() : super.al();\n public void bv() {\n public String bw() {\n public boolean bx() {\n public boolean by() {\n public boolean bz() {\n public boolean bA() {\n if (this.bD() && this.bE() == entityplayer) {\n this.i(true);\n if (itemstack != null && itemstack.d == Item.ch.cv && this.bC()) {\n if (!(this instanceof EntityTameable) || !((EntityTameable) this).bP()) {\n protected void bB() {\n this.bF();\n this.i(true);\n public void i(boolean flag0) {\n if (!this.q.I) {\n public boolean bC() {\n return !this.bD() && !(this instanceof IMob);\n public boolean bD() {\n public Entity bE() {\n private void bF() {\n if (entitylivingbase.au().equals(uuid)) {\n this.i(false);","old_methods":[],"patch":"@@ -44,9 +44,9 @@ public EntityLiving(World world) {\n }\n }\n \n- protected void ax() {\n- super.ax();\n- this.aT().b(SharedMonsterAttributes.b).a(16.0D);\n+ protected void ay() {\n+ super.ay();\n+ this.aW().b(SharedMonsterAttributes.b).a(16.0D);\n }\n \n public EntityLookHelper h() {\n@@ -73,7 +73,7 @@ public EntityLivingBase m() {\n return this.bp;\n }\n \n- public void c(EntityLivingBase entitylivingbase) {\n+ public void d(EntityLivingBase entitylivingbase) {\n this.bp = entitylivingbase;\n }\n \n@@ -97,14 +97,14 @@ public void p() {\n String s0 = this.r();\n \n if (s0 != null) {\n- this.a(s0, this.aW(), this.aX());\n+ this.a(s0, this.aZ(), this.ba());\n }\n }\n \n public void x() {\n super.x();\n this.q.C.a(\"mobBaseTick\");\n- if (this.R() && this.ab.nextInt(1000) < this.a_++) {\n+ if (this.S() && this.ab.nextInt(1000) < this.a_++) {\n this.a_ = -this.o();\n this.p();\n }\n@@ -115,7 +115,7 @@ public void x() {\n protected int e(EntityPlayer entityplayer) {\n if (this.b > 0) {\n int i0 = this.b;\n- ItemStack[] aitemstack = this.ac();\n+ ItemStack[] aitemstack = this.ad();\n \n for (int i1 = 0; i1 < aitemstack.length; ++i1) {\n if (aitemstack[i1] != null && this.e[i1] <= 1.0F) {\n@@ -143,12 +143,12 @@ public void q() {\n public void l_() {\n super.l_();\n if (!this.q.I) {\n- this.bB();\n+ this.bF();\n }\n }\n \n protected float f(float f0, float f1) {\n- if (this.bb()) {\n+ if (this.be()) {\n this.bn.a();\n return f1;\n } else {\n@@ -182,7 +182,7 @@ protected void b(boolean flag0, int i0) {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"CanPickUpLoot\", this.bz());\n+ nbttagcompound.a(\"CanPickUpLoot\", this.bD());\n nbttagcompound.a(\"PersistenceRequired\", this.bt);\n NBTTagList nbttaglist = new NBTTagList();\n \n@@ -205,14 +205,14 @@ public void b(NBTTagCompound nbttagcompound) {\n }\n \n nbttagcompound.a(\"DropChances\", (NBTBase) nbttaglist1);\n- nbttagcompound.a(\"CustomName\", this.bw());\n- nbttagcompound.a(\"CustomNameVisible\", this.by());\n+ nbttagcompound.a(\"CustomName\", this.bA());\n+ nbttagcompound.a(\"CustomNameVisible\", this.bC());\n nbttagcompound.a(\"Leashed\", this.bv);\n if (this.bw != null) {\n nbttagcompound1 = new NBTTagCompound(\"Leash\");\n if (this.bw instanceof EntityLivingBase) {\n- nbttagcompound1.a(\"UUIDMost\", this.bw.au().getMostSignificantBits());\n- nbttagcompound1.a(\"UUIDLeast\", this.bw.au().getLeastSignificantBits());\n+ nbttagcompound1.a(\"UUIDMost\", this.bw.av().getMostSignificantBits());\n+ nbttagcompound1.a(\"UUIDLeast\", this.bw.av().getLeastSignificantBits());\n } else if (this.bw instanceof EntityHanging) {\n EntityHanging entityhanging = (EntityHanging) this.bw;\n \n@@ -271,7 +271,7 @@ public void i(float f0) {\n public void c() {\n super.c();\n this.q.C.a(\"looting\");\n- if (!this.q.I && this.bz() && !this.aU && this.q.O().b(\"mobGriefing\")) {\n+ if (!this.q.I && this.bD() && !this.aU && this.q.O().b(\"mobGriefing\")) {\n List list = this.q.a(EntityItem.class, this.E.b(1.0D, 0.0D, 1.0D));\n Iterator iterator = list.iterator();\n \n@@ -337,15 +337,15 @@ public void c() {\n this.q.C.b();\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return false;\n }\n \n protected boolean t() {\n return true;\n }\n \n- protected void bk() {\n+ protected void bo() {\n if (this.bt) {\n this.aV = 0;\n } else {\n@@ -370,10 +370,10 @@ protected void bk() {\n }\n }\n \n- protected void be() {\n+ protected void bh() {\n ++this.aV;\n this.q.C.a(\"checkDespawn\");\n- this.bk();\n+ this.bo();\n this.q.C.b();\n this.q.C.a(\"sensing\");\n this.bq.a();\n@@ -388,7 +388,7 @@ protected void be() {\n this.bo.f();\n this.q.C.b();\n this.q.C.a(\"mob tick\");\n- this.bg();\n+ this.bj();\n this.q.C.b();\n this.q.C.a(\"controls\");\n this.q.C.a(\"move\");\n@@ -401,11 +401,11 @@ protected void be() {\n this.q.C.b();\n }\n \n- protected void bh() {\n- super.bh();\n+ protected void bk() {\n+ super.bk();\n this.be = 0.0F;\n this.bf = 0.0F;\n- this.bk();\n+ this.bo();\n float f0 = 8.0F;\n \n if (this.ab.nextFloat() < 0.02F) {\n@@ -420,7 +420,7 @@ protected void bh() {\n }\n \n if (this.bu != null) {\n- this.a(this.bu, 10.0F, (float) this.bl());\n+ this.a(this.bu, 10.0F, (float) this.bp());\n if (this.g-- <= 0 || this.bu.M || this.bu.e((Entity) this) > (double) (f0 * f0)) {\n this.bu = null;\n }\n@@ -441,7 +441,7 @@ protected void bh() {\n }\n }\n \n- public int bl() {\n+ public int bp() {\n return 40;\n }\n \n@@ -480,19 +480,19 @@ private float b(float f0, float f1, float f2) {\n return f0 + f3;\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n return this.q.b(this.E) && this.q.a((Entity) this, this.E).isEmpty() && !this.q.d(this.E);\n }\n \n- public int br() {\n+ public int bv() {\n return 4;\n }\n \n- public int aq() {\n+ public int ar() {\n if (this.m() == null) {\n return 3;\n } else {\n- int i0 = (int) (this.aJ() - this.aP() * 0.33F);\n+ int i0 = (int) (this.aM() - this.aS() * 0.33F);\n \n i0 -= (3 - this.q.r) * 4;\n if (i0 < 0) {\n@@ -503,7 +503,7 @@ public int aq() {\n }\n }\n \n- public ItemStack aV() {\n+ public ItemStack aY() {\n return this.br[0];\n }\n \n@@ -519,12 +519,12 @@ public void c(int i0, ItemStack itemstack) {\n this.br[i0] = itemstack;\n }\n \n- public ItemStack[] ac() {\n+ public ItemStack[] ad() {\n return this.br;\n }\n \n protected void a(boolean flag0, int i0) {\n- for (int i1 = 0; i1 < this.ac().length; ++i1) {\n+ for (int i1 = 0; i1 < this.ad().length; ++i1) {\n ItemStack itemstack = this.n(i1);\n boolean flag1 = this.e[i1] > 1.0F;\n \n@@ -549,7 +549,7 @@ protected void a(boolean flag0, int i0) {\n }\n }\n \n- protected void bs() {\n+ protected void bw() {\n if (this.ab.nextFloat() < 0.15F * this.q.b(this.u, this.v, this.w)) {\n int i0 = this.ab.nextInt(2);\n float f0 = this.q.r == 3 ? 0.1F : 0.25F;\n@@ -667,11 +667,11 @@ public static Item a(int i0, int i1) {\n }\n }\n \n- protected void bt() {\n+ protected void bx() {\n float f0 = this.q.b(this.u, this.v, this.w);\n \n- if (this.aV() != null && this.ab.nextFloat() < 0.25F * f0) {\n- EnchantmentHelper.a(this.ab, this.aV(), (int) (5.0F + f0 * (float) this.ab.nextInt(18)));\n+ if (this.aY() != null && this.ab.nextFloat() < 0.25F * f0) {\n+ EnchantmentHelper.a(this.ab, this.aY(), (int) (5.0F + f0 * (float) this.ab.nextInt(18)));\n }\n \n for (int i0 = 0; i0 < 4; ++i0) {\n@@ -688,63 +688,63 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n return entitylivingdata;\n }\n \n- public boolean bu() {\n+ public boolean by() {\n return false;\n }\n \n- public String al() {\n- return this.bx() ? this.bw() : super.al();\n+ public String am() {\n+ return this.bB() ? this.bA() : super.am();\n }\n \n- public void bv() {\n+ public void bz() {\n this.bt = true;\n }\n \n public void a(String s0) {\n this.ah.b(10, s0);\n }\n \n- public String bw() {\n+ public String bA() {\n return this.ah.e(10);\n }\n \n- public boolean bx() {\n+ public boolean bB() {\n return this.ah.e(10).length() > 0;\n }\n \n public void g(boolean flag0) {\n this.ah.b(11, Byte.valueOf((byte) (flag0 ? 1 : 0)));\n }\n \n- public boolean by() {\n+ public boolean bC() {\n return this.ah.a(11) == 1;\n }\n \n public void a(int i0, float f0) {\n this.e[i0] = f0;\n }\n \n- public boolean bz() {\n+ public boolean bD() {\n return this.bs;\n }\n \n public void h(boolean flag0) {\n this.bs = flag0;\n }\n \n- public boolean bA() {\n+ public boolean bE() {\n return this.bt;\n }\n \n public final boolean c(EntityPlayer entityplayer) {\n- if (this.bD() && this.bE() == entityplayer) {\n- this.i(true);\n+ if (this.bH() && this.bI() == entityplayer) {\n+ this.a(true, !entityplayer.bG.d);\n return true;\n } else {\n ItemStack itemstack = entityplayer.bn.h();\n \n- if (itemstack != null && itemstack.d == Item.ch.cv && this.bC()) {\n- if (!(this instanceof EntityTameable) || !((EntityTameable) this).bP()) {\n+ if (itemstack != null && itemstack.d == Item.ch.cv && this.bG()) {\n+ if (!(this instanceof EntityTameable) || !((EntityTameable) this).bT()) {\n this.b(entityplayer, true);\n --itemstack.b;\n return true;\n@@ -765,23 +765,23 @@ protected boolean a(EntityPlayer entityplayer) {\n return false;\n }\n \n- protected void bB() {\n+ protected void bF() {\n if (this.bx != null) {\n- this.bF();\n+ this.bJ();\n }\n \n if (this.bv) {\n if (this.bw == null || this.bw.M) {\n- this.i(true);\n+ this.a(true, true);\n }\n }\n }\n \n- public void i(boolean flag0) {\n+ public void a(boolean flag0, boolean flag1) {\n if (this.bv) {\n this.bv = false;\n this.bw = null;\n- if (!this.q.I) {\n+ if (!this.q.I && flag1) {\n this.b(Item.ch.cv, 1);\n }\n \n@@ -791,15 +791,15 @@ public void i(boolean flag0) {\n }\n }\n \n- public boolean bC() {\n- return !this.bD() && !(this instanceof IMob);\n+ public boolean bG() {\n+ return !this.bH() && !(this instanceof IMob);\n }\n \n- public boolean bD() {\n+ public boolean bH() {\n return this.bv;\n }\n \n- public Entity bE() {\n+ public Entity bI() {\n return this.bw;\n }\n \n@@ -811,7 +811,7 @@ public void b(Entity entity, boolean flag0) {\n }\n }\n \n- private void bF() {\n+ private void bJ() {\n if (this.bv && this.bx != null) {\n if (this.bx.b(\"UUIDMost\") && this.bx.b(\"UUIDLeast\")) {\n UUID uuid = new UUID(this.bx.f(\"UUIDMost\"), this.bx.f(\"UUIDLeast\"));\n@@ -821,7 +821,7 @@ private void bF() {\n while (iterator.hasNext()) {\n EntityLivingBase entitylivingbase = (EntityLivingBase) iterator.next();\n \n- if (entitylivingbase.au().equals(uuid)) {\n+ if (entitylivingbase.av().equals(uuid)) {\n this.bw = entitylivingbase;\n break;\n }\n@@ -838,7 +838,7 @@ private void bF() {\n \n this.bw = entityleashknot;\n } else {\n- this.i(false);\n+ this.a(false, true);\n }\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLiving.java","sha":"9a5e444415b55ddba5384b1ef229c8106f0914e1","status":"modified"},{"additions":173,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLivingBase.java","changes":333,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLivingBase.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":160,"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","new_code":" private int bo;\n private float bp;\n private int bq;\n private float br;\n this.ay();\n this.g(this.aS());\n protected void ay() {\n this.aW().b(SharedMonsterAttributes.a);\n this.aW().b(SharedMonsterAttributes.c);\n this.aW().b(SharedMonsterAttributes.d);\n if (!this.be()) {\n public boolean az() {\n if (this.S() && this.T()) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1.0F).call();\n if (this.S() && this.a(Material.h)) {\n if (!this.az() && !this.i(Potion.o.H) && !flag0) {\n this.g(this.h(this.ak()));\n if (this.ak() == -20) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2.0F).call();\n if (!this.q.I && this.af() && this.o instanceof EntityLivingBase) {\n if (this.aM() <= 0.0F) {\n this.aA();\n if (this.bn != null && !this.bn.S()) {\n if (this.i != null && !this.i.S()) {\n this.b((EntityLivingBase) null);\n this.aI();\n protected void aA() {\n if (!this.q.I && (this.aT > 0 || this.aB()) && !this.g_() && this.q.O().b(\"doMobLoot\")) {\n protected boolean aB() {\n public Random aC() {\n public EntityLivingBase aD() {\n public int aE() {\n return this.j;\n }\n\n this.j = this.ac;\n public EntityLivingBase aF() {\n public int aG() {\n return this.bo;\n }\n\n } else {\n this.bn = null;\n\n this.bo = this.ac;\n public int aH() {\n nbttagcompound.a(\"HealF\", this.aM());\n nbttagcompound.a(\"Health\", (short) ((int) Math.ceil((double) this.aM())));\n nbttagcompound.a(\"AbsorptionAmount\", this.bm());\n ItemStack[] aitemstack = this.ad();\n nbttagcompound.a(\"Attributes\", (NBTBase) SharedMonsterAttributes.a(this.aW()));\n aitemstack = this.ad();\n SharedMonsterAttributes.a(this.aW(), nbttagcompound.m(\"Attributes\"), this.q == null ? null : this.q.Y());\n this.g(this.aS());\n protected void aI() {\n this.b(potioneffect);\n this.a(potioneffect, false);\n if (!this.ai()) {\n public void aJ() {\n this.b(potioneffect);\n public Collection aK() {\n public void c(PotionEffect potioneffect) {\n if (this.d(potioneffect)) {\n if (this.d(potioneffect)) {\n this.a((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())), true);\n public boolean d(PotionEffect potioneffect) {\n if (this.aX() == EnumCreatureAttribute.b) {\n public boolean aL() {\n return this.aX() == EnumCreatureAttribute.b;\n this.b(potioneffect);\n Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\n protected void a(PotionEffect potioneffect, boolean flag0) {\n if (flag0 && !this.q.I) {\n Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\n Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\n protected void b(PotionEffect potioneffect) {\n Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\n float f1 = this.aM();\n public final float aM() {\n this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aS())));\n if (this.aq()) {\n if (this.aM() <= 0.0F) {\n this.ax = this.aM();\n if (entitywolf.bT()) {\n if (this.aM() <= 0.0F) {\n this.a(this.aO(), this.aZ(), this.ba());\n this.a(this.aN(), this.aZ(), this.ba());\n EntityLivingBase entitylivingbase = this.aR();\n protected String aN() {\n protected String aO() {\n public boolean S() {\n return !this.M && this.aM() > 0.0F;\n public int aP() {\n ItemStack[] aitemstack = this.ad();\n int i0 = 25 - this.aP();\n i0 = EnchantmentHelper.a(this.ad(), damagesource);\n if (!this.aq()) {\n f0 = Math.max(f0 - this.bm(), 0.0F);\n this.m(this.bm() - (f1 - f0));\n float f2 = this.aM();\n this.aQ().a(damagesource, f2, f0);\n this.m(this.bm() - f0);\n public CombatTracker aQ() {\n public EntityLivingBase aR() {\n public final float aS() {\n public final int aT() {\n public void aU() {\n protected void aV() {\n return this.aW().a(attribute);\n public BaseAttributeMap aW() {\n this.d = new ServersideAttributeMap();\n public EnumCreatureAttribute aX() {\n public abstract ItemStack aY();\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n if (attributeinstance.a(b) != null) {\n }\n\n if (flag0) {\n attributeinstance.a(c);\n public abstract ItemStack[] ad();\n protected float aZ() {\n protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;\n } else if (!this.bl()) {\n if (this.bb()) {\n } else if (this.bl()) {\n if (this.be()) {\n this.bh();\n this.bk();\n this.bh();\n if (this.F && this.bq == 0) {\n this.bd();\n this.bq = 10;\n this.bq = 0;\n this.bi();\n protected void bh() {}\n protected void bi() {\n public void U() {\n super.U();\n protected void bj() {}\n protected void bk() {\n public Vec3 Z() {\n public boolean bl() {\n public float ao() {\n public float bm() {\n return this.br;\n this.br = f0;\n }\n\n public Team bn() {\n return null;\n }\n\n public boolean c(EntityLivingBase entitylivingbase) {\n return this.a(entitylivingbase.bn());\n }\n\n public boolean a(Team team) {\n return this.bn() != null ? this.bn().a(team) : false;","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"this.aW().b(SharedMonsterAttributes.a);\n this.aW().b(SharedMonsterAttributes.c);\n this.aW().b(SharedMonsterAttributes.d);\n if (!this.be()) {\n public boolean az() {\n if (this.S() && this.T()) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1.0F).call();\n if (this.S() && this.a(Material.h)) {\n if (!this.az() && !this.i(Potion.o.H) && !flag0) {\n this.g(this.h(this.ak()));\n if (this.ak() == -20) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2.0F).call();\n if (!this.q.I && this.af() && this.o instanceof EntityLivingBase) {\n if (this.aM() <= 0.0F) {\n this.aA();\n if (this.bn != null && !this.bn.S()) {\n if (this.i != null && !this.i.S()) {\n this.b((EntityLivingBase) null);\n this.aI();\n protected void aA() {\n if (!this.q.I && (this.aT > 0 || this.aB()) && !this.g_() && this.q.O().b(\"doMobLoot\")) {\n protected boolean aB() {\n public Random aC() {\n public EntityLivingBase aD() {\n public int aE() {\n return this.j;","signature":"void ay()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"public int aG() {\n return this.bo;","signature":"EntityLivingBase aF()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"nbttagcompound.a(\"HealF\", this.aM());\n nbttagcompound.a(\"Health\", (short) ((int) Math.ceil((double) this.aM())));\n nbttagcompound.a(\"AbsorptionAmount\", this.bm());\n ItemStack[] aitemstack = this.ad();\n nbttagcompound.a(\"Attributes\", (NBTBase) SharedMonsterAttributes.a(this.aW()));\n aitemstack = this.ad();\n SharedMonsterAttributes.a(this.aW(), nbttagcompound.m(\"Attributes\"), this.q == null ? null : this.q.Y());\n this.g(this.aS());\n protected void aI() {\n this.b(potioneffect);\n this.a(potioneffect, false);\n if (!this.ai()) {\n public void aJ() {\n this.b(potioneffect);\n public Collection aK() {\n public void c(PotionEffect potioneffect) {\n if (this.d(potioneffect)) {\n if (this.d(potioneffect)) {\n this.a((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())), true);\n public boolean d(PotionEffect potioneffect) {\n if (this.aX() == EnumCreatureAttribute.b) {\n public boolean aL() {\n return this.aX() == EnumCreatureAttribute.b;\n this.b(potioneffect);\n Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\n protected void a(PotionEffect potioneffect, boolean flag0) {\n if (flag0 && !this.q.I) {\n Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\n Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\n protected void b(PotionEffect potioneffect) {\n Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\n float f1 = this.aM();\n public final float aM() {\n this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aS())));\n if (this.aq()) {\n if (this.aM() <= 0.0F) {\n this.ax = this.aM();\n if (entitywolf.bT()) {\n if (this.aM() <= 0.0F) {\n this.a(this.aO(), this.aZ(), this.ba());\n this.a(this.aN(), this.aZ(), this.ba());\n EntityLivingBase entitylivingbase = this.aR();\n protected String aN() {\n protected String aO() {\n public boolean S() {\n return !this.M && this.aM() > 0.0F;\n public int aP() {\n ItemStack[] aitemstack = this.ad();\n int i0 = 25 - this.aP();\n i0 = EnchantmentHelper.a(this.ad(), damagesource);\n if (!this.aq()) {\n f0 = Math.max(f0 - this.bm(), 0.0F);\n this.m(this.bm() - (f1 - f0));\n float f2 = this.aM();\n this.aQ().a(damagesource, f2, f0);\n this.m(this.bm() - f0);\n public CombatTracker aQ() {\n public EntityLivingBase aR() {\n public final float aS() {\n public final int aT() {\n public void aU() {\n protected void aV() {\n return this.aW().a(attribute);\n public BaseAttributeMap aW() {\n this.d = new ServersideAttributeMap();\n public EnumCreatureAttribute aX() {\n public abstract ItemStack aY();\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n if (attributeinstance.a(b) != null) {","signature":"int aH()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","signature":"float aZ()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"","signature":"void bh()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"public void U() {\n super.U();\n protected void bj() {","signature":"void bi()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"public Vec3 Z() {\n public boolean bl() {\n public float ao() {\n public float bm() {\n return this.br;\n this.br = f0;","signature":"void bk()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"return null;","signature":"Team bn()"},{"arguments":["EntityLivingBase entitylivingbase"],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"return this.a(entitylivingbase.bn());","signature":"boolean c(EntityLivingBase entitylivingbase)"}],"old_code":" private float bo;\n private int bp;\n private float bq;\n this.ax();\n this.g(this.aP());\n protected void ax() {\n this.aT().b(SharedMonsterAttributes.a);\n this.aT().b(SharedMonsterAttributes.c);\n this.aT().b(SharedMonsterAttributes.d);\n if (!this.bb()) {\n public boolean ay() {\n if (this.R() && this.S()) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1).call();\n if (this.R() && this.a(Material.h)) {\n if (!this.ay() && !this.i(Potion.o.H) && !flag0) {\n this.g(this.h(this.aj()));\n if (this.aj() == -20) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2).call();\n if (!this.q.I && this.ae() && this.o instanceof EntityLivingBase) {\n if (this.aJ() <= 0.0F) {\n this.az();\n if (this.bn != null && !this.bn.R()) {\n if (this.i != null) {\n if (!this.i.R()) {\n this.b((EntityLivingBase) null);\n } else if (this.j > 0) {\n --this.j;\n } else {\n this.b((EntityLivingBase) null);\n }\n this.aF();\n protected void az() {\n if (!this.q.I && (this.aT > 0 || this.aA()) && !this.g_() && this.q.O().b(\"doMobLoot\")) {\n protected boolean aA() {\n public Random aB() {\n public EntityLivingBase aC() {\n this.j = this.i != null ? 100 : 0;\n public EntityLivingBase aD() {\n public int aE() {\n nbttagcompound.a(\"HealF\", this.aJ());\n nbttagcompound.a(\"Health\", (short) ((int) Math.ceil((double) this.aJ())));\n nbttagcompound.a(\"AbsorptionAmount\", this.bj());\n ItemStack[] aitemstack = this.ac();\n nbttagcompound.a(\"Attributes\", (NBTBase) SharedMonsterAttributes.a(this.aT()));\n aitemstack = this.ac();\n SharedMonsterAttributes.a(this.aT(), nbttagcompound.m(\"Attributes\"), this.q == null ? null : this.q.Y());\n this.g(this.aP());\n protected void aF() {\n this.c(potioneffect);\n this.b(potioneffect);\n if (!this.ah()) {\n public void aG() {\n this.c(potioneffect);\n public Collection aH() {\n public void d(PotionEffect potioneffect) {\n if (this.e(potioneffect)) {\n if (this.e(potioneffect)) {\n this.b((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())));\n public boolean e(PotionEffect potioneffect) {\n if (this.aU() == EnumCreatureAttribute.b) {\n public boolean aI() {\n return this.aU() == EnumCreatureAttribute.b;\n this.c(potioneffect);\n Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\n protected void b(PotionEffect potioneffect) {\n if (!this.q.I) {\n Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\n }\n\n if (!this.q.I) {\n Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\n protected void c(PotionEffect potioneffect) {\n Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\n float f1 = this.aJ();\n public final float aJ() {\n this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aP())));\n if (this.ap()) {\n if (this.aJ() <= 0.0F) {\n this.ax = this.aJ();\n if (entitywolf.bP()) {\n if (this.aJ() <= 0.0F) {\n this.a(this.aL(), this.aW(), this.aX());\n this.a(this.aK(), this.aW(), this.aX());\n EntityLivingBase entitylivingbase = this.aO();\n protected String aK() {\n protected String aL() {\n public boolean R() {\n return !this.M && this.aJ() > 0.0F;\n public int aM() {\n ItemStack[] aitemstack = this.ac();\n int i0 = 25 - this.aM();\n i0 = EnchantmentHelper.a(this.ac(), damagesource);\n if (!this.ap()) {\n f0 = Math.max(f0 - this.bj(), 0.0F);\n this.m(this.bj() - (f1 - f0));\n float f2 = this.aJ();\n this.aN().a(damagesource, f2, f0);\n this.m(this.bj() - f0);\n public CombatTracker aN() {\n public EntityLivingBase aO() {\n public final float aP() {\n public final int aQ() {\n public void aR() {\n protected void aS() {\n return this.aT().a(attribute);\n public BaseAttributeMap aT() {\n if (this.q != null && !this.q.I) {\n this.d = new ServersideAttributeMap();\n } else {\n this.d = new ClientsideAttributeMap();\n }\n public EnumCreatureAttribute aU() {\n public abstract ItemStack aV();\n if (!this.q.I) {\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n if (flag0) {\n attributeinstance.a(c);\n }\n public abstract ItemStack[] ac();\n protected float aW() {\n protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;\n } else if (!this.bi()) {\n if (this.aY()) {\n } else if (this.bi()) {\n if (this.bb()) {\n this.be();\n this.bh();\n this.be();\n if (this.F && this.bp == 0) {\n this.ba();\n this.bp = 10;\n this.bp = 0;\n this.bf();\n protected void be() {}\n protected void bf() {\n public void T() {\n super.T();\n protected void bg() {}\n protected void bh() {\n public Vec3 Y() {\n public boolean bi() {\n public float an() {\n public float bj() {\n return this.bq;\n this.bq = f0;","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"this.aT().b(SharedMonsterAttributes.a);\n this.aT().b(SharedMonsterAttributes.c);\n this.aT().b(SharedMonsterAttributes.d);\n if (!this.bb()) {\n public boolean ay() {\n if (this.R() && this.S()) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1).call();\n if (this.R() && this.a(Material.h)) {\n if (!this.ay() && !this.i(Potion.o.H) && !flag0) {\n this.g(this.h(this.aj()));\n if (this.aj() == -20) {\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2).call();\n if (!this.q.I && this.ae() && this.o instanceof EntityLivingBase) {\n if (this.aJ() <= 0.0F) {\n this.az();\n if (this.bn != null && !this.bn.R()) {\n if (this.i != null) {\n if (!this.i.R()) {\n this.b((EntityLivingBase) null);","signature":"void ax()"},{"arguments":["this.j > 0"],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"--this.j;","signature":"else if (this.j > 0)"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"if (!this.q.I && (this.aT > 0 || this.aA()) && !this.g_() && this.q.O().b(\"doMobLoot\")) {\n protected boolean aA() {\n public Random aB() {\n public EntityLivingBase aC() {\n this.j = this.i != null ? 100 : 0;\n public EntityLivingBase aD() {\n public int aE() {\n nbttagcompound.a(\"HealF\", this.aJ());\n nbttagcompound.a(\"Health\", (short) ((int) Math.ceil((double) this.aJ())));\n nbttagcompound.a(\"AbsorptionAmount\", this.bj());\n ItemStack[] aitemstack = this.ac();\n nbttagcompound.a(\"Attributes\", (NBTBase) SharedMonsterAttributes.a(this.aT()));\n aitemstack = this.ac();\n SharedMonsterAttributes.a(this.aT(), nbttagcompound.m(\"Attributes\"), this.q == null ? null : this.q.Y());\n this.g(this.aP());\n protected void aF() {\n this.c(potioneffect);\n this.b(potioneffect);\n if (!this.ah()) {\n public void aG() {\n this.c(potioneffect);\n public Collection aH() {\n public void d(PotionEffect potioneffect) {\n if (this.e(potioneffect)) {\n if (this.e(potioneffect)) {\n this.b((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())));\n public boolean e(PotionEffect potioneffect) {\n if (this.aU() == EnumCreatureAttribute.b) {\n public boolean aI() {\n return this.aU() == EnumCreatureAttribute.b;\n this.c(potioneffect);\n Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\n protected void b(PotionEffect potioneffect) {\n if (!this.q.I) {\n Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());","signature":"void az()"},{"arguments":["PotionEffect potioneffect"],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\n float f1 = this.aJ();\n public final float aJ() {\n this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aP())));\n if (this.ap()) {\n if (this.aJ() <= 0.0F) {\n this.ax = this.aJ();\n if (entitywolf.bP()) {\n if (this.aJ() <= 0.0F) {\n this.a(this.aL(), this.aW(), this.aX());\n this.a(this.aK(), this.aW(), this.aX());\n EntityLivingBase entitylivingbase = this.aO();\n protected String aK() {\n protected String aL() {\n public boolean R() {\n return !this.M && this.aJ() > 0.0F;\n public int aM() {\n ItemStack[] aitemstack = this.ac();\n int i0 = 25 - this.aM();\n i0 = EnchantmentHelper.a(this.ac(), damagesource);\n if (!this.ap()) {\n f0 = Math.max(f0 - this.bj(), 0.0F);\n this.m(this.bj() - (f1 - f0));\n float f2 = this.aJ();\n this.aN().a(damagesource, f2, f0);\n this.m(this.bj() - f0);\n public CombatTracker aN() {\n public EntityLivingBase aO() {\n public final float aP() {\n public final int aQ() {\n public void aR() {\n protected void aS() {\n return this.aT().a(attribute);\n public BaseAttributeMap aT() {\n if (this.q != null && !this.q.I) {\n this.d = new ServersideAttributeMap();","signature":"void c(PotionEffect potioneffect)"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"public abstract ItemStack aV();\n if (!this.q.I) {\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n if (flag0) {\n attributeinstance.a(c);","signature":"EnumCreatureAttribute aU()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","signature":"float aW()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"","signature":"void be()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityLivingBase.java","implementation":"public void T() {\n super.T();\n protected void bg() {","signature":"void bf()"}],"patch":"@@ -72,17 +72,18 @@ public abstract class EntityLivingBase extends Entity {\n private EntityLivingBase i;\n private int j;\n private EntityLivingBase bn;\n- private float bo;\n- private int bp;\n- private float bq;\n+ private int bo;\n+ private float bp;\n+ private int bq;\n+ private float br;\n \n // CanaryMod: Custom MaxHealth\n protected int maxHealth;\n \n public EntityLivingBase(World world) {\n super(world);\n- this.ax();\n- this.g(this.aP());\n+ this.ay();\n+ this.g(this.aS());\n this.m = true;\n this.aM = (float) (Math.random() + 1.0D) * 0.01F;\n this.b(this.u, this.v, this.w);\n@@ -99,11 +100,11 @@ protected void a() {\n this.ah.a(6, Float.valueOf(1.0F));\n }\n \n- protected void ax() {\n- this.aT().b(SharedMonsterAttributes.a);\n- this.aT().b(SharedMonsterAttributes.c);\n- this.aT().b(SharedMonsterAttributes.d);\n- if (!this.bb()) {\n+ protected void ay() {\n+ this.aW().b(SharedMonsterAttributes.a);\n+ this.aW().b(SharedMonsterAttributes.c);\n+ this.aW().b(SharedMonsterAttributes.d);\n+ if (!this.be()) {\n this.a(SharedMonsterAttributes.d).a(0.10000000149011612D);\n }\n }\n@@ -135,17 +136,17 @@ protected void a(double d0, boolean flag0) {\n super.a(d0, flag0);\n }\n \n- public boolean ay() {\n+ public boolean az() {\n return false;\n }\n \n public void x() {\n this.aD = this.aE;\n super.x();\n this.q.C.a(\"livingEntityBaseTick\");\n- if (this.R() && this.S()) {\n+ if (this.S() && this.T()) {\n // CanaryMod: call DamageHook (Suffocation)\n- DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1).call();\n+ DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1.0F).call();\n if (!hook.isCanceled()) {\n this.a((((CanaryDamageSource) hook.getDamageSource()).getHandle()), hook.getDamageDealt());\n }\n@@ -158,14 +159,14 @@ public void x() {\n \n boolean flag0 = this instanceof EntityPlayer && ((EntityPlayer) this).bG.a;\n \n- if (this.R() && this.a(Material.h)) {\n- if (!this.ay() && !this.i(Potion.o.H) && !flag0) {\n- this.g(this.h(this.aj()));\n- if (this.aj() == -20) {\n+ if (this.S() && this.a(Material.h)) {\n+ if (!this.az() && !this.i(Potion.o.H) && !flag0) {\n+ this.g(this.h(this.ak()));\n+ if (this.ak() == -20) {\n this.g(0);\n \n // CanaryMod - drowning damage.\n- DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2).call();\n+ DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2.0F).call();\n if (!hook.isCanceled()) {\n for (int i0 = 0; i0 < 8; ++i0) {\n float f0 = this.ab.nextFloat() - this.ab.nextFloat();\n@@ -182,7 +183,7 @@ public void x() {\n }\n \n this.A();\n- if (!this.q.I && this.ae() && this.o instanceof EntityLivingBase) {\n+ if (!this.q.I && this.af() && this.o instanceof EntityLivingBase) {\n this.a((Entity) null);\n }\n } else {\n@@ -202,8 +203,8 @@ public void x() {\n --this.af;\n }\n \n- if (this.aJ() <= 0.0F) {\n- this.az();\n+ if (this.aM() <= 0.0F) {\n+ this.aA();\n }\n \n if (this.aT > 0) {\n@@ -212,21 +213,15 @@ public void x() {\n this.aS = null;\n }\n \n- if (this.bn != null && !this.bn.R()) {\n+ if (this.bn != null && !this.bn.S()) {\n this.bn = null;\n }\n \n- if (this.i != null) {\n- if (!this.i.R()) {\n- this.b((EntityLivingBase) null);\n- } else if (this.j > 0) {\n- --this.j;\n- } else {\n- this.b((EntityLivingBase) null);\n- }\n+ if (this.i != null && !this.i.S()) {\n+ this.b((EntityLivingBase) null);\n }\n \n- this.aF();\n+ this.aI();\n this.aZ = this.aY;\n this.aO = this.aN;\n this.aQ = this.aP;\n@@ -239,12 +234,12 @@ public boolean g_() {\n return false;\n }\n \n- protected void az() {\n+ protected void aA() {\n ++this.aB;\n if (this.aB == 20) {\n int i0;\n \n- if (!this.q.I && (this.aT > 0 || this.aA()) && !this.g_() && this.q.O().b(\"doMobLoot\")) {\n+ if (!this.q.I && (this.aT > 0 || this.aB()) && !this.g_() && this.q.O().b(\"doMobLoot\")) {\n i0 = this.e(this.aS);\n \n while (i0 > 0) {\n@@ -277,45 +272,57 @@ protected int e(EntityPlayer entityplayer) {\n return 0;\n }\n \n- protected boolean aA() {\n+ protected boolean aB() {\n return false;\n }\n \n- public Random aB() {\n+ public Random aC() {\n return this.ab;\n }\n \n- public EntityLivingBase aC() {\n+ public EntityLivingBase aD() {\n return this.i;\n }\n \n+ public int aE() {\n+ return this.j;\n+ }\n+\n public void b(EntityLivingBase entitylivingbase) {\n this.i = entitylivingbase;\n- this.j = this.i != null ? 100 : 0;\n+ this.j = this.ac;\n }\n \n- public EntityLivingBase aD() {\n+ public EntityLivingBase aF() {\n return this.bn;\n }\n \n+ public int aG() {\n+ return this.bo;\n+ }\n+\n public void k(Entity entity) {\n if (entity instanceof EntityLivingBase) {\n this.bn = (EntityLivingBase) entity;\n+ } else {\n+ this.bn = null;\n }\n+\n+ this.bo = this.ac;\n }\n \n- public int aE() {\n+ public int aH() {\n return this.aV;\n }\n \n public void b(NBTTagCompound nbttagcompound) {\n- nbttagcompound.a(\"HealF\", this.aJ());\n- nbttagcompound.a(\"Health\", (short) ((int) Math.ceil((double) this.aJ())));\n+ nbttagcompound.a(\"HealF\", this.aM());\n+ nbttagcompound.a(\"Health\", (short) ((int) Math.ceil((double) this.aM())));\n nbttagcompound.a(\"HurtTime\", (short) this.ay);\n nbttagcompound.a(\"DeathTime\", (short) this.aB);\n nbttagcompound.a(\"AttackTime\", (short) this.aC);\n- nbttagcompound.a(\"AbsorptionAmount\", this.bj());\n- ItemStack[] aitemstack = this.ac();\n+ nbttagcompound.a(\"AbsorptionAmount\", this.bm());\n+ ItemStack[] aitemstack = this.ad();\n int i0 = aitemstack.length;\n \n int i1;\n@@ -328,8 +335,8 @@ public void b(NBTTagCompound nbttagcompound) {\n }\n }\n \n- nbttagcompound.a(\"Attributes\", (NBTBase) SharedMonsterAttributes.a(this.aT()));\n- aitemstack = this.ac();\n+ nbttagcompound.a(\"Attributes\", (NBTBase) SharedMonsterAttributes.a(this.aW()));\n+ aitemstack = this.ad();\n i0 = aitemstack.length;\n \n for (i1 = 0; i1 < i0; ++i1) {\n@@ -356,7 +363,7 @@ public void b(NBTTagCompound nbttagcompound) {\n public void a(NBTTagCompound nbttagcompound) {\n this.m(nbttagcompound.g(\"AbsorptionAmount\"));\n if (nbttagcompound.b(\"Attributes\") && this.q != null && !this.q.I) {\n- SharedMonsterAttributes.a(this.aT(), nbttagcompound.m(\"Attributes\"), this.q == null ? null : this.q.Y());\n+ SharedMonsterAttributes.a(this.aW(), nbttagcompound.m(\"Attributes\"), this.q == null ? null : this.q.Y());\n }\n \n if (nbttagcompound.b(\"ActiveEffects\")) {\n@@ -376,7 +383,7 @@ public void a(NBTTagCompound nbttagcompound) {\n NBTBase nbtbase = nbttagcompound.a(\"Health\");\n \n if (nbtbase == null) {\n- this.g(this.aP());\n+ this.g(this.aS());\n } else if (nbtbase.a() == 5) {\n this.g(((NBTTagFloat) nbtbase).a);\n } else if (nbtbase.a() == 2) {\n@@ -389,7 +396,7 @@ public void a(NBTTagCompound nbttagcompound) {\n this.aC = nbttagcompound.d(\"AttackTime\");\n }\n \n- protected void aF() {\n+ protected void aI() {\n Iterator iterator = this.f.keySet().iterator();\n \n while (iterator.hasNext()) {\n@@ -399,10 +406,10 @@ protected void aF() {\n if (!potioneffect.a(this)) {\n if (!this.q.I) {\n iterator.remove();\n- this.c(potioneffect);\n+ this.b(potioneffect);\n }\n } else if (potioneffect.b() % 600 == 0) {\n- this.b(potioneffect);\n+ this.a(potioneffect, false);\n }\n }\n \n@@ -431,7 +438,7 @@ protected void aF() {\n if (i0 > 0) {\n boolean flag1 = false;\n \n- if (!this.ah()) {\n+ if (!this.ai()) {\n flag1 = this.ab.nextBoolean();\n } else {\n flag1 = this.ab.nextInt(15) == 0;\n@@ -451,7 +458,7 @@ protected void aF() {\n }\n }\n \n- public void aG() {\n+ public void aJ() {\n Iterator iterator = this.f.keySet().iterator();\n \n while (iterator.hasNext()) {\n@@ -460,12 +467,12 @@ public void aG() {\n \n if (!this.q.I) {\n iterator.remove();\n- this.c(potioneffect);\n+ this.b(potioneffect);\n }\n }\n }\n \n- public Collection aH() {\n+ public Collection aK() {\n return this.f.values();\n }\n \n@@ -481,19 +488,19 @@ public PotionEffect b(Potion potion) {\n return (PotionEffect) this.f.get(Integer.valueOf(potion.H));\n }\n \n- public void d(PotionEffect potioneffect) {\n- if (this.e(potioneffect)) {\n+ public void c(PotionEffect potioneffect) {\n+ if (this.d(potioneffect)) {\n // CanaryMod: PotionEffectApplied\n PotionEffectAppliedHook hook = (PotionEffectAppliedHook) new PotionEffectAppliedHook((net.canarymod.api.entity.living.LivingBase) getCanaryEntity(), new CanaryPotionEffect(potioneffect)).call();\n if (hook.getPotionEffect() == null) {\n return;\n }\n potioneffect = ((CanaryPotionEffect) hook.getPotionEffect()).getHandle();\n //\n- if (this.e(potioneffect)) {\n+ if (this.d(potioneffect)) {\n if (this.f.containsKey(Integer.valueOf(potioneffect.a()))) {\n ((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a()))).a(potioneffect);\n- this.b((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())));\n+ this.a((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())), true);\n } else {\n this.f.put(Integer.valueOf(potioneffect.a()), potioneffect);\n this.a(potioneffect);\n@@ -502,8 +509,8 @@ public void d(PotionEffect potioneffect) {\n }\n }\n \n- public boolean e(PotionEffect potioneffect) {\n- if (this.aU() == EnumCreatureAttribute.b) {\n+ public boolean d(PotionEffect potioneffect) {\n+ if (this.aX() == EnumCreatureAttribute.b) {\n int i0 = potioneffect.a();\n \n if (i0 == Potion.l.H || i0 == Potion.u.H) {\n@@ -514,70 +521,67 @@ public boolean e(PotionEffect potioneffect) {\n return true;\n }\n \n- public boolean aI() {\n- return this.aU() == EnumCreatureAttribute.b;\n+ public boolean aL() {\n+ return this.aX() == EnumCreatureAttribute.b;\n }\n \n public void k(int i0) {\n PotionEffect potioneffect = (PotionEffect) this.f.remove(Integer.valueOf(i0));\n \n if (potioneffect != null) {\n- this.c(potioneffect);\n+ this.b(potioneffect);\n }\n }\n \n protected void a(PotionEffect potioneffect) {\n this.h = true;\n if (!this.q.I) {\n- Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\n+ Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\n }\n }\n \n- protected void b(PotionEffect potioneffect) {\n+ protected void a(PotionEffect potioneffect, boolean flag0) {\n this.h = true;\n- if (!this.q.I) {\n- Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\n- }\n-\n- if (!this.q.I) {\n- Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\n+ if (flag0 && !this.q.I) {\n+ Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\n+ Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\n }\n }\n \n- protected void c(PotionEffect potioneffect) {\n+ protected void b(PotionEffect potioneffect) {\n // CanaryMod: PotionEffectFinish\n new PotionEffectFinishHook((net.canarymod.api.entity.living.LivingBase) getCanaryEntity(), new CanaryPotionEffect(potioneffect)).call();\n //\n this.h = true;\n if (!this.q.I) {\n- Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\n+ Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\n }\n }\n \n public void f(float f0) {\n- float f1 = this.aJ();\n+ float f1 = this.aM();\n \n if (f1 > 0.0F) {\n this.g(f1 + f0);\n }\n }\n \n- public final float aJ() {\n+ public final float aM() {\n return this.ah.d(6);\n }\n \n public void g(float f0) {\n- this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aP())));\n+ this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aS())));\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (this.q.I) {\n return false;\n } else {\n this.aV = 0;\n- if (this.aJ() <= 0.0F) {\n+ if (this.aM() <= 0.0F) {\n return false;\n } else if (damagesource.m() && this.a(Potion.n)) {\n return false;\n@@ -629,7 +633,7 @@ public boolean a(DamageSource damagesource, float f0) {\n return false;\n }\n this.bc = f0;\n- this.ax = this.aJ();\n+ this.ax = this.aM();\n this.af = this.aI;\n this.d((((CanaryDamageSource) hook.getDamageSource()).getHandle()), hook.getDamageDealt());\n this.ay = this.az = 10;\n@@ -650,7 +654,7 @@ public boolean a(DamageSource damagesource, float f0) {\n } else if (entity instanceof EntityWolf) {\n EntityWolf entitywolf = (EntityWolf) entity;\n \n- if (entitywolf.bP()) {\n+ if (entitywolf.bT()) {\n this.aT = 100;\n this.aS = null;\n }\n@@ -679,14 +683,14 @@ public boolean a(DamageSource damagesource, float f0) {\n }\n }\n \n- if (this.aJ() <= 0.0F) {\n+ if (this.aM() <= 0.0F) {\n if (flag0) {\n- this.a(this.aL(), this.aW(), this.aX());\n+ this.a(this.aO(), this.aZ(), this.ba());\n }\n \n this.a(damagesource);\n } else if (flag0) {\n- this.a(this.aK(), this.aW(), this.aX());\n+ this.a(this.aN(), this.aZ(), this.ba());\n }\n \n return true;\n@@ -716,7 +720,7 @@ public void a(DamageSource damagesource) {\n new EntityDeathHook(this.getCanaryEntity(), damagesource.getCanaryDamageSource()).call();\n //\n Entity entity = damagesource.i();\n- EntityLivingBase entitylivingbase = this.aO();\n+ EntityLivingBase entitylivingbase = this.aR();\n \n if (this.bb >= 0 && entitylivingbase != null) {\n entitylivingbase.b(this, this.bb);\n@@ -770,11 +774,11 @@ public void a(Entity entity, float f0, double d0, double d1) {\n }\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"damage.hit\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"damage.hit\";\n }\n \n@@ -791,8 +795,8 @@ public boolean e() {\n return i3 == Block.aK.cF || i3 == Block.bz.cF;\n }\n \n- public boolean R() {\n- return !this.M && this.aJ() > 0.0F;\n+ public boolean S() {\n+ return !this.M && this.aM() > 0.0F;\n }\n \n protected void b(float f0) {\n@@ -825,9 +829,9 @@ protected void b(float f0) {\n }\n }\n \n- public int aM() {\n+ public int aP() {\n int i0 = 0;\n- ItemStack[] aitemstack = this.ac();\n+ ItemStack[] aitemstack = this.ad();\n int i1 = aitemstack.length;\n \n for (int i2 = 0; i2 < i1; ++i2) {\n@@ -847,7 +851,7 @@ protected void h(float f0) {}\n \n protected float b(DamageSource damagesource, float f0) {\n if (!damagesource.e()) {\n- int i0 = 25 - this.aM();\n+ int i0 = 25 - this.aP();\n float f1 = f0 * (float) i0;\n \n this.h(f0);\n@@ -876,7 +880,7 @@ protected float c(DamageSource damagesource, float f0) {\n if (f0 <= 0.0F) {\n return 0.0F;\n } else {\n- i0 = EnchantmentHelper.a(this.ac(), damagesource);\n+ i0 = EnchantmentHelper.a(this.ad(), damagesource);\n if (i0 > 20) {\n i0 = 20;\n }\n@@ -892,36 +896,36 @@ protected float c(DamageSource damagesource, float f0) {\n }\n \n protected void d(DamageSource damagesource, float f0) {\n- if (!this.ap()) {\n+ if (!this.aq()) {\n f0 = this.b(damagesource, f0);\n f0 = this.c(damagesource, f0);\n float f1 = f0;\n \n- f0 = Math.max(f0 - this.bj(), 0.0F);\n- this.m(this.bj() - (f1 - f0));\n+ f0 = Math.max(f0 - this.bm(), 0.0F);\n+ this.m(this.bm() - (f1 - f0));\n if (f0 != 0.0F) {\n- float f2 = this.aJ();\n+ float f2 = this.aM();\n \n this.g(f2 - f0);\n- this.aN().a(damagesource, f2, f0);\n- this.m(this.bj() - f0);\n+ this.aQ().a(damagesource, f2, f0);\n+ this.m(this.bm() - f0);\n }\n }\n }\n \n- public CombatTracker aN() {\n+ public CombatTracker aQ() {\n return this.e;\n }\n \n- public EntityLivingBase aO() {\n+ public EntityLivingBase aR() {\n return (EntityLivingBase) (this.e.c() != null ? this.e.c() : (this.aS != null ? this.aS : (this.i != null ? this.i : null)));\n }\n \n- public final float aP() {\n+ public final float aS() {\n return (float) this.a(SharedMonsterAttributes.a).e();\n }\n \n- public final int aQ() {\n+ public final int aT() {\n return this.ah.a(9);\n }\n \n@@ -933,7 +937,7 @@ private int h() {\n return this.a(Potion.e) ? 6 - (1 + this.b(Potion.e).c()) * 1 : (this.a(Potion.f) ? 6 + (1 + this.b(Potion.f).c()) * 2 : 6);\n }\n \n- public void aR() {\n+ public void aU() {\n if (!this.au || this.av >= this.h() / 2 || this.av < 0) {\n this.av = -1;\n this.au = true;\n@@ -947,7 +951,7 @@ protected void B() {\n this.a(DamageSource.i, 4.0F);\n }\n \n- protected void aS() {\n+ protected void aV() {\n int i0 = this.h();\n \n if (this.au) {\n@@ -964,55 +968,52 @@ protected void aS() {\n }\n \n public AttributeInstance a(Attribute attribute) {\n- return this.aT().a(attribute);\n+ return this.aW().a(attribute);\n }\n \n- public BaseAttributeMap aT() {\n+ public BaseAttributeMap aW() {\n if (this.d == null) {\n- if (this.q != null && !this.q.I) {\n- this.d = new ServersideAttributeMap();\n- } else {\n- this.d = new ClientsideAttributeMap();\n- }\n+ this.d = new ServersideAttributeMap();\n }\n \n return this.d;\n }\n \n- public EnumCreatureAttribute aU() {\n+ public EnumCreatureAttribute aX() {\n return EnumCreatureAttribute.a;\n }\n \n- public abstract ItemStack aV();\n+ public abstract ItemStack aY();\n \n public abstract ItemStack n(int i0);\n \n public abstract void c(int i0, ItemStack itemstack);\n \n public void c(boolean flag0) {\n super.c(flag0);\n- if (!this.q.I) {\n- AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n+ AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n \n+ if (attributeinstance.a(b) != null) {\n attributeinstance.b(c);\n- if (flag0) {\n- attributeinstance.a(c);\n- }\n+ }\n+\n+ if (flag0) {\n+ attributeinstance.a(c);\n }\n }\n \n- public abstract ItemStack[] ac();\n+ public abstract ItemStack[] ad();\n \n- protected float aW() {\n+ protected float aZ() {\n return 1.0F;\n }\n \n- protected float aX() {\n+ protected float ba() {\n return this.g_() ? (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.5F : (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F;\n }\n \n- protected boolean aY() {\n- return this.aJ() <= 0.0F;\n+ protected boolean bb() {\n+ return this.aM() <= 0.0F;\n }\n \n public void a(double d0, double d1, double d2) {\n@@ -1050,13 +1051,13 @@ public void l(Entity entity) {\n this.a(d0, d1, d2);\n }\n \n- protected void ba() {\n+ protected void bd() {\n this.y = 0.41999998688697815D;\n if (this.a(Potion.j)) {\n this.y += (double) ((float) (this.b(Potion.j).c() + 1) * 0.1F);\n }\n \n- if (this.ag()) {\n+ if (this.ah()) {\n float f0 = this.A * 0.017453292F;\n \n this.x -= (double) (MathHelper.a(f0) * 0.2F);\n@@ -1071,7 +1072,7 @@ public void e(float f0, float f1) {\n \n if (this.G() && (!(this instanceof EntityPlayer) || !((EntityPlayer) this).bG.b)) {\n d0 = this.v;\n- this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n+ this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n this.d(this.x, this.y, this.z);\n this.x *= 0.800000011920929D;\n this.y *= 0.800000011920929D;\n@@ -1107,7 +1108,7 @@ public void e(float f0, float f1) {\n float f4;\n \n if (this.F) {\n- f4 = this.bc() * f3;\n+ f4 = this.bf() * f3;\n } else {\n f4 = this.aR;\n }\n@@ -1147,7 +1148,7 @@ public void e(float f0, float f1) {\n this.y = -0.15D;\n }\n \n- boolean flag0 = this.af() && this instanceof EntityPlayer;\n+ boolean flag0 = this.ag() && this instanceof EntityPlayer;\n \n if (flag0 && this.y < 0.0D) {\n this.y = 0.0D;\n@@ -1187,31 +1188,31 @@ public void e(float f0, float f1) {\n this.aH += this.aG;\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return false;\n }\n \n- public float bc() {\n- return this.bb() ? this.bo : 0.1F;\n+ public float bf() {\n+ return this.be() ? this.bp : 0.1F;\n }\n \n public void i(float f0) {\n- this.bo = f0;\n+ this.bp = f0;\n }\n \n public boolean m(Entity entity) {\n this.k(entity);\n return false;\n }\n \n- public boolean bd() {\n+ public boolean bg() {\n return false;\n }\n \n public void l_() {\n super.l_();\n if (!this.q.I) {\n- int i0 = this.aQ();\n+ int i0 = this.aT();\n \n if (i0 > 0) {\n if (this.aw <= 0) {\n@@ -1337,8 +1338,8 @@ protected float f(float f0, float f1) {\n }\n \n public void c() {\n- if (this.bp > 0) {\n- --this.bp;\n+ if (this.bq > 0) {\n+ --this.bq;\n }\n \n if (this.bh > 0) {\n@@ -1352,7 +1353,7 @@ public void c() {\n --this.bh;\n this.b(d0, d1, d2);\n this.b(this.A, this.B);\n- } else if (!this.bi()) {\n+ } else if (!this.bl()) {\n this.x *= 0.98D;\n this.y *= 0.98D;\n this.z *= 0.98D;\n@@ -1371,41 +1372,41 @@ public void c() {\n }\n \n this.q.C.a(\"ai\");\n- if (this.aY()) {\n+ if (this.bb()) {\n this.bd = false;\n this.be = 0.0F;\n this.bf = 0.0F;\n this.bg = 0.0F;\n- } else if (this.bi()) {\n- if (this.bb()) {\n+ } else if (this.bl()) {\n+ if (this.be()) {\n this.q.C.a(\"newAi\");\n- this.be();\n+ this.bh();\n this.q.C.b();\n } else {\n this.q.C.a(\"oldAi\");\n- this.bh();\n+ this.bk();\n this.q.C.b();\n this.aP = this.A;\n }\n }\n // CanaryMod: NPC Addition, this is vital for pathfinding\n // Just call the \"newAi\" method up there ^^\n if (this instanceof EntityNonPlayableCharacter) {\n- this.be();\n+ this.bh();\n }// END\n this.q.C.b();\n this.q.C.a(\"jump\");\n if (this.bd) {\n if (!this.G() && !this.I()) {\n- if (this.F && this.bp == 0) {\n- this.ba();\n- this.bp = 10;\n+ if (this.F && this.bq == 0) {\n+ this.bd();\n+ this.bq = 10;\n }\n } else {\n this.y += 0.03999999910593033D;\n }\n } else {\n- this.bp = 0;\n+ this.bq = 0;\n }\n \n this.q.C.b();\n@@ -1417,15 +1418,15 @@ public void c() {\n this.q.C.b();\n this.q.C.a(\"push\");\n if (!this.q.I) {\n- this.bf();\n+ this.bi();\n }\n \n this.q.C.b();\n }\n \n- protected void be() {}\n+ protected void bh() {}\n \n- protected void bf() {\n+ protected void bi() {\n List list = this.q.b((Entity) this, this.E.b(0.20000000298023224D, 0.0D, 0.20000000298023224D));\n \n if (list != null && !list.isEmpty()) {\n@@ -1443,16 +1444,16 @@ protected void n(Entity entity) {\n entity.f((Entity) this);\n }\n \n- public void T() {\n- super.T();\n+ public void U() {\n+ super.U();\n this.aW = this.aX;\n this.aX = 0.0F;\n this.T = 0.0F;\n }\n \n- protected void bg() {}\n+ protected void bj() {}\n \n- protected void bh() {\n+ protected void bk() {\n ++this.aV;\n }\n \n@@ -1482,7 +1483,7 @@ public boolean o(Entity entity) {\n return this.q.a(this.q.V().a(this.u, this.v + (double) this.f(), this.w), this.q.V().a(entity.u, entity.v + (double) entity.f(), entity.w)) == null;\n }\n \n- public Vec3 Y() {\n+ public Vec3 Z() {\n return this.j(1.0F);\n }\n \n@@ -1510,7 +1511,7 @@ public Vec3 j(float f0) {\n }\n }\n \n- public boolean bi() {\n+ public boolean bl() {\n return !this.q.I;\n }\n \n@@ -1530,20 +1531,32 @@ protected void J() {\n this.J = this.ab.nextDouble() >= this.a(SharedMonsterAttributes.c).e();\n }\n \n- public float an() {\n+ public float ao() {\n return this.aP;\n }\n \n- public float bj() {\n- return this.bq;\n+ public float bm() {\n+ return this.br;\n }\n \n public void m(float f0) {\n if (f0 < 0.0F) {\n f0 = 0.0F;\n }\n \n- this.bq = f0;\n+ this.br = f0;\n+ }\n+\n+ public Team bn() {\n+ return null;\n+ }\n+\n+ public boolean c(EntityLivingBase entitylivingbase) {\n+ return this.a(entitylivingbase.bn());\n+ }\n+\n+ public boolean a(Team team) {\n+ return this.bn() != null ? this.bn().a(team) : false;\n }\n \n // CanaryMod","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLivingBase.java","sha":"2234a8a65e7277e6f158408b3dfc05f4dbe4b648","status":"modified"},{"additions":24,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMagmaCube.java","changes":50,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMagmaCube.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":26,"filename":"src/main/java/net/minecraft/server/EntityMagmaCube.java","new_code":" protected void ay() {\n super.ay();\n public boolean bs() {\n public int aP() {\n return this.bR() * 3;\n protected String bJ() {\n protected EntitySlime bK() {\n if (i1 > 0 && this.bR() > 1) {\n public boolean ae() {\n protected int bL() {\n return super.bL() * 4;\n protected void bM() {\n protected void bd() {\n this.y = (double) (0.42F + (float) this.bR() * 0.1F);\n protected boolean bN() {\n protected int bO() {\n return super.bO() + 2;\n protected String aN() {\n return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n protected String aO() {\n return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n protected String bP() {\n return this.bR() > 1 ? \"mob.magmacube.big\" : \"mob.magmacube.small\";\n protected boolean bQ() {","new_methods":[],"old_code":"\n\n protected void ax() {\n super.ax();\n public boolean bo() {\n public int aM() {\n return this.bN() * 3;\n protected String bF() {\n protected EntitySlime bG() {\n if (i1 > 0 && this.bN() > 1) {\n public boolean ad() {\n protected int bH() {\n return super.bH() * 4;\n protected void bI() {\n protected void ba() {\n this.y = (double) (0.42F + (float) this.bN() * 0.1F);\n protected boolean bJ() {\n protected int bK() {\n return super.bK() + 2;\n protected String aK() {\n return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n protected String aL() {\n return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n protected String bL() {\n return this.bN() > 1 ? \"mob.magmacube.big\" : \"mob.magmacube.small\";\n protected boolean bM() {","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.monster.CanaryMagmaCube;\n \n-\n public class EntityMagmaCube extends EntitySlime {\n \n public EntityMagmaCube(World world) {\n@@ -13,28 +11,28 @@ public EntityMagmaCube(World world) {\n this.entity = new CanaryMagmaCube(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.d).a(0.20000000298023224D);\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n return this.q.r > 0 && this.q.b(this.E) && this.q.a((Entity) this, this.E).isEmpty() && !this.q.d(this.E);\n }\n \n- public int aM() {\n- return this.bN() * 3;\n+ public int aP() {\n+ return this.bR() * 3;\n }\n \n public float d(float f0) {\n return 1.0F;\n }\n \n- protected String bF() {\n+ protected String bJ() {\n return \"flame\";\n }\n \n- protected EntitySlime bG() {\n+ protected EntitySlime bK() {\n return new EntityMagmaCube(this.q);\n }\n \n@@ -45,7 +43,7 @@ protected int s() {\n protected void b(boolean flag0, int i0) {\n int i1 = this.s();\n \n- if (i1 > 0 && this.bN() > 1) {\n+ if (i1 > 0 && this.bR() > 1) {\n int i2 = this.ab.nextInt(4) - 2;\n \n if (i0 > 0) {\n@@ -58,50 +56,50 @@ protected void b(boolean flag0, int i0) {\n }\n }\n \n- public boolean ad() {\n+ public boolean ae() {\n return false;\n }\n \n- protected int bH() {\n- return super.bH() * 4;\n+ protected int bL() {\n+ return super.bL() * 4;\n }\n \n- protected void bI() {\n+ protected void bM() {\n this.h *= 0.9F;\n }\n \n- protected void ba() {\n- this.y = (double) (0.42F + (float) this.bN() * 0.1F);\n+ protected void bd() {\n+ this.y = (double) (0.42F + (float) this.bR() * 0.1F);\n this.an = true;\n }\n \n protected void b(float f0) {}\n \n- protected boolean bJ() {\n+ protected boolean bN() {\n return true;\n }\n \n- protected int bK() {\n- return super.bK() + 2;\n+ protected int bO() {\n+ return super.bO() + 2;\n }\n \n- protected String aK() {\n- return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n+ protected String aN() {\n+ return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n }\n \n- protected String aL() {\n- return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n+ protected String aO() {\n+ return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n }\n \n- protected String bL() {\n- return this.bN() > 1 ? \"mob.magmacube.big\" : \"mob.magmacube.small\";\n+ protected String bP() {\n+ return this.bR() > 1 ? \"mob.magmacube.big\" : \"mob.magmacube.small\";\n }\n \n public boolean I() {\n return false;\n }\n \n- protected boolean bM() {\n+ protected boolean bQ() {\n return true;\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMagmaCube.java","sha":"2a5ccfa6a744831ea16d923985781d33ee7583ad","status":"modified"},{"additions":5,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecart.java","changes":10,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecart.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":5,"filename":"src/main/java/net/minecraft/server/EntityMinecart.java","new_code":" public double X() {\n if (this.aq()) {\n this.ao = this.ab();\n public String am() {\n return this.c != null ? this.c : super.am();","new_methods":[],"old_code":" public double W() {\n if (this.ap()) {\n this.ao = this.aa();\n public String al() {\n return this.c != null ? this.c : super.al();","old_methods":[],"patch":"@@ -95,13 +95,13 @@ public EntityMinecart(World world, double d0, double d1, double d2) {\n this.t = d2;\n }\n \n- public double W() {\n+ public double X() {\n return (double) this.P * 0.0D - 0.30000001192092896D;\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n if (!this.q.I && !this.M) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n // CanaryMod: VehicleDamage\n@@ -195,7 +195,7 @@ public void l_() {\n if (Configuration.getWorldConfig(getCanaryWorld().getFqName()).isNetherAllowed()) {\n if (this.o == null && this.aq++ >= i0) {\n this.aq = i0;\n- this.ao = this.aa();\n+ this.ao = this.ab();\n byte b0;\n \n if (this.q.t.i == -1) {\n@@ -831,8 +831,8 @@ public void a(String s0) {\n this.c = s0;\n }\n \n- public String al() {\n- return this.c != null ? this.c : super.al();\n+ public String am() {\n+ return this.c != null ? this.c : super.am();\n }\n \n public boolean c() {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecart.java","sha":"d273247f4f96a43016246e27ff5d7ab0bf16b94d","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartChest.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartChest.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/EntityMinecartChest.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.vehicle.CanaryChestMinecart;\n \n-\n public class EntityMinecartChest extends EntityMinecartContainer {\n \n public EntityMinecartChest(World world) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartChest.java","sha":"b458c4cec2e73d916302b59cab0dcfa7cb6c1888","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartContainer.java","changes":1,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartContainer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/EntityMinecartContainer.java","new_code":"","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public abstract class EntityMinecartContainer extends EntityMinecart implements IInventory {\n \n public ItemStack[] a = new ItemStack[36]; // CanaryMod: private -> public","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartContainer.java","sha":"ddb13b60263930ad796d2b452fceeb9e75a808aa","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartFurnace.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartFurnace.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/EntityMinecartFurnace.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.vehicle.CanaryFurnaceMinecart;\n \n-\n public class EntityMinecartFurnace extends EntityMinecart {\n \n public int c; // CanaryMod: private -> public","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartFurnace.java","sha":"dba18f40493073652843ed7595416f133f3dac76","status":"modified"},{"additions":11,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartHopper.java","changes":24,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartHopper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":13,"filename":"src/main/java/net/minecraft/server/EntityMinecartHopper.java","new_code":" if (flag1 != this.ay()) {\n public boolean ay() {\n public World az() {\n public double aA() {\n public double aB() {\n public double aC() {\n if (!this.q.I && this.S() && this.ay()) {\n if (!this.aE()) {\n if (this.aD()) {\n public boolean aD() {\n public boolean aE() {","new_methods":[],"old_code":"\n\n if (flag1 != this.ax()) {\n public boolean ax() {\n public World ay() {\n public double az() {\n public double aA() {\n public double aB() {\n if (!this.q.I && this.R() && this.ax()) {\n if (!this.aD()) {\n if (this.aC()) {\n public boolean aC() {\n public boolean aD() {","old_methods":[],"patch":"@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n import net.canarymod.api.entity.vehicle.CanaryHopperMinecart;\n \n-\n public class EntityMinecartHopper extends EntityMinecartContainer implements Hopper {\n \n private boolean a = true;\n@@ -47,50 +45,50 @@ public boolean c(EntityPlayer entityplayer) {\n public void a(int i0, int i1, int i2, boolean flag0) {\n boolean flag1 = !flag0;\n \n- if (flag1 != this.ax()) {\n+ if (flag1 != this.ay()) {\n this.f(flag1);\n }\n }\n \n- public boolean ax() {\n+ public boolean ay() {\n return this.a;\n }\n \n public void f(boolean flag0) {\n this.a = flag0;\n }\n \n- public World ay() {\n+ public World az() {\n return this.q;\n }\n \n- public double az() {\n+ public double aA() {\n return this.u;\n }\n \n- public double aA() {\n+ public double aB() {\n return this.v;\n }\n \n- public double aB() {\n+ public double aC() {\n return this.w;\n }\n \n public void l_() {\n super.l_();\n- if (!this.q.I && this.R() && this.ax()) {\n+ if (!this.q.I && this.S() && this.ay()) {\n --this.b;\n- if (!this.aD()) {\n+ if (!this.aE()) {\n this.l(0);\n- if (this.aC()) {\n+ if (this.aD()) {\n this.l(4);\n this.e();\n }\n }\n }\n }\n \n- public boolean aC() {\n+ public boolean aD() {\n if (TileEntityHopper.a((Hopper) this)) {\n return true;\n } else {\n@@ -123,7 +121,7 @@ public void l(int i0) {\n this.b = i0;\n }\n \n- public boolean aD() {\n+ public boolean aE() {\n return this.b > 0;\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartHopper.java","sha":"6f30698a2deaf455bdc685a0ad50c3c28749d97d","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartMobSpawner.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartMobSpawner.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/EntityMinecartMobSpawner.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.vehicle.CanaryMobSpawnerMinecart;\n \n-\n public class EntityMinecartMobSpawner extends EntityMinecart {\n \n public final MobSpawnerBaseLogic a = new EntityMinecartMobSpawnerLogic(this); // CanaryMod: private -> public","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartMobSpawner.java","sha":"944b93c38fe0ffcaea4dc047298c6bfa8c13ea88","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartTNT.java","changes":8,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartTNT.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":5,"filename":"src/main/java/net/minecraft/server/EntityMinecartTNT.java","new_code":" public boolean ay() {\n return this.ay() && (BlockRailBase.e_(block.cF) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? 0.0F : super.a(explosion, world, i0, i1, i2, block);\n return this.ay() && (BlockRailBase.e_(i3) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? false : super.a(explosion, world, i0, i1, i2, i3, f0);","new_methods":[],"old_code":"\n\n public boolean ax() {\n return this.ax() && (BlockRailBase.e_(block.cF) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? 0.0F : super.a(explosion, world, i0, i1, i2, block);\n return this.ax() && (BlockRailBase.e_(i3) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? false : super.a(explosion, world, i0, i1, i2, i3, f0);","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.vehicle.CanaryTNTMinecart;\n \n-\n public class EntityMinecartTNT extends EntityMinecart {\n \n public int a = -1; // CanaryMod: private -> public\n@@ -94,16 +92,16 @@ public void d() {\n }\n }\n \n- public boolean ax() {\n+ public boolean ay() {\n return this.a > -1;\n }\n \n public float a(Explosion explosion, World world, int i0, int i1, int i2, Block block) {\n- return this.ax() && (BlockRailBase.e_(block.cF) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? 0.0F : super.a(explosion, world, i0, i1, i2, block);\n+ return this.ay() && (BlockRailBase.e_(block.cF) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? 0.0F : super.a(explosion, world, i0, i1, i2, block);\n }\n \n public boolean a(Explosion explosion, World world, int i0, int i1, int i2, int i3, float f0) {\n- return this.ax() && (BlockRailBase.e_(i3) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? false : super.a(explosion, world, i0, i1, i2, i3, f0);\n+ return this.ay() && (BlockRailBase.e_(i3) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? false : super.a(explosion, world, i0, i1, i2, i3, f0);\n }\n \n protected void a(NBTTagCompound nbttagcompound) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartTNT.java","sha":"8915ff7be6981b7718f1c8bca413a6d5fce9ec74","status":"modified"},{"additions":8,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMob.java","changes":16,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMob.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":8,"filename":"src/main/java/net/minecraft/server/EntityMob.java","new_code":" this.aV();\n protected Entity bL() {\n if (this.aq()) {\n public boolean bs() {\n return this.q.r > 0 && this.i_() && super.bs();\n protected void ay() {\n super.ay();\n this.aW().b(SharedMonsterAttributes.e);","new_methods":[],"old_code":" this.aS();\n protected Entity bH() {\n if (this.ap()) {\n public boolean bo() {\n return this.q.r > 0 && this.i_() && super.bo();\n protected void ax() {\n super.ax();\n this.aT().b(SharedMonsterAttributes.e);","old_methods":[],"patch":"@@ -10,7 +10,7 @@ public EntityMob(World world) {\n }\n \n public void c() {\n- this.aS();\n+ this.aV();\n float f0 = this.d(1.0F);\n \n if (f0 > 0.5F) {\n@@ -27,14 +27,14 @@ public void l_() {\n }\n }\n \n- protected Entity bH() {\n+ protected Entity bL() {\n EntityPlayer entityplayer = this.q.b(this, 16.0D);\n \n return entityplayer != null && this.o(entityplayer) ? entityplayer : null;\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (super.a(damagesource, f0)) {\n Entity entity = damagesource.i();\n@@ -128,12 +128,12 @@ protected boolean i_() {\n }\n }\n \n- public boolean bo() {\n- return this.q.r > 0 && this.i_() && super.bo();\n+ public boolean bs() {\n+ return this.q.r > 0 && this.i_() && super.bs();\n }\n \n- protected void ax() {\n- super.ax();\n- this.aT().b(SharedMonsterAttributes.e);\n+ protected void ay() {\n+ super.ay();\n+ this.aW().b(SharedMonsterAttributes.e);\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMob.java","sha":"881e6ba8a6205803a7d2352eb44be2cc851660fa","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMooshroom.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMooshroom.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/EntityMooshroom.java","new_code":" entitycow.g(this.aM());","new_methods":[],"old_code":"\n\n entitycow.g(this.aJ());","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.animal.CanaryMooshroom;\n \n-\n public class EntityMooshroom extends EntityCow {\n \n public EntityMooshroom(World world) {\n@@ -34,7 +32,7 @@ public boolean a(EntityPlayer entityplayer) {\n EntityCow entitycow = new EntityCow(this.q);\n \n entitycow.b(this.u, this.v, this.w, this.A, this.B);\n- entitycow.g(this.aJ());\n+ entitycow.g(this.aM());\n entitycow.aN = this.aN;\n this.q.d((Entity) entitycow);\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMooshroom.java","sha":"1fa8761b7d3333578984c8d3a846ac17166ed0f7","status":"modified"},{"additions":25,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityOcelot.java","changes":50,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityOcelot.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":25,"filename":"src/main/java/net/minecraft/server/EntityOcelot.java","new_code":" public void bj() {\n return !this.bT() && this.ac > 2400;\n public boolean be() {\n protected void ay() {\n super.ay();\n nbttagcompound.a(\"CatType\", this.ca());\n return this.bT() ? (this.bY() ? \"mob.cat.purr\" : (this.ab.nextInt(4) == 0 ? \"mob.cat.purreow\" : \"mob.cat.meow\")) : \"\";\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (this.aq()) {\n if (this.bT()) {\n this.bp.a(!this.bU());\n this.j(true);\n this.i(true);\n this.i(false);\n if (this.bT()) {\n entityocelot.j(true);\n entityocelot.p(this.ca());\n } else if (!this.bT()) {\n return !entityocelot.bT() ? false : this.bY() && entityocelot.bY();\n public int ca() {\n public boolean bs() {\n public String am() {\n return this.bB() ? this.bA() : (this.bT() ? \"entity.Cat.name\" : super.am());","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityOcelot.java","implementation":"return !this.bT() && this.ac > 2400;\n public boolean be() {\n protected void ay() {\n super.ay();\n nbttagcompound.a(\"CatType\", this.ca());\n return this.bT() ? (this.bY() ? \"mob.cat.purr\" : (this.ab.nextInt(4) == 0 ? \"mob.cat.purreow\" : \"mob.cat.meow\")) : \"\";\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (this.aq()) {\n if (this.bT()) {\n this.bp.a(!this.bU());\n this.j(true);\n this.i(true);\n this.i(false);\n if (this.bT()) {\n entityocelot.j(true);\n entityocelot.p(this.ca());","signature":"void bj()"}],"old_code":" public void bg() {\n return !this.bP() && this.ac > 2400;\n public boolean bb() {\n protected void ax() {\n super.ax();\n nbttagcompound.a(\"CatType\", this.bW());\n return this.bP() ? (this.bU() ? \"mob.cat.purr\" : (this.ab.nextInt(4) == 0 ? \"mob.cat.purreow\" : \"mob.cat.meow\")) : \"\";\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (this.ap()) {\n if (this.bP()) {\n this.bp.a(!this.bQ());\n this.k(true);\n this.j(true);\n this.j(false);\n if (this.bP()) {\n entityocelot.k(true);\n entityocelot.p(this.bW());\n } else if (!this.bP()) {\n return !entityocelot.bP() ? false : this.bU() && entityocelot.bU();\n public int bW() {\n public boolean bo() {\n public String al() {\n return this.bx() ? this.bw() : (this.bP() ? \"entity.Cat.name\" : super.al());","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityOcelot.java","implementation":"return !this.bP() && this.ac > 2400;\n public boolean bb() {\n protected void ax() {\n super.ax();\n nbttagcompound.a(\"CatType\", this.bW());\n return this.bP() ? (this.bU() ? \"mob.cat.purr\" : (this.ab.nextInt(4) == 0 ? \"mob.cat.purreow\" : \"mob.cat.meow\")) : \"\";\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (this.ap()) {\n if (this.bP()) {\n this.bp.a(!this.bQ());\n this.k(true);\n this.j(true);\n this.j(false);\n if (this.bP()) {\n entityocelot.k(true);\n entityocelot.p(this.bW());","signature":"void bg()"}],"patch":"@@ -31,7 +31,7 @@ protected void a() {\n this.ah.a(18, Byte.valueOf((byte) 0));\n }\n \n- public void bg() {\n+ public void bj() {\n if (this.i().a()) {\n double d0 = this.i().b();\n \n@@ -52,15 +52,15 @@ public void bg() {\n }\n \n protected boolean t() {\n- return !this.bP() && this.ac > 2400;\n+ return !this.bT() && this.ac > 2400;\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(10.0D);\n this.a(SharedMonsterAttributes.d).a(0.30000001192092896D);\n }\n@@ -69,7 +69,7 @@ protected void b(float f0) {}\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"CatType\", this.bW());\n+ nbttagcompound.a(\"CatType\", this.ca());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n@@ -78,18 +78,18 @@ public void a(NBTTagCompound nbttagcompound) {\n }\n \n protected String r() {\n- return this.bP() ? (this.bU() ? \"mob.cat.purr\" : (this.ab.nextInt(4) == 0 ? \"mob.cat.purreow\" : \"mob.cat.meow\")) : \"\";\n+ return this.bT() ? (this.bY() ? \"mob.cat.purr\" : (this.ab.nextInt(4) == 0 ? \"mob.cat.purreow\" : \"mob.cat.meow\")) : \"\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.cat.hitt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.cat.hitt\";\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 0.4F;\n }\n \n@@ -102,7 +102,7 @@ public boolean m(Entity entity) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n this.bp.a(false);\n@@ -115,9 +115,9 @@ protected void b(boolean flag0, int i0) {}\n public boolean a(EntityPlayer entityplayer) {\n ItemStack itemstack = entityplayer.bn.h();\n \n- if (this.bP()) {\n+ if (this.bT()) {\n if (entityplayer.c_().equalsIgnoreCase(this.h_()) && !this.q.I && !this.c(itemstack)) {\n- this.bp.a(!this.bQ());\n+ this.bp.a(!this.bU());\n }\n } else if (this.bq.f() && itemstack != null && itemstack.d == Item.aW.cv && entityplayer.e(this) < 9.0D) {\n if (!entityplayer.bG.d) {\n@@ -134,14 +134,14 @@ public boolean a(EntityPlayer entityplayer) {\n \n if (hook.isTamed() && !hook.isCanceled()) {\n //\n- this.k(true);\n+ this.j(true);\n this.p(1 + this.q.s.nextInt(3));\n this.b(entityplayer.c_());\n- this.j(true);\n+ this.i(true);\n this.bp.a(true);\n this.q.a((Entity) this, (byte) 7);\n } else {\n- this.j(false);\n+ this.i(false);\n this.q.a((Entity) this, (byte) 6);\n }\n }\n@@ -155,10 +155,10 @@ public boolean a(EntityPlayer entityplayer) {\n public EntityOcelot b(EntityAgeable entityageable) {\n EntityOcelot entityocelot = new EntityOcelot(this.q);\n \n- if (this.bP()) {\n+ if (this.bT()) {\n entityocelot.b(this.h_());\n- entityocelot.k(true);\n- entityocelot.p(this.bW());\n+ entityocelot.j(true);\n+ entityocelot.p(this.ca());\n }\n \n return entityocelot;\n@@ -171,26 +171,26 @@ public boolean c(ItemStack itemstack) {\n public boolean a(EntityAnimal entityanimal) {\n if (entityanimal == this) {\n return false;\n- } else if (!this.bP()) {\n+ } else if (!this.bT()) {\n return false;\n } else if (!(entityanimal instanceof EntityOcelot)) {\n return false;\n } else {\n EntityOcelot entityocelot = (EntityOcelot) entityanimal;\n \n- return !entityocelot.bP() ? false : this.bU() && entityocelot.bU();\n+ return !entityocelot.bT() ? false : this.bY() && entityocelot.bY();\n }\n }\n \n- public int bW() {\n+ public int ca() {\n return this.ah.a(18);\n }\n \n public void p(int i0) {\n this.ah.b(18, Byte.valueOf((byte) i0));\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n if (this.q.s.nextInt(3) == 0) {\n return false;\n } else {\n@@ -214,8 +214,8 @@ public boolean bo() {\n }\n }\n \n- public String al() {\n- return this.bx() ? this.bw() : (this.bP() ? \"entity.Cat.name\" : super.al());\n+ public String am() {\n+ return this.bB() ? this.bA() : (this.bT() ? \"entity.Cat.name\" : super.am());\n }\n \n public EntityLivingData a(EntityLivingData entitylivingdata) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityOcelot.java","sha":"23e021761c9a4c8d6df6dc4d5c70421a819a53e0","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPainting.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPainting.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/EntityPainting.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import net.canarymod.api.entity.hanging.CanaryPainting;\n \n-\n public class EntityPainting extends EntityHanging {\n \n public EnumArt e;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPainting.java","sha":"07a41626a01638a184f4209cc8178b89f43329ea","status":"modified"},{"additions":18,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPig.java","changes":36,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPig.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":18,"filename":"src/main/java/net/minecraft/server/EntityPig.java","new_code":" public boolean be() {\n protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {\n } else if (this.bT() && !this.q.I && (this.n == null || this.n == entityplayer)) {\n return this.ae() ? Item.at.cv : Item.as.cv;\n if (this.ae()) {\n if (this.bT()) {\n public boolean bT() {\n public void i(boolean flag0) {\n public EntityAIControlledByPlayer bU() {","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityPig.java","implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","signature":"boolean be()"}],"old_code":" public boolean bb() {\n protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {\n } else if (this.bP() && !this.q.I && (this.n == null || this.n == entityplayer)) {\n return this.ad() ? Item.at.cv : Item.as.cv;\n if (this.ad()) {\n if (this.bP()) {\n public boolean bP() {\n public void j(boolean flag0) {\n public EntityAIControlledByPlayer bQ() {","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityPig.java","implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","signature":"boolean bb()"}],"patch":"@@ -23,22 +23,22 @@ public EntityPig(World world) {\n this.entity = new CanaryPig(this); // CanaryMod: Wrap Entity\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(10.0D);\n this.a(SharedMonsterAttributes.d).a(0.25D);\n }\n \n- protected void be() {\n- super.be();\n+ protected void bh() {\n+ super.bh();\n }\n \n- public boolean bu() {\n- ItemStack itemstack = ((EntityPlayer) this.n).aV();\n+ public boolean by() {\n+ ItemStack itemstack = ((EntityPlayer) this.n).aY();\n \n return itemstack != null && itemstack.d == Item.bT.cv;\n }\n@@ -50,23 +50,23 @@ protected void a() {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"Saddle\", this.bP());\n+ nbttagcompound.a(\"Saddle\", this.bT());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n super.a(nbttagcompound);\n- this.j(nbttagcompound.n(\"Saddle\"));\n+ this.i(nbttagcompound.n(\"Saddle\"));\n }\n \n protected String r() {\n return \"mob.pig.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.pig.say\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.pig.death\";\n }\n \n@@ -77,7 +77,7 @@ protected void a(int i0, int i1, int i2, int i3) {\n public boolean a(EntityPlayer entityplayer) {\n if (super.a(entityplayer)) {\n return true;\n- } else if (this.bP() && !this.q.I && (this.n == null || this.n == entityplayer)) {\n+ } else if (this.bT() && !this.q.I && (this.n == null || this.n == entityplayer)) {\n entityplayer.a((Entity) this);\n return true;\n } else {\n@@ -86,30 +86,30 @@ public boolean a(EntityPlayer entityplayer) {\n }\n \n protected int s() {\n- return this.ad() ? Item.at.cv : Item.as.cv;\n+ return this.ae() ? Item.at.cv : Item.as.cv;\n }\n \n protected void b(boolean flag0, int i0) {\n int i1 = this.ab.nextInt(3) + 1 + this.ab.nextInt(1 + i0);\n \n for (int i2 = 0; i2 < i1; ++i2) {\n- if (this.ad()) {\n+ if (this.ae()) {\n this.b(Item.at.cv, 1);\n } else {\n this.b(Item.as.cv, 1);\n }\n }\n \n- if (this.bP()) {\n+ if (this.bT()) {\n this.b(Item.aC.cv, 1);\n }\n }\n \n- public boolean bP() {\n+ public boolean bT() {\n return (this.ah.a(16) & 1) != 0;\n }\n \n- public void j(boolean flag0) {\n+ public void i(boolean flag0) {\n if (flag0) {\n this.ah.b(16, Byte.valueOf((byte) 1));\n } else {\n@@ -142,7 +142,7 @@ public boolean c(ItemStack itemstack) {\n return itemstack != null && itemstack.d == Item.bM.cv;\n }\n \n- public EntityAIControlledByPlayer bQ() {\n+ public EntityAIControlledByPlayer bU() {\n return this.bp;\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPig.java","sha":"8b8ab00a24d171ee328530aac1de177b4f9b7117","status":"modified"},{"additions":12,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPigZombie.java","changes":24,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPigZombie.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":12,"filename":"src/main/java/net/minecraft/server/EntityPigZombie.java","new_code":" protected void ay() {\n super.ay();\n protected boolean be() {\n this.a(\"mob.zombiepig.zpigangry\", this.aZ() * 2.0F, ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 1.8F);\n public boolean bs() {\n protected Entity bL() {\n return this.bs == 0 ? null : super.bL();\n if (this.aq()) {\n protected String aN() {\n protected String aO() {\n protected void bw() {\n this.i(false);","new_methods":[],"old_code":" protected void ax() {\n super.ax();\n protected boolean bb() {\n this.a(\"mob.zombiepig.zpigangry\", this.aW() * 2.0F, ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 1.8F);\n public boolean bo() {\n protected Entity bH() {\n return this.bs == 0 ? null : super.bH();\n if (this.ap()) {\n protected String aK() {\n protected String aL() {\n protected void bs() {\n this.j(false);","old_methods":[],"patch":"@@ -19,14 +19,14 @@ public EntityPigZombie(World world) {\n this.entity = new CanaryPigZombie(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(bp).a(0.0D);\n this.a(SharedMonsterAttributes.d).a(0.5D);\n this.a(SharedMonsterAttributes.e).a(5.0D);\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return false;\n }\n \n@@ -42,13 +42,13 @@ public void l_() {\n \n this.bu = this.j;\n if (this.bt > 0 && --this.bt == 0) {\n- this.a(\"mob.zombiepig.zpigangry\", this.aW() * 2.0F, ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 1.8F);\n+ this.a(\"mob.zombiepig.zpigangry\", this.aZ() * 2.0F, ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 1.8F);\n }\n \n super.l_();\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n return this.q.r > 0 && this.q.b(this.E) && this.q.a((Entity) this, this.E).isEmpty() && !this.q.d(this.E);\n }\n \n@@ -62,12 +62,12 @@ public void a(NBTTagCompound nbttagcompound) {\n this.bs = nbttagcompound.d(\"Anger\");\n }\n \n- protected Entity bH() {\n- return this.bs == 0 ? null : super.bH();\n+ protected Entity bL() {\n+ return this.bs == 0 ? null : super.bL();\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n Entity entity = damagesource.i();\n@@ -106,11 +106,11 @@ protected String r() {\n return \"mob.zombiepig.zpig\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.zombiepig.zpighurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.zombiepig.zpigdeath\";\n }\n \n@@ -142,13 +142,13 @@ protected int s() {\n return Item.bo.cv;\n }\n \n- protected void bs() {\n+ protected void bw() {\n this.c(0, new ItemStack(Item.I));\n }\n \n public EntityLivingData a(EntityLivingData entitylivingdata) {\n super.a(entitylivingdata);\n- this.j(false);\n+ this.i(false);\n return entitylivingdata;\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPigZombie.java","sha":"dab36a27089fbaa81be8755d103edb6f44be0d2f","status":"modified"},{"additions":105,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayer.java","changes":246,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":141,"filename":"src/main/java/net/minecraft/server/EntityPlayer.java","new_code":" protected void ay() {\n super.ay();\n this.aW().b(SharedMonsterAttributes.e).a(1.0D);\n public boolean bq() {\n public void bs() {\n this.bt();\n public void bt() {\n public boolean bu() {\n return this.bq() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\n this.bt();\n if (this.bg()) {\n if (this.ae() && this.bG.a) {\n public int ab() {\n this.bt();\n protected boolean bb() {\n return this.aM() <= 0.0F || this.bg();\n public void U() {\n if (!this.q.I && this.ag()) {\n super.U();\n protected void bk() {\n super.bk();\n this.aV();\n if (this.q.r == 0 && this.aM() < this.aS() && this.q.O().b(\"naturalRegeneration\") && this.ac % 20 * 12 == 0) {\n if (this.ah()) {\n if (!this.F || this.aM() <= 0.0F) {\n if (this.F || this.aM() <= 0.0F) {\n if (this.aM() > 0.0F) {\n public int bv() {\n int i1 = this.bv();\n Collection collection = this.bL().a(ScoreObjectiveCriteria.e);\n collection.addAll(this.bL().a(ScoreObjectiveCriteria.d));\n Score score = this.bL().a(this.am(), scoreobjective);\n nbttagcompound.a(\"Score\", this.bv());\n if (this.aq()) {\n if (this.aM() <= 0.0F) {\n if (this.bg() && !this.q.I) {\n Team team = this.bn();\n Team team1 = entityplayer.bn();\n return team == null ? true : (!team.a(team1) ? true : team.g());\n public int aP() {\n public float bw() {\n if (!this.aq()) {\n if (!damagesource.e() && this.bu() && f0 > 0.0F) {\n f0 = Math.max(f0 - this.bm(), 0.0F);\n this.m(this.bm() - (f1 - f0));\n float f2 = this.aM();\n this.g(this.aM() - f0);\n this.aQ().a(damagesource, f2, f0);\n ItemStack itemstack = this.bx();\n this.by();\n if (itemstack != null && itemstack == this.bx()) {\n this.by();\n public ItemStack bx() {\n public void by() {\n public double W() {\n if (entity.ap()) {\n if (this.ah()) {\n if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ae()) {\n ItemStack itemstack = this.bx();\n this.by();\n public boolean T() {\n return !this.bC && super.T();\n if (this.bg() || !this.S()) {\n if (this.af()) {\n public boolean bg() {\n public boolean bC() {\n public ChunkCoordinates bE() {\n public boolean bF() {\n protected void bd() {\n super.bd();\n if (this.ah()) {\n public float bf() {\n if (this.ah()) {\n public void al() {\n super.al();\n this.bJ += (float) i0 / (float) this.bG();\n for (this.bI += i0; this.bJ >= 1.0F; this.bJ /= (float) this.bG()) {\n this.bJ = (this.bJ - 1.0F) * (float) this.bG();\n public int bG() {\n public FoodStats bH() {\n public boolean bI() {\n return this.aM() > 0.0F && this.aM() < this.aS();\n if (this.bx() != null) {\n ItemStack itemstack = this.bx();\n protected boolean aB() {\n public String am() {\n this.g(entityplayer.aM());\n this.c(entityplayer.bv());\n this.c(entityplayer.bv());\n public InventoryEnderChest bJ() {\n public ItemStack aY() {\n public ItemStack[] ad() {\n public boolean aw() {\n public Scoreboard bL() {\n public Team bn() {\n return this.bL().i(this.bu);\n public String ax() {\n return ScorePlayerTeam.a(this.bn(), this.bu);\n public float bm() {\n this.bI -= (float) i / (float) this.bG();\n for (this.bI -= i; this.bJ < 0.0F; this.bJ = this.bJ / this.bG() + 1.0F) {\n this.bJ *= this.bG();\n this.bJ = this.bI / (float) this.bG();\n this.bJ = (this.bJ - 1.0F) * this.bG();\n this.bJ /= this.bG();","new_methods":[],"old_code":" protected void ax() {\n super.ax();\n this.aT().b(SharedMonsterAttributes.e).a(1.0D);\n public boolean bm() {\n public void bo() {\n this.bp();\n public void bp() {\n public boolean bq() {\n return this.bm() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\n this.bp();\n if (this.bd()) {\n if (this.ad() && this.bG.a) {\n public int aa() {\n this.bp();\n protected boolean aY() {\n return this.aJ() <= 0.0F || this.bd();\n public void T() {\n if (!this.q.I && this.af()) {\n super.T();\n protected void bh() {\n super.bh();\n this.aS();\n if (this.q.r == 0 && this.aJ() < this.aP() && this.q.O().b(\"naturalRegeneration\") && this.ac % 20 * 12 == 0) {\n if (this.ag()) {\n if (!this.F || this.aJ() <= 0.0F) {\n if (this.F || this.aJ() <= 0.0F) {\n if (this.aJ() > 0.0F) {\n public int br() {\n int i1 = this.br();\n Collection collection = this.bH().a(ScoreObjectiveCriteria.e);\n collection.addAll(this.bH().a(ScoreObjectiveCriteria.d));\n Score score = this.bH().a(this.al(), scoreobjective);\n nbttagcompound.a(\"Score\", this.br());\n if (this.ap()) {\n if (this.aJ() <= 0.0F) {\n if (this.bd() && !this.q.I) {\n if (entity instanceof EntityLivingBase) {\n this.a((EntityLivingBase) entity, false);\n }\n\n ScorePlayerTeam scoreplayerteam = this.bI();\n ScorePlayerTeam scoreplayerteam1 = entityplayer.bI();\n\n return scoreplayerteam != scoreplayerteam1 ? true : (scoreplayerteam != null ? scoreplayerteam.g() : true);\n }\n\n protected void a(EntityLivingBase entitylivingbase, boolean flag0) {\n if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\n if (entitylivingbase instanceof EntityWolf) {\n EntityWolf entitywolf = (EntityWolf) entitylivingbase;\n\n if (entitywolf.bP() && this.bu.equals(entitywolf.h_())) {\n return;\n }\n }\n\n if (!(entitylivingbase instanceof EntityPlayer) || this.a((EntityPlayer) entitylivingbase)) {\n if (!(entitylivingbase instanceof EntityHorse) || !((EntityHorse) entitylivingbase).bS()) {\n List list = this.q.a(EntityWolf.class, AxisAlignedBB.a().a(this.u, this.v, this.w, this.u + 1.0D, this.v + 1.0D, this.w + 1.0D).b(16.0D, 4.0D, 16.0D));\n Iterator iterator = list.iterator();\n\n while (iterator.hasNext()) {\n EntityWolf entitywolf1 = (EntityWolf) iterator.next();\n if (entitywolf1.bP() && entitywolf1.bJ() == null && this.bu.equals(entitywolf1.h_()) && (!flag0 || !entitywolf1.bQ())) {\n entitywolf1.l(false);\n entitywolf1.b((Entity) entitylivingbase);\n }\n }\n }\n }\n }\n public int aM() {\n public float bs() {\n if (!this.ap()) {\n if (!damagesource.e() && this.bq() && f0 > 0.0F) {\n f0 = Math.max(f0 - this.bj(), 0.0F);\n this.m(this.bj() - (f1 - f0));\n float f2 = this.aJ();\n this.g(this.aJ() - f0);\n this.aN().a(damagesource, f2, f0);\n ItemStack itemstack = this.bt();\n this.bu();\n if (itemstack != null && itemstack == this.bt()) {\n this.bu();\n public ItemStack bt() {\n public void bu() {\n public double V() {\n if (entity.ao()) {\n if (this.ag()) {\n if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ad()) {\n ItemStack itemstack = this.bt();\n this.bu();\n if (entity.R()) {\n this.a((EntityLivingBase) entity, true);\n }\n\n public boolean S() {\n return !this.bC && super.S();\n if (this.bd() || !this.R()) {\n if (this.ae()) {\n public boolean bd() {\n public boolean by() {\n public ChunkCoordinates bA() {\n public boolean bB() {\n protected void ba() {\n super.ba();\n if (this.ag()) {\n public float bc() {\n if (this.ag()) {\n public void ak() {\n super.ak();\n this.bJ += (float) i0 / (float) this.bC();\n for (this.bI += i0; this.bJ >= 1.0F; this.bJ /= (float) this.bC()) {\n this.bJ = (this.bJ - 1.0F) * (float) this.bC();\n public int bC() {\n public FoodStats bD() {\n public boolean bE() {\n return this.aJ() > 0.0F && this.aJ() < this.aP();\n if (this.bt() != null) {\n ItemStack itemstack = this.bt();\n protected boolean aA() {\n public String al() {\n this.g(entityplayer.aJ());\n this.c(entityplayer.br());\n this.c(entityplayer.br());\n public InventoryEnderChest bF() {\n public ItemStack aV() {\n public ItemStack[] ac() {\n public boolean av() {\n public Scoreboard bH() {\n public ScorePlayerTeam bI() {\n return this.bH().i(this.bu);\n public String aw() {\n return ScorePlayerTeam.a(this.bI(), this.bu);\n public float bj() {\n this.bI -= (float) i / (float) this.bC();\n for (this.bI -= i; this.bJ < 0.0F; this.bJ = this.bJ / this.bC() + 1.0F) {\n this.bJ *= this.bC();\n this.bJ = this.bI / (float) this.bC();\n this.bJ = (this.bJ - 1.0F) * this.bC();\n this.bJ /= this.bC();","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityPlayer.java","implementation":"super.ax();\n this.aT().b(SharedMonsterAttributes.e).a(1.0D);\n public boolean bm() {\n public void bo() {\n this.bp();\n public void bp() {\n public boolean bq() {\n return this.bm() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\n this.bp();\n if (this.bd()) {\n if (this.ad() && this.bG.a) {\n public int aa() {\n this.bp();\n protected boolean aY() {\n return this.aJ() <= 0.0F || this.bd();\n public void T() {\n if (!this.q.I && this.af()) {\n super.T();\n protected void bh() {\n super.bh();\n this.aS();\n if (this.q.r == 0 && this.aJ() < this.aP() && this.q.O().b(\"naturalRegeneration\") && this.ac % 20 * 12 == 0) {\n if (this.ag()) {\n if (!this.F || this.aJ() <= 0.0F) {\n if (this.F || this.aJ() <= 0.0F) {\n if (this.aJ() > 0.0F) {\n public int br() {\n int i1 = this.br();\n Collection collection = this.bH().a(ScoreObjectiveCriteria.e);\n collection.addAll(this.bH().a(ScoreObjectiveCriteria.d));\n Score score = this.bH().a(this.al(), scoreobjective);\n nbttagcompound.a(\"Score\", this.br());\n if (this.ap()) {\n if (this.aJ() <= 0.0F) {\n if (this.bd() && !this.q.I) {\n if (entity instanceof EntityLivingBase) {\n this.a((EntityLivingBase) entity, false);","signature":"void ax()"},{"arguments":["EntityLivingBase entitylivingbase"," boolean flag0"],"filename":"src/main/java/net/minecraft/server/EntityPlayer.java","implementation":"if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\n if (entitylivingbase instanceof EntityWolf) {\n EntityWolf entitywolf = (EntityWolf) entitylivingbase;\n\n if (entitywolf.bP() && this.bu.equals(entitywolf.h_())) {\n return;","signature":"void a(EntityLivingBase entitylivingbase, boolean flag0)"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityPlayer.java","implementation":"public float bs() {\n if (!this.ap()) {\n if (!damagesource.e() && this.bq() && f0 > 0.0F) {\n f0 = Math.max(f0 - this.bj(), 0.0F);\n this.m(this.bj() - (f1 - f0));\n float f2 = this.aJ();\n this.g(this.aJ() - f0);\n this.aN().a(damagesource, f2, f0);\n ItemStack itemstack = this.bt();\n this.bu();\n if (itemstack != null && itemstack == this.bt()) {\n this.bu();\n public ItemStack bt() {\n public void bu() {\n public double V() {\n if (entity.ao()) {\n if (this.ag()) {\n if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ad()) {\n ItemStack itemstack = this.bt();\n this.bu();\n if (entity.R()) {\n this.a((EntityLivingBase) entity, true);","signature":"int aM()"}],"patch":"@@ -82,9 +82,9 @@ public EntityType getEntityType() {\n };\n }\n \n- protected void ax() {\n- super.ax();\n- this.aT().b(SharedMonsterAttributes.e).a(1.0D);\n+ protected void ay() {\n+ super.ay();\n+ this.aW().b(SharedMonsterAttributes.e).a(1.0D);\n }\n \n protected void a() {\n@@ -94,28 +94,28 @@ protected void a() {\n this.ah.a(18, Integer.valueOf(0));\n }\n \n- public boolean bm() {\n+ public boolean bq() {\n return this.f != null;\n }\n \n- public void bo() {\n+ public void bs() {\n if (this.f != null) {\n this.f.b(this.q, this, this.g);\n }\n \n- this.bp();\n+ this.bt();\n }\n \n- public void bp() {\n+ public void bt() {\n this.f = null;\n this.g = 0;\n if (!this.q.I) {\n this.e(false);\n }\n }\n \n- public boolean bq() {\n- return this.bm() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\n+ public boolean bu() {\n+ return this.bq() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\n }\n \n public void l_() {\n@@ -131,15 +131,15 @@ public void l_() {\n this.n();\n }\n } else {\n- this.bp();\n+ this.bt();\n }\n }\n \n if (this.bv > 0) {\n --this.bv;\n }\n \n- if (this.bd()) {\n+ if (this.bg()) {\n ++this.b;\n if (this.b > 100) {\n this.b = 100;\n@@ -165,7 +165,7 @@ public void l_() {\n this.bp = this.bo;\n }\n \n- if (this.ad() && this.bG.a) {\n+ if (this.ae() && this.bG.a) {\n this.A();\n }\n \n@@ -218,7 +218,7 @@ public int y() {\n return this.bG.a ? 0 : 80;\n }\n \n- public int aa() {\n+ public int ab() {\n return 10;\n }\n \n@@ -262,12 +262,12 @@ protected void n() {\n }\n }\n \n- this.bp();\n+ this.bt();\n }\n }\n \n- protected boolean aY() {\n- return this.aJ() <= 0.0F || this.bd();\n+ protected boolean bb() {\n+ return this.aM() <= 0.0F || this.bg();\n }\n \n protected void i() {\n@@ -290,8 +290,8 @@ public void a(Entity entity) {\n }\n }\n \n- public void T() {\n- if (!this.q.I && this.af()) {\n+ public void U() {\n+ if (!this.q.I && this.ag()) {\n this.a((Entity) null);\n this.b(false);\n } else {\n@@ -301,7 +301,7 @@ public void T() {\n float f0 = this.A;\n float f1 = this.B;\n \n- super.T();\n+ super.U();\n this.bs = this.bt;\n this.bt = 0.0F;\n this.k(this.u - d0, this.v - d1, this.w - d2);\n@@ -313,17 +313,17 @@ public void T() {\n }\n }\n \n- protected void bh() {\n- super.bh();\n- this.aS();\n+ protected void bk() {\n+ super.bk();\n+ this.aV();\n }\n \n public void c() {\n if (this.br > 0) {\n --this.br;\n }\n \n- if (this.q.r == 0 && this.aJ() < this.aP() && this.q.O().b(\"naturalRegeneration\") && this.ac % 20 * 12 == 0) {\n+ if (this.q.r == 0 && this.aM() < this.aS() && this.q.O().b(\"naturalRegeneration\") && this.ac % 20 * 12 == 0) {\n this.f(1.0F);\n }\n \n@@ -337,7 +337,7 @@ public void c() {\n }\n \n this.aR = this.bL;\n- if (this.ag()) {\n+ if (this.ah()) {\n this.aR = (float) ((double) this.aR + (double) this.bL * 0.3D);\n }\n \n@@ -349,17 +349,17 @@ public void c() {\n f0 = 0.1F;\n }\n \n- if (!this.F || this.aJ() <= 0.0F) {\n+ if (!this.F || this.aM() <= 0.0F) {\n f0 = 0.0F;\n }\n \n- if (this.F || this.aJ() <= 0.0F) {\n+ if (this.F || this.aM() <= 0.0F) {\n f1 = 0.0F;\n }\n \n this.bt += (f0 - this.bt) * 0.4F;\n this.aK += (f1 - this.aK) * 0.8F;\n- if (this.aJ() > 0.0F) {\n+ if (this.aM() > 0.0F) {\n AxisAlignedBB axisalignedbb = null;\n \n if (this.o != null && !this.o.M) {\n@@ -386,7 +386,7 @@ private void r(Entity entity) {\n entity.b_(this);\n }\n \n- public int br() {\n+ public int bv() {\n return this.ah.c(18);\n }\n \n@@ -395,7 +395,7 @@ public void c(int i0) {\n }\n \n public void p(int i0) {\n- int i1 = this.br();\n+ int i1 = this.bv();\n \n this.ah.b(18, Integer.valueOf(i1 + i0));\n }\n@@ -426,11 +426,11 @@ public void a(DamageSource damagesource) {\n \n public void b(Entity entity, int i0) {\n this.p(i0);\n- Collection collection = this.bH().a(ScoreObjectiveCriteria.e);\n+ Collection collection = this.bL().a(ScoreObjectiveCriteria.e);\n \n if (entity instanceof EntityPlayer) {\n this.a(StatList.A, 1);\n- collection.addAll(this.bH().a(ScoreObjectiveCriteria.d));\n+ collection.addAll(this.bL().a(ScoreObjectiveCriteria.d));\n } else {\n this.a(StatList.z, 1);\n }\n@@ -439,7 +439,7 @@ public void b(Entity entity, int i0) {\n \n while (iterator.hasNext()) {\n ScoreObjective scoreobjective = (ScoreObjective) iterator.next();\n- Score score = this.bH().a(this.al(), scoreobjective);\n+ Score score = this.bL().a(this.am(), scoreobjective);\n \n score.a();\n }\n@@ -594,7 +594,7 @@ public void b(NBTTagCompound nbttagcompound) {\n nbttagcompound.a(\"XpP\", this.bJ);\n nbttagcompound.a(\"XpLevel\", this.bH);\n nbttagcompound.a(\"XpTotal\", this.bI);\n- nbttagcompound.a(\"Score\", this.br());\n+ nbttagcompound.a(\"Score\", this.bv());\n if (this.c != null) {\n nbttagcompound.a(\"SpawnX\", this.c.a);\n nbttagcompound.a(\"SpawnY\", this.c.b);\n@@ -633,16 +633,16 @@ protected void d_() {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (this.bG.a && !damagesource.g()) {\n return false;\n } else {\n this.aV = 0;\n- if (this.aJ() <= 0.0F) {\n+ if (this.aM() <= 0.0F) {\n return false;\n } else {\n- if (this.bd() && !this.q.I) {\n+ if (this.bg() && !this.q.I) {\n this.a(true, true, false);\n }\n \n@@ -669,10 +669,6 @@ public boolean a(DamageSource damagesource, float f0) {\n entity = ((EntityArrow) entity).c;\n }\n \n- if (entity instanceof EntityLivingBase) {\n- this.a((EntityLivingBase) entity, false);\n- }\n-\n this.a(StatList.x, Math.round(f0 * 10.0F));\n return super.a(damagesource, f0);\n }\n@@ -681,49 +677,21 @@ public boolean a(DamageSource damagesource, float f0) {\n }\n \n public boolean a(EntityPlayer entityplayer) {\n- ScorePlayerTeam scoreplayerteam = this.bI();\n- ScorePlayerTeam scoreplayerteam1 = entityplayer.bI();\n-\n- return scoreplayerteam != scoreplayerteam1 ? true : (scoreplayerteam != null ? scoreplayerteam.g() : true);\n- }\n-\n- protected void a(EntityLivingBase entitylivingbase, boolean flag0) {\n- if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\n- if (entitylivingbase instanceof EntityWolf) {\n- EntityWolf entitywolf = (EntityWolf) entitylivingbase;\n-\n- if (entitywolf.bP() && this.bu.equals(entitywolf.h_())) {\n- return;\n- }\n- }\n-\n- if (!(entitylivingbase instanceof EntityPlayer) || this.a((EntityPlayer) entitylivingbase)) {\n- if (!(entitylivingbase instanceof EntityHorse) || !((EntityHorse) entitylivingbase).bS()) {\n- List list = this.q.a(EntityWolf.class, AxisAlignedBB.a().a(this.u, this.v, this.w, this.u + 1.0D, this.v + 1.0D, this.w + 1.0D).b(16.0D, 4.0D, 16.0D));\n- Iterator iterator = list.iterator();\n-\n- while (iterator.hasNext()) {\n- EntityWolf entitywolf1 = (EntityWolf) iterator.next();\n+ Team team = this.bn();\n+ Team team1 = entityplayer.bn();\n \n- if (entitywolf1.bP() && entitywolf1.bJ() == null && this.bu.equals(entitywolf1.h_()) && (!flag0 || !entitywolf1.bQ())) {\n- entitywolf1.l(false);\n- entitywolf1.b((Entity) entitylivingbase);\n- }\n- }\n- }\n- }\n- }\n+ return team == null ? true : (!team.a(team1) ? true : team.g());\n }\n \n protected void h(float f0) {\n this.bn.a(f0);\n }\n \n- public int aM() {\n+ public int aP() {\n return this.bn.l();\n }\n \n- public float bs() {\n+ public float bw() {\n int i0 = 0;\n ItemStack[] aitemstack = this.bn.b;\n int i1 = aitemstack.length;\n@@ -740,23 +708,23 @@ public float bs() {\n }\n \n protected void d(DamageSource damagesource, float f0) {\n- if (!this.ap()) {\n- if (!damagesource.e() && this.bq() && f0 > 0.0F) {\n+ if (!this.aq()) {\n+ if (!damagesource.e() && this.bu() && f0 > 0.0F) {\n f0 = (1.0F + f0) * 0.5F;\n }\n \n f0 = this.b(damagesource, f0);\n f0 = this.c(damagesource, f0);\n float f1 = f0;\n \n- f0 = Math.max(f0 - this.bj(), 0.0F);\n- this.m(this.bj() - (f1 - f0));\n+ f0 = Math.max(f0 - this.bm(), 0.0F);\n+ this.m(this.bm() - (f1 - f0));\n if (f0 != 0.0F) {\n this.a(damagesource.f());\n- float f2 = this.aJ();\n+ float f2 = this.aM();\n \n- this.g(this.aJ() - f0);\n- this.aN().a(damagesource, f2, f0);\n+ this.g(this.aM() - f0);\n+ this.aQ().a(damagesource, f2, f0);\n }\n }\n }\n@@ -776,7 +744,7 @@ public void a(IMerchant imerchant, String s0) {}\n public void c(ItemStack itemstack) {}\n \n public boolean p(Entity entity) {\n- ItemStack itemstack = this.bt();\n+ ItemStack itemstack = this.bx();\n ItemStack itemstack1 = itemstack != null ? itemstack.m() : null;\n if (entity.c(this)) {\n return true;\n@@ -794,15 +762,15 @@ public boolean p(Entity entity) {\n \n if (itemstack.a(this, (EntityLivingBase) entity)) {\n if (itemstack.b <= 0 && !this.bG.d) {\n- this.bu();\n+ this.by();\n }\n \n return true;\n }\n }\n- if (itemstack != null && itemstack == this.bt()) {\n+ if (itemstack != null && itemstack == this.bx()) {\n if (itemstack.b <= 0 && !this.bG.d) {\n- this.bu();\n+ this.by();\n } else if (itemstack.b < itemstack1.b && this.bG.d) {\n itemstack.b = itemstack1.b;\n }\n@@ -812,20 +780,20 @@ public boolean p(Entity entity) {\n }\n }\n \n- public ItemStack bt() {\n+ public ItemStack bx() {\n return this.bn.h();\n }\n \n- public void bu() {\n+ public void by() {\n this.bn.a(this.bn.c, (ItemStack) null);\n }\n \n- public double V() {\n+ public double W() {\n return (double) (this.N - 0.5F);\n }\n \n public void q(Entity entity) {\n- if (entity.ao()) {\n+ if (entity.ap()) {\n if (!entity.i(this)) {\n float f0 = (float) this.a(SharedMonsterAttributes.e).e();\n int i0 = 0;\n@@ -836,7 +804,7 @@ public void q(Entity entity) {\n i0 += EnchantmentHelper.b(this, (EntityLivingBase) entity);\n }\n \n- if (this.ag()) {\n+ if (this.ah()) {\n ++i0;\n }\n \n@@ -851,7 +819,7 @@ public void q(Entity entity) {\n boolean flag1 = false;\n int i1 = EnchantmentHelper.a((EntityLivingBase) this);\n \n- if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ad()) {\n+ if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ae()) {\n flag1 = true;\n entity.d(1);\n }\n@@ -884,7 +852,7 @@ public void q(Entity entity) {\n }\n }\n \n- ItemStack itemstack = this.bt();\n+ ItemStack itemstack = this.bx();\n Object object = entity;\n \n if (entity instanceof EntityDragonPart) {\n@@ -898,15 +866,11 @@ public void q(Entity entity) {\n if (itemstack != null && object instanceof EntityLivingBase) {\n itemstack.a((EntityLivingBase) object, this);\n if (itemstack.b <= 0) {\n- this.bu();\n+ this.by();\n }\n }\n \n if (entity instanceof EntityLivingBase) {\n- if (entity.R()) {\n- this.a((EntityLivingBase) entity, true);\n- }\n-\n this.a(StatList.w, Math.round(f0 * 10.0F));\n if (i1 > 0 && flag2) {\n entity.d(i1 * 4);\n@@ -933,13 +897,13 @@ public void w() {\n }\n }\n \n- public boolean S() {\n- return !this.bC && super.S();\n+ public boolean T() {\n+ return !this.bC && super.T();\n }\n \n public EnumStatus a(int i0, int i1, int i2) {\n if (!this.q.I) {\n- if (this.bd() || !this.R()) {\n+ if (this.bg() || !this.S()) {\n return EnumStatus.e;\n }\n \n@@ -964,7 +928,7 @@ public EnumStatus a(int i0, int i1, int i2) {\n }\n }\n \n- if (this.ae()) {\n+ if (this.af()) {\n this.a((Entity) null);\n }\n \n@@ -1088,11 +1052,11 @@ public static ChunkCoordinates a(World world, ChunkCoordinates chunkcoordinates,\n }\n }\n \n- public boolean bd() {\n+ public boolean bg() {\n return this.bC;\n }\n \n- public boolean by() {\n+ public boolean bC() {\n return this.bC && this.b >= 100;\n }\n \n@@ -1108,11 +1072,11 @@ protected void b(int i0, boolean flag0) {\n \n public void a(String s0) {}\n \n- public ChunkCoordinates bA() {\n+ public ChunkCoordinates bE() {\n return this.c;\n }\n \n- public boolean bB() {\n+ public boolean bF() {\n return this.d;\n }\n \n@@ -1132,10 +1096,10 @@ public void a(StatBase statbase) {\n \n public void a(StatBase statbase, int i0) {}\n \n- protected void ba() {\n- super.ba();\n+ protected void bd() {\n+ super.bd();\n this.a(StatList.u, 1);\n- if (this.ag()) {\n+ if (this.ah()) {\n this.a(0.8F);\n } else {\n this.a(0.2F);\n@@ -1162,7 +1126,7 @@ public void e(float f0, float f1) {\n this.j(this.u - d0, this.v - d1, this.w - d2);\n }\n \n- public float bc() {\n+ public float bf() {\n return (float) this.a(SharedMonsterAttributes.d).e();\n }\n \n@@ -1190,7 +1154,7 @@ public void j(double d0, double d1, double d2) {\n i0 = Math.round(MathHelper.a(d0 * d0 + d2 * d2) * 100.0F);\n if (i0 > 0) {\n this.a(StatList.l, i0);\n- if (this.ag()) {\n+ if (this.ah()) {\n this.a(0.099999994F * (float) i0 * 0.01F);\n } else {\n this.a(0.01F * (float) i0 * 0.01F);\n@@ -1242,9 +1206,9 @@ public void a(EntityLivingBase entitylivingbase) {\n }\n }\n \n- public void ak() {\n+ public void al() {\n if (!this.bG.b) {\n- super.ak();\n+ super.al();\n }\n }\n \n@@ -1260,10 +1224,10 @@ public void s(int i0) {\n i0 = i1;\n }\n \n- this.bJ += (float) i0 / (float) this.bC();\n+ this.bJ += (float) i0 / (float) this.bG();\n \n- for (this.bI += i0; this.bJ >= 1.0F; this.bJ /= (float) this.bC()) {\n- this.bJ = (this.bJ - 1.0F) * (float) this.bC();\n+ for (this.bI += i0; this.bJ >= 1.0F; this.bJ /= (float) this.bG()) {\n+ this.bJ = (this.bJ - 1.0F) * (float) this.bG();\n this.a(1);\n }\n }\n@@ -1287,7 +1251,7 @@ public void a(int i0) {\n }\n }\n \n- public int bC() {\n+ public int bG() {\n return this.bH >= 30 ? 62 + (this.bH - 30) * 7 : (this.bH >= 15 ? 17 + (this.bH - 15) * 3 : 17);\n }\n \n@@ -1299,16 +1263,16 @@ public void a(float f0) {\n }\n }\n \n- public FoodStats bD() {\n+ public FoodStats bH() {\n return this.bq;\n }\n \n public boolean g(boolean flag0) {\n return (flag0 || this.bq.c()) && !this.bG.a;\n }\n \n- public boolean bE() {\n- return this.aJ() > 0.0F && this.aJ() < this.aP();\n+ public boolean bI() {\n+ return this.aM() > 0.0F && this.aM() < this.aS();\n }\n \n public void a(ItemStack itemstack, int i0) {\n@@ -1334,8 +1298,8 @@ public boolean d(int i0, int i1, int i2) {\n return true;\n }\n \n- if (this.bt() != null) {\n- ItemStack itemstack = this.bt();\n+ if (this.bx() != null) {\n+ ItemStack itemstack = this.bx();\n \n if (itemstack.b(block) || itemstack.a(block) > 1.0F) {\n return true;\n@@ -1361,30 +1325,30 @@ protected int e(EntityPlayer entityplayer) {\n }\n }\n \n- protected boolean aA() {\n+ protected boolean aB() {\n return true;\n }\n \n- public String al() {\n+ public String am() {\n return this.bu;\n }\n \n public void a(EntityPlayer entityplayer, boolean flag0) {\n if (flag0) {\n this.bn.b(entityplayer.bn);\n- this.g(entityplayer.aJ());\n+ this.g(entityplayer.aM());\n this.bq = entityplayer.bq;\n this.bH = entityplayer.bH;\n this.bI = entityplayer.bI;\n this.bJ = entityplayer.bJ;\n- this.c(entityplayer.br());\n+ this.c(entityplayer.bv());\n this.as = entityplayer.as;\n } else if (this.q.O().b(\"keepInventory\")) {\n this.bn.b(entityplayer.bn);\n this.bH = entityplayer.bH;\n this.bI = entityplayer.bI;\n this.bJ = entityplayer.bJ;\n- this.c(entityplayer.br());\n+ this.c(entityplayer.bv());\n }\n \n this.a = entityplayer.a;\n@@ -1406,40 +1370,40 @@ public World f_() {\n return this.q;\n }\n \n- public InventoryEnderChest bF() {\n+ public InventoryEnderChest bJ() {\n return this.a;\n }\n \n public ItemStack n(int i0) {\n return i0 == 0 ? this.bn.h() : this.bn.b[i0 - 1];\n }\n \n- public ItemStack aV() {\n+ public ItemStack aY() {\n return this.bn.h();\n }\n \n public void c(int i0, ItemStack itemstack) {\n this.bn.b[i0] = itemstack;\n }\n \n- public ItemStack[] ac() {\n+ public ItemStack[] ad() {\n return this.bn.b;\n }\n \n- public boolean av() {\n+ public boolean aw() {\n return !this.bG.b;\n }\n \n- public Scoreboard bH() {\n+ public Scoreboard bL() {\n return this.q.X();\n }\n \n- public ScorePlayerTeam bI() {\n- return this.bH().i(this.bu);\n+ public Team bn() {\n+ return this.bL().i(this.bu);\n }\n \n- public String aw() {\n- return ScorePlayerTeam.a(this.bI(), this.bu);\n+ public String ax() {\n+ return ScorePlayerTeam.a(this.bn(), this.bu);\n }\n \n public void m(float f0) {\n@@ -1450,7 +1414,7 @@ public void m(float f0) {\n this.u().b(17, Float.valueOf(f0));\n }\n \n- public float bj() {\n+ public float bm() {\n return this.u().d(17);\n }\n \n@@ -1466,11 +1430,11 @@ public void removeXP(int i) {\n i = this.bI;\n }\n \n- this.bI -= (float) i / (float) this.bC();\n+ this.bI -= (float) i / (float) this.bG();\n \n // Inverse of for loop in this.t(int)\n- for (this.bI -= i; this.bJ < 0.0F; this.bJ = this.bJ / this.bC() + 1.0F) {\n- this.bJ *= this.bC();\n+ for (this.bI -= i; this.bJ < 0.0F; this.bJ = this.bJ / this.bG() + 1.0F) {\n+ this.bJ *= this.bG();\n this.a(-1);\n }\n updateXP();\n@@ -1486,13 +1450,13 @@ public void setXP(int i) {\n }\n \n public void recalculateXP() {\n- this.bJ = this.bI / (float) this.bC();\n+ this.bJ = this.bI / (float) this.bG();\n this.bH = 0;\n \n while (this.bJ >= 1.0F) {\n- this.bJ = (this.bJ - 1.0F) * this.bC();\n+ this.bJ = (this.bJ - 1.0F) * this.bG();\n this.bI++;\n- this.bJ /= this.bC();\n+ this.bJ /= this.bG();\n }\n \n if (this instanceof EntityPlayerMP) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayer.java","sha":"73797046af6371d67c7828ae34ee6724afb48a19","status":"modified"},{"additions":43,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayerMP.java","changes":79,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayerMP.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":36,"filename":"src/main/java/net/minecraft/server/EntityPlayerMP.java","new_code":" if (itemstack != null && Item.g[itemstack.d].f() && this.a.f() <= 5) {\n if (this.aM() != this.bP && bP != -99999999 && this.getPlayer() != null) {\n super.b(this.aY());\n HealthChangeHook hook = (HealthChangeHook) new HealthChangeHook(getPlayer(), bP, this.aM()).call();\n if (this.aM() != this.bP || this.bQ != this.bq.a() || this.bq.e() == 0.0F != this.bR) {\n int health = (int) (this.aM() / (this.bm() / 20));\n health = (this.aM() > 0 && health == 0) ? 1 : health;\n this.bP = this.aM();\n if (this.aM() + this.bm() != this.bO) {\n this.bO = this.aM() + this.bm();\n Collection collection = this.bL().a(ScoreObjectiveCriteria.f);\n this.bL().a(this.am(), scoreobjective).a(Arrays.asList(new EntityPlayer[]{ this }));\n } else {\n PlayerDeathHook hook = (PlayerDeathHook) new PlayerDeathHook(getPlayer(), damagesource.getCanaryDamageSource(), this.aQ().b().toString()).call();\n Score score = this.bL().a(this.am(), scoreobjective);\n EntityLivingBase entitylivingbase = this.aR();\n if (this.aq()) {\n if (this.bg()) {\n public void a(TileEntity tileentity) {\n if (tileentity instanceof TileEntitySign) {\n ((TileEntitySign) tileentity).a((EntityPlayer) this);\n this.a.b(new Packet133TileEditorOpen(0, tileentity.l, tileentity.m, tileentity.n));\n }\n }\n\n private void bM() {\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n this.bM();\n protected void a(PotionEffect potioneffect, boolean flag0) {\n super.a(potioneffect, flag0);\n protected void b(PotionEffect potioneffect) {\n super.b(potioneffect);\n // return \"seed\".equals(s0) && !this.b.V() ? true : (!\"tell\".equals(s0) && !\"help\".equals(s0) && !\"me\".equals(s0) ? this.b.af().e(this.bu) ? this.b.k() >= i0 : false) : true);","new_methods":[{"arguments":["TileEntity tileentity"],"filename":"src/main/java/net/minecraft/server/EntityPlayerMP.java","implementation":"if (tileentity instanceof TileEntitySign) {\n ((TileEntitySign) tileentity).a((EntityPlayer) this);\n this.a.b(new Packet133TileEditorOpen(0, tileentity.l, tileentity.m, tileentity.n));","signature":"void a(TileEntity tileentity)"}],"old_code":" if (itemstack != null && Item.g[itemstack.d].f() && this.a.e() <= 5) {\n if (this.aJ() != this.bP && bP != -99999999 && this.getPlayer() != null) {\n super.b(this.aW());\n HealthChangeHook hook = (HealthChangeHook) new HealthChangeHook(getPlayer(), bP, this.aJ()).call();\n if (this.aJ() != this.bP || this.bQ != this.bq.a() || this.bq.e() == 0.0F != this.bR) {\n int health = (int) (this.aJ() / (this.aW() / 20));\n health = (this.aX() > 0 && health == 0) ? 1 : health;\n this.bP = this.aJ();\n if (this.aJ() + this.bj() != this.bO) {\n this.bO = this.aJ() + this.bj();\n Collection collection = this.bH().a(ScoreObjectiveCriteria.f);\n this.bH().a(this.al(), scoreobjective).a(Arrays.asList(new EntityPlayer[]{ this }));\n } else if (getPlayer() != null) { // NPC?\n PlayerDeathHook hook = (PlayerDeathHook) new PlayerDeathHook(getPlayer(), damagesource.getCanaryDamageSource(), this.aN().b().toString()).call();\n Score score = this.bH().a(this.al(), scoreobjective);\n EntityLivingBase entitylivingbase = this.aO();\n if (this.ap()) {\n if (this.bd()) {\n private void bJ() {\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n this.bJ();\n protected void b(PotionEffect potioneffect) {\n super.b(potioneffect);\n protected void c(PotionEffect potioneffect) {\n super.c(potioneffect);\n // return \"seed\".equals(s0) && !this.b.T() ? true : (!\"tell\".equals(s0) && !\"help\".equals(s0) && !\"me\".equals(s0) ? this.b.ad().e(this.bS) : true);","old_methods":[],"patch":"@@ -192,7 +192,7 @@ public void h() {\n for (int i0 = 0; i0 < this.bn.j_(); ++i0) {\n ItemStack itemstack = this.bn.a(i0);\n \n- if (itemstack != null && Item.g[itemstack.d].f() && this.a.e() <= 5) {\n+ if (itemstack != null && Item.g[itemstack.d].f() && this.a.f() <= 5) {\n Packet packet = ((ItemMapBase) Item.g[itemstack.d]).c(itemstack, this.q, this);\n \n if (packet != null) {\n@@ -202,47 +202,47 @@ public void h() {\n }\n \n // CanaryMod: HealthChange / HealthEnabled\n- if (this.aJ() != this.bP && bP != -99999999 && this.getPlayer() != null) {\n+ if (this.aM() != this.bP && bP != -99999999 && this.getPlayer() != null) {\n // updates your health when it is changed.\n if (!Configuration.getWorldConfig(getCanaryWorld().getFqName()).isHealthEnabled()) {\n- super.b(this.aW());\n+ super.b(this.aY());\n this.M = false;\n } else {\n- HealthChangeHook hook = (HealthChangeHook) new HealthChangeHook(getPlayer(), bP, this.aJ()).call();\n+ HealthChangeHook hook = (HealthChangeHook) new HealthChangeHook(getPlayer(), bP, this.aM()).call();\n if (hook.isCanceled()) {\n super.b(this.bP);\n }\n }\n }\n //\n \n- if (this.aJ() != this.bP || this.bQ != this.bq.a() || this.bq.e() == 0.0F != this.bR) {\n+ if (this.aM() != this.bP || this.bQ != this.bq.a() || this.bq.e() == 0.0F != this.bR) {\n // CanaryMod: convert health for values above 20\n- int health = (int) (this.aJ() / (this.aW() / 20));\n+ int health = (int) (this.aM() / (this.bm() / 20));\n \n- health = (this.aX() > 0 && health == 0) ? 1 : health;\n+ health = (this.aM() > 0 && health == 0) ? 1 : health;\n this.a.b(new Packet8UpdateHealth(health, this.bq.a(), this.bq.e()));\n //\n- this.bP = this.aJ();\n+ this.bP = this.aM();\n this.bQ = this.bq.a();\n this.bR = this.bq.e() == 0.0F;\n }\n \n- if (this.aJ() + this.bj() != this.bO) {\n- this.bO = this.aJ() + this.bj();\n- Collection collection = this.bH().a(ScoreObjectiveCriteria.f);\n+ if (this.aM() + this.bm() != this.bO) {\n+ this.bO = this.aM() + this.bm();\n+ Collection collection = this.bL().a(ScoreObjectiveCriteria.f);\n Iterator iterator = collection.iterator();\n \n while (iterator.hasNext()) {\n ScoreObjective scoreobjective = (ScoreObjective) iterator.next();\n \n- this.bH().a(this.al(), scoreobjective).a(Arrays.asList(new EntityPlayer[]{ this }));\n+ this.bL().a(this.am(), scoreobjective).a(Arrays.asList(new EntityPlayer[]{ this }));\n }\n // CanaryMod: ExperienceHook / ExperienceEnabled\n if (!Configuration.getWorldConfig(getCanaryWorld().getFqName()).isExperienceEnabled()) {\n this.bI = 0;\n this.bH = 0;\n- } else if (getPlayer() != null) { // NPC?\n+ } else {\n ExperienceHook hook = new ExperienceHook(getPlayer(), this.bS, this.bI);\n \n if (!hook.isCanceled()) {\n@@ -263,7 +263,7 @@ public void h() {\n \n public void a(DamageSource damagesource) {\n // CanaryMod: PlayerDeathHook\n- PlayerDeathHook hook = (PlayerDeathHook) new PlayerDeathHook(getPlayer(), damagesource.getCanaryDamageSource(), this.aN().b().toString()).call();\n+ PlayerDeathHook hook = (PlayerDeathHook) new PlayerDeathHook(getPlayer(), damagesource.getCanaryDamageSource(), this.aQ().b().toString()).call();\n // Check Death Message enabled\n if (Configuration.getServerConfig().isDeathMessageEnabled()) {\n this.b.af().a(ChatMessageComponent.e(hook.getDeathMessage()));\n@@ -278,12 +278,12 @@ public void a(DamageSource damagesource) {\n \n while (iterator.hasNext()) {\n ScoreObjective scoreobjective = (ScoreObjective) iterator.next();\n- Score score = this.bH().a(this.al(), scoreobjective);\n+ Score score = this.bL().a(this.am(), scoreobjective);\n \n score.a();\n }\n \n- EntityLivingBase entitylivingbase = this.aO();\n+ EntityLivingBase entitylivingbase = this.aR();\n \n if (entitylivingbase != null) {\n entitylivingbase.b(this, this.bb);\n@@ -293,7 +293,7 @@ public void a(DamageSource damagesource) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n // CanaryMod moved pvp to per-world config\n@@ -403,7 +403,7 @@ public EnumStatus a(int i0, int i1, int i2) {\n }\n \n public void a(boolean flag0, boolean flag1, boolean flag2) {\n- if (this.bd()) {\n+ if (this.bg()) {\n this.p().q().b(this, new Packet18Animation(this, 3));\n }\n \n@@ -425,7 +425,14 @@ public void b(double d0, boolean flag0) {\n super.a(d0, flag0);\n }\n \n- private void bJ() {\n+ public void a(TileEntity tileentity) {\n+ if (tileentity instanceof TileEntitySign) {\n+ ((TileEntitySign) tileentity).a((EntityPlayer) this);\n+ this.a.b(new Packet133TileEditorOpen(0, tileentity.l, tileentity.m, tileentity.n));\n+ }\n+ }\n+\n+ private void bM() {\n this.bX = this.bX % 100 + 1;\n }\n \n@@ -438,7 +445,7 @@ public void b(int i0, int i1, int i2) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 1, bench.getInventoryName(), 9, true));\n this.bp = container;\n this.bp.d = this.bX;\n@@ -454,7 +461,7 @@ public void a(int i0, int i1, int i2, String s0) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 4, s0 == null ? \"\" : s0, 9, s0 != null));\n this.bp = new ContainerEnchantment(this.bn, this.q, i0, i1, i2);\n this.bp.d = this.bX;\n@@ -470,7 +477,7 @@ public void c(int i0, int i1, int i2) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 8, \"Repairing\", 9, true));\n this.bp = container;\n this.bp.d = this.bX;\n@@ -506,7 +513,7 @@ public void a(IInventory iinventory) {\n }\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 0, iinventory.b(), iinventory.j_(), iinventory.c()));\n this.bp = container;\n this.bp.d = this.bX;\n@@ -520,7 +527,7 @@ public void a(TileEntityHopper tileentityhopper) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 9, tileentityhopper.b(), tileentityhopper.j_(), tileentityhopper.c()));\n this.bp = new ContainerHopper(this.bn, tileentityhopper);\n this.bp.d = this.bX;\n@@ -534,7 +541,7 @@ public void a(EntityMinecartHopper entityminecarthopper) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 9, entityminecarthopper.b(), entityminecarthopper.j_(), entityminecarthopper.c()));\n this.bp = new ContainerHopper(this.bn, entityminecarthopper);\n this.bp.d = this.bX;\n@@ -548,7 +555,7 @@ public void a(TileEntityFurnace tileentityfurnace) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 2, tileentityfurnace.b(), tileentityfurnace.j_(), tileentityfurnace.c()));\n this.bp = new ContainerFurnace(this.bn, tileentityfurnace);\n this.bp.d = this.bX;\n@@ -562,7 +569,7 @@ public void a(TileEntityDispenser tileentitydispenser) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, tileentitydispenser instanceof TileEntityDropper ? 10 : 3, tileentitydispenser.b(), tileentitydispenser.j_(), tileentitydispenser.c()));\n this.bp = new ContainerDispenser(this.bn, tileentitydispenser);\n this.bp.d = this.bX;\n@@ -576,7 +583,7 @@ public void a(TileEntityBrewingStand tileentitybrewingstand) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 5, tileentitybrewingstand.b(), tileentitybrewingstand.j_(), tileentitybrewingstand.c()));\n this.bp = new ContainerBrewingStand(this.bn, tileentitybrewingstand);\n this.bp.d = this.bX;\n@@ -590,15 +597,15 @@ public void a(TileEntityBeacon tileentitybeacon) {\n return;\n }\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 7, tileentitybeacon.b(), tileentitybeacon.j_(), tileentitybeacon.c()));\n this.bp = new ContainerBeacon(this.bn, tileentitybeacon);\n this.bp.d = this.bX;\n this.bp.a((ICrafting) this);\n }\n \n public void a(IMerchant imerchant, String s0) {\n- this.bJ();\n+ this.bM();\n this.bp = new ContainerMerchant(this.bn, imerchant, this.q);\n this.bp.d = this.bX;\n this.bp.a((ICrafting) this);\n@@ -635,7 +642,7 @@ public void a(EntityHorse entityhorse, IInventory iinventory) {\n ContainerHorseInventory chi = new ContainerHorseInventory(this.bn, iinventory, entityhorse);\n chi.setInventory(inv);\n //\n- this.bJ();\n+ this.bM();\n this.a.b(new Packet100OpenWindow(this.bX, 11, iinventory.b(), iinventory.j_(), iinventory.c(), entityhorse.k));\n this.bp = chi;\n this.bp.d = this.bX;\n@@ -756,13 +763,13 @@ protected void a(PotionEffect potioneffect) {\n this.a.b(new Packet41EntityEffect(this.k, potioneffect));\n }\n \n- protected void b(PotionEffect potioneffect) {\n- super.b(potioneffect);\n+ protected void a(PotionEffect potioneffect, boolean flag0) {\n+ super.a(potioneffect, flag0);\n this.a.b(new Packet41EntityEffect(this.k, potioneffect));\n }\n \n- protected void c(PotionEffect potioneffect) {\n- super.c(potioneffect);\n+ protected void b(PotionEffect potioneffect) {\n+ super.b(potioneffect);\n this.a.b(new Packet42RemoveEntityEffect(this.k, potioneffect));\n }\n \n@@ -799,7 +806,7 @@ public void a(ChatMessageComponent chatmessagecomponent) {\n \n public boolean a(int i0, String s0) {\n // CanaryMod: replace permission checking with ours\n- // return \"seed\".equals(s0) && !this.b.T() ? true : (!\"tell\".equals(s0) && !\"help\".equals(s0) && !\"me\".equals(s0) ? this.b.ad().e(this.bS) : true);\n+ // return \"seed\".equals(s0) && !this.b.V() ? true : (!\"tell\".equals(s0) && !\"help\".equals(s0) && !\"me\".equals(s0) ? this.b.af().e(this.bu) ? this.b.k() >= i0 : false) : true);\n if (s0.trim().isEmpty()) { // Purely checking for permission level\n return getPlayer().hasPermission(\"canary.world.commandblock\");\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayerMP.java","sha":"76c1b5d0fcdf5cb0bbe881864d4fd1b20dd4eafe","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPotion.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPotion.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":4,"filename":"src/main/java/net/minecraft/server/EntityPotion.java","new_code":" // protected float e() {\n entitylivingbase.c(new PotionEffect(i0, i1, potioneffect.c()));","new_methods":[],"old_code":"\n\n // protected float g() {\n entitylivingbase.d(new PotionEffect(i0, i1, potioneffect.c()));","old_methods":[],"patch":"@@ -1,11 +1,9 @@\n package net.minecraft.server;\n \n-\n import java.util.Iterator;\n import java.util.List;\n import net.canarymod.api.entity.throwable.CanaryEntityPotion;\n \n-\n public class EntityPotion extends EntityThrowable {\n \n private ItemStack c;\n@@ -41,7 +39,7 @@ public EntityPotion(World world, double d0, double d1, double d2, ItemStack item\n }\n \n // CanaryMod: remove unneeded method override\n- // protected float g() {\n+ // protected float e() {\n // return 0.05F;\n // }\n //\n@@ -104,7 +102,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\n int i1 = (int) (d1 * (double) potioneffect.b() + 0.5D);\n \n if (i1 > 20) {\n- entitylivingbase.d(new PotionEffect(i0, i1, potioneffect.c()));\n+ entitylivingbase.c(new PotionEffect(i0, i1, potioneffect.c()));\n }\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPotion.java","sha":"38fb67ef9948279f003df5374a3c58810f4c2599","status":"modified"},{"additions":22,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySheep.java","changes":45,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySheep.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":23,"filename":"src/main/java/net/minecraft/server/EntitySheep.java","new_code":" public static final float[][] bp = new float[][]{ { 1.0F, 1.0F, 1.0F }, { 0.85F, 0.5F, 0.2F }, { 0.7F, 0.3F, 0.85F }, { 0.4F, 0.6F, 0.85F }, { 0.9F, 0.9F, 0.2F }, { 0.5F, 0.8F, 0.1F }, { 0.95F, 0.5F, 0.65F }, { 0.3F, 0.3F, 0.3F }, { 0.6F, 0.6F, 0.6F }, { 0.3F, 0.5F, 0.6F }, { 0.5F, 0.25F, 0.7F }, { 0.2F, 0.3F, 0.7F }, { 0.4F, 0.3F, 0.2F },\n { 0.4F, 0.5F, 0.2F }, { 0.6F, 0.2F, 0.2F }, { 0.1F, 0.1F, 0.1F } };\n protected boolean be() {\n protected void bh() {\n super.bh();\n protected void ay() {\n super.ay();\n if (!this.bU()) {\n this.a(new ItemStack(Block.ag.cF, 1, this.bT()), 0.0F);\n if (itemstack != null && itemstack.d == Item.bg.cv && !this.bU() && !this.g_()) {\n this.i(true);\n EntityItem entityitem = this.a(new ItemStack(Block.ag.cF, 1, this.bT()), 1.0F);\n nbttagcompound.a(\"Sheared\", this.bU());\n nbttagcompound.a(\"Color\", (byte) this.bT());\n this.i(nbttagcompound.n(\"Sheared\"));\n protected String aN() {\n protected String aO() {\n public int bT() {\n public boolean bU() {\n public void i(boolean flag0) {\n this.i(false);\n return 15 - ((EntitySheep) entityanimal).bT();","new_methods":[],"old_code":"\n\n public static final float[][] bp = new float[][]{ { 1.0F, 1.0F, 1.0F }, { 0.85F, 0.5F, 0.2F }, { 0.7F, 0.3F, 0.85F }, { 0.4F, 0.6F, 0.85F }, { 0.9F, 0.9F, 0.2F }, { 0.5F, 0.8F, 0.1F }, { 0.95F, 0.5F, 0.65F }, { 0.3F, 0.3F, 0.3F }, { 0.6F, 0.6F, 0.6F }, { 0.3F, 0.5F, 0.6F }, { 0.5F, 0.25F, 0.7F }, { 0.2F, 0.3F, 0.7F }, { 0.4F, 0.3F, 0.2F }, { 0.4F, 0.5F, 0.2F }, { 0.6F, 0.2F, 0.2F }, { 0.1F, 0.1F, 0.1F } };\n protected boolean bb() {\n protected void be() {\n super.be();\n protected void ax() {\n super.ax();\n if (!this.bQ()) {\n this.a(new ItemStack(Block.ag.cF, 1, this.bP()), 0.0F);\n if (itemstack != null && itemstack.d == Item.bg.cv && !this.bQ() && !this.g_()) {\n this.j(true);\n EntityItem entityitem = this.a(new ItemStack(Block.ag.cF, 1, this.bP()), 1.0F);\n nbttagcompound.a(\"Sheared\", this.bQ());\n nbttagcompound.a(\"Color\", (byte) this.bP());\n this.j(nbttagcompound.n(\"Sheared\"));\n protected String aK() {\n protected String aL() {\n public int bP() {\n public boolean bQ() {\n public void j(boolean flag0) {\n this.j(false);\n return 15 - ((EntitySheep) entityanimal).bP();","old_methods":[],"patch":"@@ -1,14 +1,13 @@\n package net.minecraft.server;\n \n-\n import java.util.Random;\n import net.canarymod.api.entity.living.animal.CanarySheep;\n \n-\n public class EntitySheep extends EntityAnimal {\n \n private final InventoryCrafting bq = new InventoryCrafting(new ContainerSheep(this), 2, 1);\n- public static final float[][] bp = new float[][]{ { 1.0F, 1.0F, 1.0F }, { 0.85F, 0.5F, 0.2F }, { 0.7F, 0.3F, 0.85F }, { 0.4F, 0.6F, 0.85F }, { 0.9F, 0.9F, 0.2F }, { 0.5F, 0.8F, 0.1F }, { 0.95F, 0.5F, 0.65F }, { 0.3F, 0.3F, 0.3F }, { 0.6F, 0.6F, 0.6F }, { 0.3F, 0.5F, 0.6F }, { 0.5F, 0.25F, 0.7F }, { 0.2F, 0.3F, 0.7F }, { 0.4F, 0.3F, 0.2F }, { 0.4F, 0.5F, 0.2F }, { 0.6F, 0.2F, 0.2F }, { 0.1F, 0.1F, 0.1F } };\n+ public static final float[][] bp = new float[][]{ { 1.0F, 1.0F, 1.0F }, { 0.85F, 0.5F, 0.2F }, { 0.7F, 0.3F, 0.85F }, { 0.4F, 0.6F, 0.85F }, { 0.9F, 0.9F, 0.2F }, { 0.5F, 0.8F, 0.1F }, { 0.95F, 0.5F, 0.65F }, { 0.3F, 0.3F, 0.3F }, { 0.6F, 0.6F, 0.6F }, { 0.3F, 0.5F, 0.6F }, { 0.5F, 0.25F, 0.7F }, { 0.2F, 0.3F, 0.7F }, { 0.4F, 0.3F, 0.2F },\n+ { 0.4F, 0.5F, 0.2F }, { 0.6F, 0.2F, 0.2F }, { 0.1F, 0.1F, 0.1F } };\n private int br;\n private EntityAIEatGrass bs = new EntityAIEatGrass(this);\n \n@@ -30,13 +29,13 @@ public EntitySheep(World world) {\n this.entity = new CanarySheep(this); // CanaryMod: Wrap Entity\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return true;\n }\n \n- protected void be() {\n+ protected void bh() {\n this.br = this.bs.f();\n- super.be();\n+ super.bh();\n }\n \n public void c() {\n@@ -47,8 +46,8 @@ public void c() {\n super.c();\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(8.0D);\n this.a(SharedMonsterAttributes.d).a(0.23000000417232513D);\n }\n@@ -59,8 +58,8 @@ protected void a() {\n }\n \n protected void b(boolean flag0, int i0) {\n- if (!this.bQ()) {\n- this.a(new ItemStack(Block.ag.cF, 1, this.bP()), 0.0F);\n+ if (!this.bU()) {\n+ this.a(new ItemStack(Block.ag.cF, 1, this.bT()), 0.0F);\n }\n }\n \n@@ -71,13 +70,13 @@ protected int s() {\n public boolean a(EntityPlayer entityplayer) {\n ItemStack itemstack = entityplayer.bn.h();\n \n- if (itemstack != null && itemstack.d == Item.bg.cv && !this.bQ() && !this.g_()) {\n+ if (itemstack != null && itemstack.d == Item.bg.cv && !this.bU() && !this.g_()) {\n if (!this.q.I) {\n- this.j(true);\n+ this.i(true);\n int i0 = 1 + this.ab.nextInt(3);\n \n for (int i1 = 0; i1 < i0; ++i1) {\n- EntityItem entityitem = this.a(new ItemStack(Block.ag.cF, 1, this.bP()), 1.0F);\n+ EntityItem entityitem = this.a(new ItemStack(Block.ag.cF, 1, this.bT()), 1.0F);\n \n entityitem.y += (double) (this.ab.nextFloat() * 0.05F);\n entityitem.x += (double) ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.1F);\n@@ -94,33 +93,33 @@ public boolean a(EntityPlayer entityplayer) {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"Sheared\", this.bQ());\n- nbttagcompound.a(\"Color\", (byte) this.bP());\n+ nbttagcompound.a(\"Sheared\", this.bU());\n+ nbttagcompound.a(\"Color\", (byte) this.bT());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n super.a(nbttagcompound);\n- this.j(nbttagcompound.n(\"Sheared\"));\n+ this.i(nbttagcompound.n(\"Sheared\"));\n this.p(nbttagcompound.c(\"Color\"));\n }\n \n protected String r() {\n return \"mob.sheep.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.sheep.say\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.sheep.say\";\n }\n \n protected void a(int i0, int i1, int i2, int i3) {\n this.a(\"mob.sheep.step\", 0.15F, 1.0F);\n }\n \n- public int bP() {\n+ public int bT() {\n return this.ah.a(16) & 15;\n }\n \n@@ -130,11 +129,11 @@ public void p(int i0) {\n this.ah.b(16, Byte.valueOf((byte) (b0 & 240 | i0 & 15)));\n }\n \n- public boolean bQ() {\n+ public boolean bU() {\n return (this.ah.a(16) & 16) != 0;\n }\n \n- public void j(boolean flag0) {\n+ public void i(boolean flag0) {\n byte b0 = this.ah.a(16);\n \n if (flag0) {\n@@ -160,7 +159,7 @@ public EntitySheep b(EntityAgeable entityageable) {\n }\n \n public void n() {\n- this.j(false);\n+ this.i(false);\n if (this.g_()) {\n this.a(60);\n }\n@@ -191,7 +190,7 @@ private int a(EntityAnimal entityanimal, EntityAnimal entityanimal1) {\n }\n \n private int b(EntityAnimal entityanimal) {\n- return 15 - ((EntitySheep) entityanimal).bP();\n+ return 15 - ((EntitySheep) entityanimal).bT();\n }\n \n public EntityAgeable a(EntityAgeable entityageable) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySheep.java","sha":"2da5deb4826aee7fe7a823ff77ca0c8df408929b","status":"modified"},{"additions":14,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySilverfish.java","changes":28,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySilverfish.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":14,"filename":"src/main/java/net/minecraft/server/EntitySilverfish.java","new_code":" protected void ay() {\n super.ay();\n protected Entity bL() {\n protected String aN() {\n protected String aO() {\n if (this.aq()) {\n protected void bk() {\n super.bk();\n if (this.j == null && !this.bM()) {\n this.bK();\n } else if (this.j != null && !this.bM()) {\n public boolean bs() {\n if (super.bs()) {\n public EnumCreatureAttribute aX() {","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntitySilverfish.java","implementation":"super.ay();\n protected Entity bL() {\n protected String aN() {\n protected String aO() {\n if (this.aq()) {\n protected void bk() {\n super.bk();\n if (this.j == null && !this.bM()) {\n this.bK();","signature":"void ay()"}],"old_code":" protected void ax() {\n super.ax();\n protected Entity bH() {\n protected String aK() {\n protected String aL() {\n if (this.ap()) {\n protected void bh() {\n super.bh();\n if (this.j == null && !this.bI()) {\n this.bG();\n } else if (this.j != null && !this.bI()) {\n public boolean bo() {\n if (super.bo()) {\n public EnumCreatureAttribute aU() {","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntitySilverfish.java","implementation":"super.ax();\n protected Entity bH() {\n protected String aK() {\n protected String aL() {\n if (this.ap()) {\n protected void bh() {\n super.bh();\n if (this.j == null && !this.bI()) {\n this.bG();","signature":"void ax()"}],"patch":"@@ -12,8 +12,8 @@ public EntitySilverfish(World world) {\n this.entity = new CanarySilverfish(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(8.0D);\n this.a(SharedMonsterAttributes.d).a(0.6000000238418579D);\n this.a(SharedMonsterAttributes.e).a(1.0D);\n@@ -23,7 +23,7 @@ protected boolean e_() {\n return false;\n }\n \n- protected Entity bH() {\n+ protected Entity bL() {\n double d0 = 8.0D;\n \n return this.q.b(this, d0);\n@@ -33,16 +33,16 @@ protected String r() {\n return \"mob.silverfish.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.silverfish.hit\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.silverfish.kill\";\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n if (this.bp <= 0 && (damagesource instanceof EntityDamageSource || damagesource == DamageSource.k)) {\n@@ -73,8 +73,8 @@ public void l_() {\n super.l_();\n }\n \n- protected void bh() {\n- super.bh();\n+ protected void bk() {\n+ super.bk();\n if (!this.q.I) {\n int i0;\n int i1;\n@@ -124,7 +124,7 @@ protected void bh() {\n }\n }\n \n- if (this.j == null && !this.bI()) {\n+ if (this.j == null && !this.bM()) {\n i0 = MathHelper.c(this.u);\n i1 = MathHelper.c(this.v + 0.5D);\n i2 = MathHelper.c(this.w);\n@@ -136,9 +136,9 @@ protected void bh() {\n this.q();\n this.w();\n } else {\n- this.bG();\n+ this.bK();\n }\n- } else if (this.j != null && !this.bI()) {\n+ } else if (this.j != null && !this.bM()) {\n this.j = null;\n }\n }\n@@ -152,8 +152,8 @@ protected boolean i_() {\n return true;\n }\n \n- public boolean bo() {\n- if (super.bo()) {\n+ public boolean bs() {\n+ if (super.bs()) {\n EntityPlayer entityplayer = this.q.a(this, 5.0D);\n \n return entityplayer == null;\n@@ -162,7 +162,7 @@ public boolean bo() {\n }\n }\n \n- public EnumCreatureAttribute aU() {\n+ public EnumCreatureAttribute aX() {\n return EnumCreatureAttribute.c;\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySilverfish.java","sha":"1e4eef0584f2865d8aed045ec3bc44fe8fdd6041","status":"modified"},{"additions":31,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySkeleton.java","changes":64,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySkeleton.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":33,"filename":"src/main/java/net/minecraft/server/EntitySkeleton.java","new_code":" this.bT();\n protected void ay() {\n super.ay();\n public boolean be() {\n protected String aN() {\n protected String aO() {\n if (this.bV() == 1 && entity instanceof EntityLivingBase) {\n ((EntityLivingBase) entity).c(new PotionEffect(Potion.v.H, 200));\n public EnumCreatureAttribute aX() {\n if (this.q.I && this.bV() == 1) {\n public void U() {\n super.U();\n if (this.bV() == 1) {\n if (this.bV() == 1) {\n protected void bw() {\n super.bw();\n if (this.q.t instanceof WorldProviderHell && this.aC().nextInt(5) > 0) {\n this.bw();\n this.bx();\n public void bT() {\n ItemStack itemstack = this.aY();\n int i0 = EnchantmentHelper.a(Enchantment.v.z, this.aY());\n int i1 = EnchantmentHelper.a(Enchantment.w.z, this.aY());\n if (EnchantmentHelper.a(Enchantment.x.z, this.aY()) > 0 || this.bV() == 1) {\n this.a(\"random.bow\", 1.0F, 1.0F / (this.aC().nextFloat() * 0.4F + 0.8F));\n public int bV() {\n this.bT();\n nbttagcompound.a(\"SkeletonType\", (byte) this.bV());\n this.bT();\n public double W() {\n return super.W() - 0.5D;","new_methods":[],"old_code":"\n\n this.bP();\n protected void ax() {\n super.ax();\n public boolean bb() {\n protected String aK() {\n protected String aL() {\n if (this.bR() == 1 && entity instanceof EntityLivingBase) {\n ((EntityLivingBase) entity).d(new PotionEffect(Potion.v.H, 200));\n public EnumCreatureAttribute aU() {\n if (this.q.I && this.bR() == 1) {\n public void T() {\n super.T();\n if (this.bR() == 1) {\n if (this.bR() == 1) {\n protected void bs() {\n super.bs();\n if (this.q.t instanceof WorldProviderHell && this.aB().nextInt(5) > 0) {\n this.bs();\n this.bt();\n public void bP() {\n ItemStack itemstack = this.aV();\n int i0 = EnchantmentHelper.a(Enchantment.v.z, this.aV());\n int i1 = EnchantmentHelper.a(Enchantment.w.z, this.aV());\n if (EnchantmentHelper.a(Enchantment.x.z, this.aV()) > 0 || this.bR() == 1) {\n this.a(\"random.bow\", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));\n public int bR() {\n this.bP();\n nbttagcompound.a(\"SkeletonType\", (byte) this.bR());\n this.bP();\n public double V() {\n return super.V() - 0.5D;","old_methods":[],"patch":"@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.Calendar;\n import net.canarymod.api.entity.living.monster.CanarySkeleton;\n \n-\n public class EntitySkeleton extends EntityMob implements IRangedAttackMob {\n \n private EntityAIArrowAttack bp = new EntityAIArrowAttack(this, 1.0D, 20, 60, 15.0F);\n@@ -21,13 +19,13 @@ public EntitySkeleton(World world) {\n this.d.a(1, new EntityAIHurtByTarget(this, false));\n this.d.a(2, new EntityAINearestAttackableTarget(this, EntityPlayer.class, 0, true));\n if (world != null && !world.I) {\n- this.bP();\n+ this.bT();\n }\n this.entity = new CanarySkeleton(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.d).a(0.25D);\n }\n \n@@ -36,19 +34,19 @@ protected void a() {\n this.ah.a(13, new Byte((byte) 0));\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n protected String r() {\n return \"mob.skeleton.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.skeleton.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.skeleton.death\";\n }\n \n@@ -58,8 +56,8 @@ protected void a(int i0, int i1, int i2, int i3) {\n \n public boolean m(Entity entity) {\n if (super.m(entity)) {\n- if (this.bR() == 1 && entity instanceof EntityLivingBase) {\n- ((EntityLivingBase) entity).d(new PotionEffect(Potion.v.H, 200));\n+ if (this.bV() == 1 && entity instanceof EntityLivingBase) {\n+ ((EntityLivingBase) entity).c(new PotionEffect(Potion.v.H, 200));\n }\n \n return true;\n@@ -68,7 +66,7 @@ public boolean m(Entity entity) {\n }\n }\n \n- public EnumCreatureAttribute aU() {\n+ public EnumCreatureAttribute aX() {\n return EnumCreatureAttribute.b;\n }\n \n@@ -98,15 +96,15 @@ public void c() {\n }\n }\n \n- if (this.q.I && this.bR() == 1) {\n+ if (this.q.I && this.bV() == 1) {\n this.a(0.72F, 2.34F);\n }\n \n super.c();\n }\n \n- public void T() {\n- super.T();\n+ public void U() {\n+ super.U();\n if (this.o instanceof EntityCreature) {\n EntityCreature entitycreature = (EntityCreature) this.o;\n \n@@ -135,7 +133,7 @@ protected void b(boolean flag0, int i0) {\n int i1;\n int i2;\n \n- if (this.bR() == 1) {\n+ if (this.bV() == 1) {\n i1 = this.ab.nextInt(3 + i0) - 1;\n \n for (i2 = 0; i2 < i1; ++i2) {\n@@ -157,27 +155,27 @@ protected void b(boolean flag0, int i0) {\n }\n \n protected void l(int i0) {\n- if (this.bR() == 1) {\n+ if (this.bV() == 1) {\n this.a(new ItemStack(Item.bS.cv, 1, 1), 0.0F);\n }\n }\n \n- protected void bs() {\n- super.bs();\n+ protected void bw() {\n+ super.bw();\n this.c(0, new ItemStack(Item.m));\n }\n \n public EntityLivingData a(EntityLivingData entitylivingdata) {\n entitylivingdata = super.a(entitylivingdata);\n- if (this.q.t instanceof WorldProviderHell && this.aB().nextInt(5) > 0) {\n+ if (this.q.t instanceof WorldProviderHell && this.aC().nextInt(5) > 0) {\n this.c.a(4, this.bq);\n this.a(1);\n this.c(0, new ItemStack(Item.x));\n this.a(SharedMonsterAttributes.e).a(4.0D);\n } else {\n this.c.a(4, this.bp);\n- this.bs();\n- this.bt();\n+ this.bw();\n+ this.bx();\n }\n \n this.h(this.ab.nextFloat() < 0.55F * this.q.b(this.u, this.v, this.w));\n@@ -193,10 +191,10 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n return entitylivingdata;\n }\n \n- public void bP() {\n+ public void bT() {\n this.c.a((EntityAIBase) this.bq);\n this.c.a((EntityAIBase) this.bp);\n- ItemStack itemstack = this.aV();\n+ ItemStack itemstack = this.aY();\n \n if (itemstack != null && itemstack.d == Item.m.cv) {\n this.c.a(4, this.bp);\n@@ -207,8 +205,8 @@ public void bP() {\n \n public void a(EntityLivingBase entitylivingbase, float f0) {\n EntityArrow entityarrow = new EntityArrow(this.q, this, entitylivingbase, 1.6F, (float) (14 - this.q.r * 4));\n- int i0 = EnchantmentHelper.a(Enchantment.v.z, this.aV());\n- int i1 = EnchantmentHelper.a(Enchantment.w.z, this.aV());\n+ int i0 = EnchantmentHelper.a(Enchantment.v.z, this.aY());\n+ int i1 = EnchantmentHelper.a(Enchantment.w.z, this.aY());\n \n entityarrow.b((double) (f0 * 2.0F) + this.ab.nextGaussian() * 0.25D + (double) ((float) this.q.r * 0.11F));\n if (i0 > 0) {\n@@ -219,15 +217,15 @@ public void a(EntityLivingBase entitylivingbase, float f0) {\n entityarrow.a(i1);\n }\n \n- if (EnchantmentHelper.a(Enchantment.x.z, this.aV()) > 0 || this.bR() == 1) {\n+ if (EnchantmentHelper.a(Enchantment.x.z, this.aY()) > 0 || this.bV() == 1) {\n entityarrow.d(100);\n }\n \n- this.a(\"random.bow\", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));\n+ this.a(\"random.bow\", 1.0F, 1.0F / (this.aC().nextFloat() * 0.4F + 0.8F));\n this.q.d((Entity) entityarrow);\n }\n \n- public int bR() {\n+ public int bV() {\n return this.ah.a(13);\n }\n \n@@ -249,22 +247,22 @@ public void a(NBTTagCompound nbttagcompound) {\n this.a(b0);\n }\n \n- this.bP();\n+ this.bT();\n }\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"SkeletonType\", (byte) this.bR());\n+ nbttagcompound.a(\"SkeletonType\", (byte) this.bV());\n }\n \n public void c(int i0, ItemStack itemstack) {\n super.c(i0, itemstack);\n if (!this.q.I && i0 == 0) {\n- this.bP();\n+ this.bT();\n }\n }\n \n- public double V() {\n- return super.V() - 0.5D;\n+ public double W() {\n+ return super.W() - 0.5D;\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySkeleton.java","sha":"01c964d4f4924f2136ac80065540bc165226c6fc","status":"modified"},{"additions":48,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySlime.java","changes":96,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySlime.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":48,"filename":"src/main/java/net/minecraft/server/EntitySlime.java","new_code":" this.g(this.aS());\n public int bR() {\n nbttagcompound.a(\"Size\", this.bR() - 1);\n protected String bJ() {\n protected String bP() {\n return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n if (!this.q.I && this.q.r == 0 && this.bR() > 0) {\n i0 = this.bR();\n this.q.a(this.bJ(), this.u + (double) f2, this.E.b, this.w + (double) f3, 0.0D, 0.0D, 0.0D);\n if (this.bQ()) {\n this.a(this.bP(), this.aZ(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) / 0.8F);\n this.bM();\n i0 = this.bR();\n protected void bk() {\n this.bo();\n this.bn = this.bL();\n if (this.bS()) {\n this.a(this.bP(), this.aZ(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 0.8F);\n this.bf = (float) (1 * this.bR());\n protected void bM() {\n protected int bL() {\n protected EntitySlime bK() {\n int i0 = this.bR();\n if (!this.q.I && i0 > 1 && this.aM() <= 0.0F) {\n EntitySlime entityslime = this.bK();\n if (this.bN()) {\n int i0 = this.bR();\n if (this.o(entityplayer) && this.e(entityplayer) < 0.6D * (double) i0 * 0.6D * (double) i0 && entityplayer.a(DamageSource.a((EntityLivingBase) this), (float) this.bO())) {\n protected boolean bN() {\n return this.bR() > 1;\n protected int bO() {\n return this.bR();\n protected String aN() {\n return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n protected String aO() {\n return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n return this.bR() == 1 ? Item.aO.cv : 0;\n public boolean bs() {\n if (this.bR() == 1 || this.q.r > 0) {\n return super.bs();\n return super.bs();\n protected float aZ() {\n return 0.4F * (float) this.bR();\n public int bp() {\n protected boolean bS() {\n return this.bR() > 0;\n protected boolean bQ() {\n return this.bR() > 2;","new_methods":[],"old_code":" this.g(this.aP());\n public int bN() {\n nbttagcompound.a(\"Size\", this.bN() - 1);\n protected String bF() {\n protected String bL() {\n return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n if (!this.q.I && this.q.r == 0 && this.bN() > 0) {\n i0 = this.bN();\n this.q.a(this.bF(), this.u + (double) f2, this.E.b, this.w + (double) f3, 0.0D, 0.0D, 0.0D);\n if (this.bM()) {\n this.a(this.bL(), this.aW(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) / 0.8F);\n this.bI();\n i0 = this.bN();\n protected void bh() {\n this.bk();\n this.bn = this.bH();\n if (this.bO()) {\n this.a(this.bL(), this.aW(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 0.8F);\n this.bf = (float) (1 * this.bN());\n protected void bI() {\n protected int bH() {\n protected EntitySlime bG() {\n int i0 = this.bN();\n if (!this.q.I && i0 > 1 && this.aJ() <= 0.0F) {\n EntitySlime entityslime = this.bG();\n if (this.bJ()) {\n int i0 = this.bN();\n if (this.o(entityplayer) && this.e(entityplayer) < 0.6D * (double) i0 * 0.6D * (double) i0 && entityplayer.a(DamageSource.a((EntityLivingBase) this), (float) this.bK())) {\n protected boolean bJ() {\n return this.bN() > 1;\n protected int bK() {\n return this.bN();\n protected String aK() {\n return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n protected String aL() {\n return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n return this.bN() == 1 ? Item.aO.cv : 0;\n public boolean bo() {\n if (this.bN() == 1 || this.q.r > 0) {\n return super.bo();\n return super.bo();\n protected float aW() {\n return 0.4F * (float) this.bN();\n public int bl() {\n protected boolean bO() {\n return this.bN() > 0;\n protected boolean bM() {\n return this.bN() > 2;","old_methods":[],"patch":"@@ -29,34 +29,34 @@ public void a(int i0) { // CanaryMod: protected => public\n this.a(0.6F * (float) i0, 0.6F * (float) i0);\n this.b(this.u, this.v, this.w);\n this.a(SharedMonsterAttributes.a).a((double) (i0 * i0));\n- this.g(this.aP());\n+ this.g(this.aS());\n this.b = i0;\n }\n \n- public int bN() {\n+ public int bR() {\n return this.ah.a(16);\n }\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"Size\", this.bN() - 1);\n+ nbttagcompound.a(\"Size\", this.bR() - 1);\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n super.a(nbttagcompound);\n this.a(nbttagcompound.e(\"Size\") + 1);\n }\n \n- protected String bF() {\n+ protected String bJ() {\n return \"slime\";\n }\n \n- protected String bL() {\n- return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n+ protected String bP() {\n+ return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n }\n \n public void l_() {\n- if (!this.q.I && this.q.r == 0 && this.bN() > 0) {\n+ if (!this.q.I && this.q.r == 0 && this.bR() > 0) {\n this.M = true;\n }\n \n@@ -68,54 +68,54 @@ public void l_() {\n int i0;\n \n if (this.F && !flag0) {\n- i0 = this.bN();\n+ i0 = this.bR();\n \n for (int i1 = 0; i1 < i0 * 8; ++i1) {\n float f0 = this.ab.nextFloat() * 3.1415927F * 2.0F;\n float f1 = this.ab.nextFloat() * 0.5F + 0.5F;\n float f2 = MathHelper.a(f0) * (float) i0 * 0.5F * f1;\n float f3 = MathHelper.b(f0) * (float) i0 * 0.5F * f1;\n \n- this.q.a(this.bF(), this.u + (double) f2, this.E.b, this.w + (double) f3, 0.0D, 0.0D, 0.0D);\n+ this.q.a(this.bJ(), this.u + (double) f2, this.E.b, this.w + (double) f3, 0.0D, 0.0D, 0.0D);\n }\n \n- if (this.bM()) {\n- this.a(this.bL(), this.aW(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) / 0.8F);\n+ if (this.bQ()) {\n+ this.a(this.bP(), this.aZ(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) / 0.8F);\n }\n \n this.h = -0.5F;\n } else if (!this.F && flag0) {\n this.h = 1.0F;\n }\n \n- this.bI();\n+ this.bM();\n if (this.q.I) {\n- i0 = this.bN();\n+ i0 = this.bR();\n this.a(0.6F * (float) i0, 0.6F * (float) i0);\n }\n }\n \n- protected void bh() {\n- this.bk();\n+ protected void bk() {\n+ this.bo();\n EntityPlayer entityplayer = this.q.b(this, 16.0D);\n \n if (entityplayer != null) {\n this.a(entityplayer, 10.0F, 20.0F);\n }\n \n if (this.F && this.bn-- <= 0) {\n- this.bn = this.bH();\n+ this.bn = this.bL();\n if (entityplayer != null) {\n this.bn /= 3;\n }\n \n this.bd = true;\n- if (this.bO()) {\n- this.a(this.bL(), this.aW(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 0.8F);\n+ if (this.bS()) {\n+ this.a(this.bP(), this.aZ(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 0.8F);\n }\n \n this.be = 1.0F - this.ab.nextFloat() * 2.0F;\n- this.bf = (float) (1 * this.bN());\n+ this.bf = (float) (1 * this.bR());\n } else {\n this.bd = false;\n if (this.F) {\n@@ -124,28 +124,28 @@ protected void bh() {\n }\n }\n \n- protected void bI() {\n+ protected void bM() {\n this.h *= 0.6F;\n }\n \n- protected int bH() {\n+ protected int bL() {\n return this.ab.nextInt(20) + 10;\n }\n \n- protected EntitySlime bG() {\n+ protected EntitySlime bK() {\n return new EntitySlime(this.q);\n }\n \n public void w() {\n- int i0 = this.bN();\n+ int i0 = this.bR();\n \n- if (!this.q.I && i0 > 1 && this.aJ() <= 0.0F) {\n+ if (!this.q.I && i0 > 1 && this.aM() <= 0.0F) {\n int i1 = 2 + this.ab.nextInt(3);\n \n for (int i2 = 0; i2 < i1; ++i2) {\n float f0 = ((float) (i2 % 2) - 0.5F) * (float) i0 / 4.0F;\n float f1 = ((float) (i2 / 2) - 0.5F) * (float) i0 / 4.0F;\n- EntitySlime entityslime = this.bG();\n+ EntitySlime entityslime = this.bK();\n \n entityslime.a(i0 / 2);\n entityslime.b(this.u + (double) f0, this.v + 0.5D, this.w + (double) f1, this.ab.nextFloat() * 360.0F, 0.0F);\n@@ -157,70 +157,70 @@ public void w() {\n }\n \n public void b_(EntityPlayer entityplayer) {\n- if (this.bJ()) {\n- int i0 = this.bN();\n+ if (this.bN()) {\n+ int i0 = this.bR();\n \n- if (this.o(entityplayer) && this.e(entityplayer) < 0.6D * (double) i0 * 0.6D * (double) i0 && entityplayer.a(DamageSource.a((EntityLivingBase) this), (float) this.bK())) {\n+ if (this.o(entityplayer) && this.e(entityplayer) < 0.6D * (double) i0 * 0.6D * (double) i0 && entityplayer.a(DamageSource.a((EntityLivingBase) this), (float) this.bO())) {\n this.a(\"mob.attack\", 1.0F, (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n }\n }\n }\n \n- protected boolean bJ() {\n- return this.bN() > 1;\n+ protected boolean bN() {\n+ return this.bR() > 1;\n }\n \n- protected int bK() {\n- return this.bN();\n+ protected int bO() {\n+ return this.bR();\n }\n \n- protected String aK() {\n- return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n+ protected String aN() {\n+ return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n }\n \n- protected String aL() {\n- return \"mob.slime.\" + (this.bN() > 1 ? \"big\" : \"small\");\n+ protected String aO() {\n+ return \"mob.slime.\" + (this.bR() > 1 ? \"big\" : \"small\");\n }\n \n protected int s() {\n- return this.bN() == 1 ? Item.aO.cv : 0;\n+ return this.bR() == 1 ? Item.aO.cv : 0;\n }\n \n- public boolean bo() {\n+ public boolean bs() {\n Chunk chunk = this.q.d(MathHelper.c(this.u), MathHelper.c(this.w));\n \n if (this.q.N().u() == WorldType.c && this.ab.nextInt(4) != 1) {\n return false;\n } else {\n- if (this.bN() == 1 || this.q.r > 0) {\n+ if (this.bR() == 1 || this.q.r > 0) {\n BiomeGenBase biomegenbase = this.q.a(MathHelper.c(this.u), MathHelper.c(this.w));\n \n if (biomegenbase == BiomeGenBase.h && this.v > 50.0D && this.v < 70.0D && this.ab.nextFloat() < 0.5F && this.ab.nextFloat() < this.q.x() && this.q.n(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w)) <= this.ab.nextInt(8)) {\n- return super.bo();\n+ return super.bs();\n }\n \n if (this.ab.nextInt(10) == 0 && chunk.a(987234911L).nextInt(10) == 0 && this.v < 40.0D) {\n- return super.bo();\n+ return super.bs();\n }\n }\n \n return false;\n }\n }\n \n- protected float aW() {\n- return 0.4F * (float) this.bN();\n+ protected float aZ() {\n+ return 0.4F * (float) this.bR();\n }\n \n- public int bl() {\n+ public int bp() {\n return 0;\n }\n \n- protected boolean bO() {\n- return this.bN() > 0;\n+ protected boolean bS() {\n+ return this.bR() > 0;\n }\n \n- protected boolean bM() {\n- return this.bN() > 2;\n+ protected boolean bQ() {\n+ return this.bR() > 2;\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySlime.java","sha":"d553c4c5a9e2effd031d5c0b11c74491c5316ed6","status":"modified"},{"additions":5,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySnowman.java","changes":12,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySnowman.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":7,"filename":"src/main/java/net/minecraft/server/EntitySnowman.java","new_code":" }\n public boolean be() {\n protected void ay() {\n super.ay();\n this.a(\"random.bow\", 1.0F, 1.0F / (this.aC().nextFloat() * 0.4F + 0.8F));","new_methods":[],"old_code":"\n\n}\n public boolean bb() {\n protected void ax() {\n super.ax();\n this.a(\"random.bow\", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.CanarySnowman;\n \n-\n public class EntitySnowman extends EntityGolem implements IRangedAttackMob {\n \n public EntitySnowman(World world) {\n@@ -16,14 +14,14 @@ public EntitySnowman(World world) {\n this.c.a(4, new EntityAILookIdle(this));\n this.d.a(1, new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, true, false, IMob.a));\n this.entity = new CanarySnowman(this); // CanaryMod: Wrap Entity\n-}\n+ }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(4.0D);\n this.a(SharedMonsterAttributes.d).a(0.20000000298023224D);\n }\n@@ -72,7 +70,7 @@ public void a(EntityLivingBase entitylivingbase, float f0) {\n float f1 = MathHelper.a(d0 * d0 + d2 * d2) * 0.2F;\n \n entitysnowball.c(d0, d1 + (double) f1, d2, 1.6F, 12.0F);\n- this.a(\"random.bow\", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));\n+ this.a(\"random.bow\", 1.0F, 1.0F / (this.aC().nextFloat() * 0.4F + 0.8F));\n this.q.d((Entity) entitysnowball);\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySnowman.java","sha":"fb3be51dcf56fcf1dbf82e5062fcf55a5e531784","status":"modified"},{"additions":12,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySpider.java","changes":26,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySpider.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":14,"filename":"src/main/java/net/minecraft/server/EntitySpider.java","new_code":" protected void ay() {\n super.ay();\n protected Entity bL() {\n protected String aN() {\n protected String aO() {\n return this.bT();\n public void al() {}\n public EnumCreatureAttribute aX() {\n public boolean d(PotionEffect potioneffect) {\n return potioneffect.a() == Potion.u.H ? false : super.d(potioneffect);\n public boolean bT() {\n this.c(new PotionEffect(i0, Integer.MAX_VALUE));","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntitySpider.java","implementation":"super.ay();\n protected Entity bL() {\n protected String aN() {\n protected String aO() {\n return this.bT();\n public void al() {","signature":"void ay()"}],"old_code":"\n\n protected void ax() {\n super.ax();\n protected Entity bH() {\n protected String aK() {\n protected String aL() {\n return this.bP();\n public void ak() {}\n public EnumCreatureAttribute aU() {\n public boolean e(PotionEffect potioneffect) {\n return potioneffect.a() == Potion.u.H ? false : super.e(potioneffect);\n public boolean bP() {\n this.d(new PotionEffect(i0, Integer.MAX_VALUE));","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntitySpider.java","implementation":"super.ax();\n protected Entity bH() {\n protected String aK() {\n protected String aL() {\n return this.bP();\n public void ak() {","signature":"void ax()"}],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.monster.CanarySpider;\n \n-\n public class EntitySpider extends EntityMob {\n \n public EntitySpider(World world) {\n@@ -24,13 +22,13 @@ public void l_() {\n }\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(16.0D);\n this.a(SharedMonsterAttributes.d).a(0.800000011920929D);\n }\n \n- protected Entity bH() {\n+ protected Entity bL() {\n float f0 = this.d(1.0F);\n \n if (f0 < 0.5F) {\n@@ -46,11 +44,11 @@ protected String r() {\n return \"mob.spider.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.spider.say\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.spider.death\";\n }\n \n@@ -92,20 +90,20 @@ protected void b(boolean flag0, int i0) {\n }\n \n public boolean e() {\n- return this.bP();\n+ return this.bT();\n }\n \n- public void ak() {}\n+ public void al() {}\n \n- public EnumCreatureAttribute aU() {\n+ public EnumCreatureAttribute aX() {\n return EnumCreatureAttribute.c;\n }\n \n- public boolean e(PotionEffect potioneffect) {\n- return potioneffect.a() == Potion.u.H ? false : super.e(potioneffect);\n+ public boolean d(PotionEffect potioneffect) {\n+ return potioneffect.a() == Potion.u.H ? false : super.d(potioneffect);\n }\n \n- public boolean bP() {\n+ public boolean bT() {\n return (this.ah.a(16) & 1) != 0;\n }\n \n@@ -144,7 +142,7 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n int i0 = ((SpiderEffectsGroupData) object).a;\n \n if (i0 > 0 && Potion.a[i0] != null) {\n- this.d(new PotionEffect(i0, Integer.MAX_VALUE));\n+ this.c(new PotionEffect(i0, Integer.MAX_VALUE));\n }\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySpider.java","sha":"2f37a380b255d5a06ad162a2f8db7536674ff333","status":"modified"},{"additions":9,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySquid.java","changes":20,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySquid.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":11,"filename":"src/main/java/net/minecraft/server/EntitySquid.java","new_code":" protected void ay() {\n super.ay();\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n protected void bk() {\n this.bo();\n public boolean bs() {\n return this.v > 45.0D && this.v < 63.0D && super.bs();","new_methods":[],"old_code":"\n\n protected void ax() {\n super.ax();\n protected String aK() {\n protected String aL() {\n protected float aW() {\n protected void bh() {\n this.bk();\n public boolean bo() {\n return this.v > 45.0D && this.v < 63.0D && super.bo();","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.entity.living.animal.CanarySquid;\n \n-\n public class EntitySquid extends EntityWaterMob {\n \n public float bp;\n@@ -28,24 +26,24 @@ public EntitySquid(World world) {\n this.entity = new CanarySquid(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(10.0D);\n }\n \n protected String r() {\n return null;\n }\n \n- protected String aK() {\n+ protected String aN() {\n return null;\n }\n \n- protected String aL() {\n+ protected String aO() {\n return null;\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 0.4F;\n }\n \n@@ -129,7 +127,7 @@ public void e(float f0, float f1) {\n this.d(this.x, this.y, this.z);\n }\n \n- protected void bh() {\n+ protected void bk() {\n ++this.aV;\n if (this.aV > 100) {\n this.bA = this.bB = this.bC = 0.0F;\n@@ -141,10 +139,10 @@ protected void bh() {\n this.bC = MathHelper.a(f0) * 0.2F;\n }\n \n- this.bk();\n+ this.bo();\n }\n \n- public boolean bo() {\n- return this.v > 45.0D && this.v < 63.0D && super.bo();\n+ public boolean bs() {\n+ return this.v > 45.0D && this.v < 63.0D && super.bs();\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySquid.java","sha":"13680d0889dff5608c43535b0a65592dd5adbe1f","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityThrowable.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityThrowable.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":4,"filename":"src/main/java/net/minecraft/server/EntityThrowable.java","new_code":" this.aa();\n this.h = this.g.am();","new_methods":[],"old_code":"\n\n this.Z();\n this.h = this.g.al();","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n \n-\n public abstract class EntityThrowable extends Entity implements IProjectile {\n \n private int c = -1;\n@@ -155,7 +153,7 @@ public void l_() {\n \n if (movingobjectposition != null) {\n if (movingobjectposition.a == EnumMovingObjectType.a && this.q.a(movingobjectposition.b, movingobjectposition.c, movingobjectposition.d) == Block.bj.cF) {\n- this.Z();\n+ this.aa();\n } else {\n this.a(movingobjectposition);\n }\n@@ -220,7 +218,7 @@ public void b(NBTTagCompound nbttagcompound) {\n nbttagcompound.a(\"shake\", (byte) this.b);\n nbttagcompound.a(\"inGround\", (byte) (this.a ? 1 : 0));\n if ((this.h == null || this.h.length() == 0) && this.g != null && this.g instanceof EntityPlayer) {\n- this.h = this.g.al();\n+ this.h = this.g.am();\n }\n \n nbttagcompound.a(\"ownerName\", this.h == null ? \"\" : this.h);","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityThrowable.java","sha":"197cc324be2ede2612e9db152eff89b7a77605f1","status":"modified"},{"additions":10,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityTrackerEntry.java","changes":20,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityTrackerEntry.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":10,"filename":"src/main/java/net/minecraft/server/EntityTrackerEntry.java","new_code":" this.i = MathHelper.d(entity.ao() * 256.0F / 360.0F);\n if (i09.a.f() <= 5) {\n i0 = MathHelper.d(this.a.ao() * 256.0F / 360.0F);\n ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aW();\n ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aW();\n if (this.a instanceof EntityLiving && ((EntityLiving) this.a).bI() != null) {\n entityplayermp.a.b(new Packet39AttachEntity(1, this.a, ((EntityLiving) this.a).bI()));\n if (entityplayer.bg()) {\n Iterator iterator = entitylivingbase.aK().iterator();\n this.i = MathHelper.d(this.a.ao() * 256.0F / 360.0F);","new_methods":[],"old_code":" this.i = MathHelper.d(entity.an() * 256.0F / 360.0F);\n if (i09.a.e() <= 5) {\n i0 = MathHelper.d(this.a.an() * 256.0F / 360.0F);\n ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aT();\n ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aT();\n if (this.a instanceof EntityLiving && ((EntityLiving) this.a).bE() != null) {\n entityplayermp.a.b(new Packet39AttachEntity(1, this.a, ((EntityLiving) this.a).bE()));\n if (entityplayer.bd()) {\n Iterator iterator = entitylivingbase.aH().iterator();\n this.i = MathHelper.d(this.a.an() * 256.0F / 360.0F);","old_methods":[],"patch":"@@ -46,7 +46,7 @@ public EntityTrackerEntry(Entity entity, int i0, int i1, boolean flag0) {\n this.f = MathHelper.c(entity.w * 32.0D);\n this.g = MathHelper.d(entity.A * 256.0F / 360.0F);\n this.h = MathHelper.d(entity.B * 256.0F / 360.0F);\n- this.i = MathHelper.d(entity.an() * 256.0F / 360.0F);\n+ this.i = MathHelper.d(entity.ao() * 256.0F / 360.0F);\n \n canaryEntry = new CanaryEntityTrackerEntry(this);\n }\n@@ -88,7 +88,7 @@ public void a(List list) {\n EntityPlayerMP i09 = (EntityPlayerMP) i08;\n \n i06.a(i09, i04);\n- if (i09.a.e() <= 5) {\n+ if (i09.a.f() <= 5) {\n Packet i10 = Item.bf.c(i04, this.a.q, i09);\n \n if (i10 != null) {\n@@ -182,7 +182,7 @@ public void a(List list) {\n this.w = true;\n }\n \n- i0 = MathHelper.d(this.a.an() * 256.0F / 360.0F);\n+ i0 = MathHelper.d(this.a.ao() * 256.0F / 360.0F);\n if (Math.abs(i0 - this.i) >= 4) {\n this.a((Packet) (new Packet35EntityHeadRotation(this.a.k, (byte) i0)));\n this.i = i0;\n@@ -206,7 +206,7 @@ private void b() {\n }\n \n if (this.a instanceof EntityLivingBase) {\n- ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aT();\n+ ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aW();\n Set set = serversideattributemap.b();\n \n if (!set.isEmpty()) {\n@@ -267,7 +267,7 @@ public void b(EntityPlayerMP entityplayermp) {\n }\n \n if (this.a instanceof EntityLivingBase) {\n- ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aT();\n+ ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aW();\n Collection collection = serversideattributemap.c();\n \n if (!collection.isEmpty()) {\n@@ -286,8 +286,8 @@ public void b(EntityPlayerMP entityplayermp) {\n entityplayermp.a.b(new Packet39AttachEntity(0, this.a, this.a.o));\n }\n \n- if (this.a instanceof EntityLiving && ((EntityLiving) this.a).bE() != null) {\n- entityplayermp.a.b(new Packet39AttachEntity(1, this.a, ((EntityLiving) this.a).bE()));\n+ if (this.a instanceof EntityLiving && ((EntityLiving) this.a).bI() != null) {\n+ entityplayermp.a.b(new Packet39AttachEntity(1, this.a, ((EntityLiving) this.a).bI()));\n }\n \n if (this.a instanceof EntityLivingBase) {\n@@ -303,14 +303,14 @@ public void b(EntityPlayerMP entityplayermp) {\n if (this.a instanceof EntityPlayer) {\n EntityPlayer entityplayer = (EntityPlayer) this.a;\n \n- if (entityplayer.bd()) {\n+ if (entityplayer.bg()) {\n entityplayermp.a.b(new Packet17Sleep(this.a, 0, MathHelper.c(this.a.u), MathHelper.c(this.a.v), MathHelper.c(this.a.w)));\n }\n }\n \n if (this.a instanceof EntityLivingBase) {\n EntityLivingBase entitylivingbase = (EntityLivingBase) this.a;\n- Iterator iterator = entitylivingbase.aH().iterator();\n+ Iterator iterator = entitylivingbase.aK().iterator();\n \n while (iterator.hasNext()) {\n PotionEffect potioneffect = (PotionEffect) iterator.next();\n@@ -434,7 +434,7 @@ private Packet c() {\n }\n }\n } else {\n- this.i = MathHelper.d(this.a.an() * 256.0F / 360.0F);\n+ this.i = MathHelper.d(this.a.ao() * 256.0F / 360.0F);\n return new Packet24MobSpawn((EntityLivingBase) this.a);\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityTrackerEntry.java","sha":"0c0bb94c3b64d48524f1e0a85059e3aa13287556","status":"modified"},{"additions":91,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityVillager.java","changes":182,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityVillager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":91,"filename":"src/main/java/net/minecraft/server/EntityVillager.java","new_code":" this.c.a(5, new EntityAIMoveTowardsRestriction(this, 0.6D));\n protected void ay() {\n super.ay();\n public boolean be() {\n protected void bj() {\n this.bR();\n if (!this.bW() && this.bv > 0) {\n this.c(new PotionEffect(Potion.l.H, 200, 0));\n super.bj();\n if (!flag0 && this.S() && !this.bW() && !this.g_()) {\n entityplayer.a((IMerchant) this, this.bA());\n nbttagcompound.a(\"Profession\", this.bT());\n return this.bW() ? \"mob.villager.haggle\" : \"mob.villager.idle\";\n protected String aN() {\n protected String aO() {\n public int bT() {\n public boolean bU() {\n public void i(boolean flag0) {\n public void j(boolean flag0) {\n public boolean bV() {\n if (this.S()) {\n public boolean bW() {\n this.a(\"mob.villager.yes\", this.aZ(), this.ba());\n this.a(\"mob.villager.yes\", this.aZ(), this.ba());\n this.a(\"mob.villager.no\", this.aZ(), this.ba());\n private float p(float f0) {\n label50: switch (this.bT()) {\n a(merchantrecipelist, Item.V.cv, this.ab, this.p(0.9F));\n a(merchantrecipelist, Block.ag.cF, this.ab, this.p(0.5F));\n a(merchantrecipelist, Item.bm.cv, this.ab, this.p(0.5F));\n a(merchantrecipelist, Item.aX.cv, this.ab, this.p(0.4F));\n b(merchantrecipelist, Item.W.cv, this.ab, this.p(0.9F));\n b(merchantrecipelist, Item.bh.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.l.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.be.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.bg.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.k.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.bn.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.n.cv, this.ab, this.p(0.5F));\n if (this.ab.nextFloat() < this.p(0.5F)) {\n a(merchantrecipelist, Item.aM.cv, this.ab, this.p(0.8F));\n a(merchantrecipelist, Item.aN.cv, this.ab, this.p(0.8F));\n a(merchantrecipelist, Item.bI.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Block.as.cF, this.ab, this.p(0.8F));\n b(merchantrecipelist, Block.R.cF, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.aS.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.aU.cv, this.ab, this.p(0.2F));\n if (this.ab.nextFloat() < this.p(0.07F)) {\n b(merchantrecipelist, Item.bC.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.bF.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.aE.cv, this.ab, this.p(0.4F));\n b(merchantrecipelist, Block.bi.cF, this.ab, this.p(0.3F));\n if (this.ab.nextFloat() < this.p(0.05F)) {\n a(merchantrecipelist, Item.o.cv, this.ab, this.p(0.7F));\n a(merchantrecipelist, Item.q.cv, this.ab, this.p(0.5F));\n a(merchantrecipelist, Item.r.cv, this.ab, this.p(0.5F));\n a(merchantrecipelist, Item.p.cv, this.ab, this.p(0.5F));\n b(merchantrecipelist, Item.s.cv, this.ab, this.p(0.5F));\n b(merchantrecipelist, Item.B.cv, this.ab, this.p(0.5F));\n b(merchantrecipelist, Item.j.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.E.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.i.cv, this.ab, this.p(0.5F));\n b(merchantrecipelist, Item.D.cv, this.ab, this.p(0.5F));\n b(merchantrecipelist, Item.h.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.C.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.R.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.S.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.ai.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.am.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.af.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.aj.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.ag.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.ak.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.ah.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.al.cv, this.ab, this.p(0.2F));\n b(merchantrecipelist, Item.ae.cv, this.ab, this.p(0.1F));\n b(merchantrecipelist, Item.ab.cv, this.ab, this.p(0.1F));\n b(merchantrecipelist, Item.ac.cv, this.ab, this.p(0.1F));\n b(merchantrecipelist, Item.ad.cv, this.ab, this.p(0.1F));\n a(merchantrecipelist, Item.o.cv, this.ab, this.p(0.7F));\n a(merchantrecipelist, Item.as.cv, this.ab, this.p(0.5F));\n a(merchantrecipelist, Item.bk.cv, this.ab, this.p(0.5F));\n b(merchantrecipelist, Item.aC.cv, this.ab, this.p(0.1F));\n b(merchantrecipelist, Item.Y.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.aa.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.X.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.Z.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.at.cv, this.ab, this.p(0.3F));\n b(merchantrecipelist, Item.bl.cv, this.ab, this.p(0.3F));\n public void bX() {\n public boolean bG() {","new_methods":[],"old_code":" this.c.a(5, new EntityAIMoveTwardsRestriction(this, 0.6D));\n protected void ax() {\n super.ax();\n public boolean bb() {\n protected void bg() {\n this.bN();\n if (!this.bS() && this.bv > 0) {\n this.d(new PotionEffect(Potion.l.H, 200, 0));\n super.bg();\n if (!flag0 && this.R() && !this.bS() && !this.g_()) {\n entityplayer.a((IMerchant) this, this.bw());\n nbttagcompound.a(\"Profession\", this.bP());\n return this.bS() ? \"mob.villager.haggle\" : \"mob.villager.idle\";\n protected String aK() {\n protected String aL() {\n public int bP() {\n public boolean bQ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bR() {\n if (this.R()) {\n public boolean bS() {\n this.a(\"mob.villager.yes\", this.aW(), this.aX());\n this.a(\"mob.villager.yes\", this.aW(), this.aX());\n this.a(\"mob.villager.no\", this.aW(), this.aX());\n private float o(float f0) {\n label50: switch (this.bP()) {\n a(merchantrecipelist, Item.V.cv, this.ab, this.o(0.9F));\n a(merchantrecipelist, Block.ag.cF, this.ab, this.o(0.5F));\n a(merchantrecipelist, Item.bm.cv, this.ab, this.o(0.5F));\n a(merchantrecipelist, Item.aX.cv, this.ab, this.o(0.4F));\n b(merchantrecipelist, Item.W.cv, this.ab, this.o(0.9F));\n b(merchantrecipelist, Item.bh.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.l.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.be.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.bg.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.k.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.bn.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.n.cv, this.ab, this.o(0.5F));\n if (this.ab.nextFloat() < this.o(0.5F)) {\n a(merchantrecipelist, Item.aM.cv, this.ab, this.o(0.8F));\n a(merchantrecipelist, Item.aN.cv, this.ab, this.o(0.8F));\n a(merchantrecipelist, Item.bI.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Block.as.cF, this.ab, this.o(0.8F));\n b(merchantrecipelist, Block.R.cF, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.aS.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.aU.cv, this.ab, this.o(0.2F));\n if (this.ab.nextFloat() < this.o(0.07F)) {\n b(merchantrecipelist, Item.bC.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.bF.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.aE.cv, this.ab, this.o(0.4F));\n b(merchantrecipelist, Block.bi.cF, this.ab, this.o(0.3F));\n if (this.ab.nextFloat() < this.o(0.05F)) {\n a(merchantrecipelist, Item.o.cv, this.ab, this.o(0.7F));\n a(merchantrecipelist, Item.q.cv, this.ab, this.o(0.5F));\n a(merchantrecipelist, Item.r.cv, this.ab, this.o(0.5F));\n a(merchantrecipelist, Item.p.cv, this.ab, this.o(0.5F));\n b(merchantrecipelist, Item.s.cv, this.ab, this.o(0.5F));\n b(merchantrecipelist, Item.B.cv, this.ab, this.o(0.5F));\n b(merchantrecipelist, Item.j.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.E.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.i.cv, this.ab, this.o(0.5F));\n b(merchantrecipelist, Item.D.cv, this.ab, this.o(0.5F));\n b(merchantrecipelist, Item.h.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.C.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.R.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.S.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.ai.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.am.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.af.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.aj.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.ag.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.ak.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.ah.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.al.cv, this.ab, this.o(0.2F));\n b(merchantrecipelist, Item.ae.cv, this.ab, this.o(0.1F));\n b(merchantrecipelist, Item.ab.cv, this.ab, this.o(0.1F));\n b(merchantrecipelist, Item.ac.cv, this.ab, this.o(0.1F));\n b(merchantrecipelist, Item.ad.cv, this.ab, this.o(0.1F));\n a(merchantrecipelist, Item.o.cv, this.ab, this.o(0.7F));\n a(merchantrecipelist, Item.as.cv, this.ab, this.o(0.5F));\n a(merchantrecipelist, Item.bk.cv, this.ab, this.o(0.5F));\n b(merchantrecipelist, Item.aC.cv, this.ab, this.o(0.1F));\n b(merchantrecipelist, Item.Y.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.aa.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.X.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.Z.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.at.cv, this.ab, this.o(0.3F));\n b(merchantrecipelist, Item.bl.cv, this.ab, this.o(0.3F));\n public void bT() {\n public boolean bC() {","old_methods":[],"patch":"@@ -44,7 +44,7 @@ public EntityVillager(World world, int i0) {\n this.c.a(2, new EntityAIMoveIndoors(this));\n this.c.a(3, new EntityAIRestrictOpenDoor(this));\n this.c.a(4, new EntityAIOpenDoor(this, true));\n- this.c.a(5, new EntityAIMoveTwardsRestriction(this, 0.6D));\n+ this.c.a(5, new EntityAIMoveTowardsRestriction(this, 0.6D));\n this.c.a(6, new EntityAIVillagerMate(this));\n this.c.a(7, new EntityAIFollowGolem(this));\n this.c.a(8, new EntityAIPlay(this, 0.32D));\n@@ -55,22 +55,22 @@ public EntityVillager(World world, int i0) {\n this.entity = new CanaryVillager(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.d).a(0.5D);\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- protected void bg() {\n+ protected void bj() {\n if (--this.bq <= 0) {\n this.q.A.a(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w));\n this.bq = 70 + this.ab.nextInt(50);\n this.bp = this.q.A.a(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w), 32);\n if (this.bp == null) {\n- this.bN();\n+ this.bR();\n } else {\n ChunkCoordinates chunkcoordinates = this.bp.a();\n \n@@ -82,7 +82,7 @@ protected void bg() {\n }\n }\n \n- if (!this.bS() && this.bv > 0) {\n+ if (!this.bW() && this.bv > 0) {\n --this.bv;\n if (this.bv <= 0) {\n if (this.bw) {\n@@ -106,21 +106,21 @@ protected void bg() {\n }\n }\n \n- this.d(new PotionEffect(Potion.l.H, 200, 0));\n+ this.c(new PotionEffect(Potion.l.H, 200, 0));\n }\n }\n \n- super.bg();\n+ super.bj();\n }\n \n public boolean a(EntityPlayer entityplayer) {\n ItemStack itemstack = entityplayer.bn.h();\n boolean flag0 = itemstack != null && itemstack.d == Item.bE.cv;\n \n- if (!flag0 && this.R() && !this.bS() && !this.g_()) {\n+ if (!flag0 && this.S() && !this.bW() && !this.g_()) {\n if (!this.q.I) {\n this.a_(entityplayer);\n- entityplayer.a((IMerchant) this, this.bw());\n+ entityplayer.a((IMerchant) this, this.bA());\n }\n \n return true;\n@@ -136,7 +136,7 @@ protected void a() {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"Profession\", this.bP());\n+ nbttagcompound.a(\"Profession\", this.bT());\n nbttagcompound.a(\"Riches\", this.bx);\n if (this.bu != null) {\n nbttagcompound.a(\"Offers\", this.bu.a());\n@@ -159,38 +159,38 @@ protected boolean t() {\n }\n \n protected String r() {\n- return this.bS() ? \"mob.villager.haggle\" : \"mob.villager.idle\";\n+ return this.bW() ? \"mob.villager.haggle\" : \"mob.villager.idle\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.villager.hit\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.villager.death\";\n }\n \n public void p(int i0) {\n this.ah.b(16, Integer.valueOf(i0));\n }\n \n- public int bP() {\n+ public int bT() {\n return this.ah.c(16);\n }\n \n- public boolean bQ() {\n+ public boolean bU() {\n return this.br;\n }\n \n- public void j(boolean flag0) {\n+ public void i(boolean flag0) {\n this.br = flag0;\n }\n \n- public void k(boolean flag0) {\n+ public void j(boolean flag0) {\n this.bs = flag0;\n }\n \n- public boolean bR() {\n+ public boolean bV() {\n return this.bs;\n }\n \n@@ -206,7 +206,7 @@ public void b(EntityLivingBase entitylivingbase) {\n }\n \n this.bp.a(((EntityPlayer) entitylivingbase).c_(), b0);\n- if (this.R()) {\n+ if (this.S()) {\n this.q.a((Entity) this, (byte) 13);\n }\n }\n@@ -243,14 +243,14 @@ public EntityPlayer m_() {\n return this.bt;\n }\n \n- public boolean bS() {\n+ public boolean bW() {\n return this.bt != null;\n }\n \n public void a(MerchantRecipe merchantrecipe) {\n merchantrecipe.f();\n this.a_ = -this.o();\n- this.a(\"mob.villager.yes\", this.aW(), this.aX());\n+ this.a(\"mob.villager.yes\", this.aZ(), this.ba());\n if (merchantrecipe.a((MerchantRecipe) this.bu.get(this.bu.size() - 1))) {\n this.bv = 40;\n this.bw = true;\n@@ -270,9 +270,9 @@ public void a_(ItemStack itemstack) {\n if (!this.q.I && this.a_ > -this.o() + 20) {\n this.a_ = -this.o();\n if (itemstack != null) {\n- this.a(\"mob.villager.yes\", this.aW(), this.aX());\n+ this.a(\"mob.villager.yes\", this.aZ(), this.ba());\n } else {\n- this.a(\"mob.villager.no\", this.aW(), this.aX());\n+ this.a(\"mob.villager.no\", this.aZ(), this.ba());\n }\n }\n }\n@@ -285,7 +285,7 @@ public MerchantRecipeList b(EntityPlayer entityplayer) {\n return this.bu;\n }\n \n- private float o(float f0) {\n+ private float p(float f0) {\n float f1 = f0 + this.bA;\n \n return f1 > 0.9F ? 0.9F - (f1 - 0.9F) : f1;\n@@ -303,34 +303,34 @@ private void q(int i0) {\n merchantrecipelist = new MerchantRecipeList();\n int i1;\n \n- label50: switch (this.bP()) {\n+ label50: switch (this.bT()) {\n case 0:\n- a(merchantrecipelist, Item.V.cv, this.ab, this.o(0.9F));\n- a(merchantrecipelist, Block.ag.cF, this.ab, this.o(0.5F));\n- a(merchantrecipelist, Item.bm.cv, this.ab, this.o(0.5F));\n- a(merchantrecipelist, Item.aX.cv, this.ab, this.o(0.4F));\n- b(merchantrecipelist, Item.W.cv, this.ab, this.o(0.9F));\n- b(merchantrecipelist, Item.bh.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.l.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.be.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.bg.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.k.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.bn.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.n.cv, this.ab, this.o(0.5F));\n- if (this.ab.nextFloat() < this.o(0.5F)) {\n+ a(merchantrecipelist, Item.V.cv, this.ab, this.p(0.9F));\n+ a(merchantrecipelist, Block.ag.cF, this.ab, this.p(0.5F));\n+ a(merchantrecipelist, Item.bm.cv, this.ab, this.p(0.5F));\n+ a(merchantrecipelist, Item.aX.cv, this.ab, this.p(0.4F));\n+ b(merchantrecipelist, Item.W.cv, this.ab, this.p(0.9F));\n+ b(merchantrecipelist, Item.bh.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.l.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.be.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.bg.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.k.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.bn.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.n.cv, this.ab, this.p(0.5F));\n+ if (this.ab.nextFloat() < this.p(0.5F)) {\n merchantrecipelist.add(new MerchantRecipe(new ItemStack(Block.K, 10), new ItemStack(Item.bJ), new ItemStack(Item.ar.cv, 4 + this.ab.nextInt(2), 0)));\n }\n break;\n \n case 1:\n- a(merchantrecipelist, Item.aM.cv, this.ab, this.o(0.8F));\n- a(merchantrecipelist, Item.aN.cv, this.ab, this.o(0.8F));\n- a(merchantrecipelist, Item.bI.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Block.as.cF, this.ab, this.o(0.8F));\n- b(merchantrecipelist, Block.R.cF, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.aS.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.aU.cv, this.ab, this.o(0.2F));\n- if (this.ab.nextFloat() < this.o(0.07F)) {\n+ a(merchantrecipelist, Item.aM.cv, this.ab, this.p(0.8F));\n+ a(merchantrecipelist, Item.aN.cv, this.ab, this.p(0.8F));\n+ a(merchantrecipelist, Item.bI.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Block.as.cF, this.ab, this.p(0.8F));\n+ b(merchantrecipelist, Block.R.cF, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.aS.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.aU.cv, this.ab, this.p(0.2F));\n+ if (this.ab.nextFloat() < this.p(0.07F)) {\n Enchantment enchantment = Enchantment.c[this.ab.nextInt(Enchantment.c.length)];\n int i2 = MathHelper.a(this.ab, enchantment.d(), enchantment.b());\n ItemStack itemstack = Item.bY.a(new EnchantmentData(enchantment, i2));\n@@ -341,10 +341,10 @@ private void q(int i0) {\n break;\n \n case 2:\n- b(merchantrecipelist, Item.bC.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.bF.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.aE.cv, this.ab, this.o(0.4F));\n- b(merchantrecipelist, Block.bi.cF, this.ab, this.o(0.3F));\n+ b(merchantrecipelist, Item.bC.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.bF.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.aE.cv, this.ab, this.p(0.4F));\n+ b(merchantrecipelist, Block.bi.cF, this.ab, this.p(0.3F));\n int[] aint = new int[]{ Item.s.cv, Item.B.cv, Item.ag.cv, Item.ak.cv, Item.j.cv, Item.E.cv, Item.i.cv, Item.D.cv };\n int[] aint1 = aint;\n int i3 = aint.length;\n@@ -358,53 +358,53 @@ private void q(int i0) {\n \n int i4 = aint1[i1];\n \n- if (this.ab.nextFloat() < this.o(0.05F)) {\n+ if (this.ab.nextFloat() < this.p(0.05F)) {\n merchantrecipelist.add(new MerchantRecipe(new ItemStack(i4, 1, 0), new ItemStack(Item.bJ, 2 + this.ab.nextInt(3), 0), EnchantmentHelper.a(this.ab, new ItemStack(i4, 1, 0), 5 + this.ab.nextInt(15))));\n }\n \n ++i1;\n }\n \n case 3:\n- a(merchantrecipelist, Item.o.cv, this.ab, this.o(0.7F));\n- a(merchantrecipelist, Item.q.cv, this.ab, this.o(0.5F));\n- a(merchantrecipelist, Item.r.cv, this.ab, this.o(0.5F));\n- a(merchantrecipelist, Item.p.cv, this.ab, this.o(0.5F));\n- b(merchantrecipelist, Item.s.cv, this.ab, this.o(0.5F));\n- b(merchantrecipelist, Item.B.cv, this.ab, this.o(0.5F));\n- b(merchantrecipelist, Item.j.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.E.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.i.cv, this.ab, this.o(0.5F));\n- b(merchantrecipelist, Item.D.cv, this.ab, this.o(0.5F));\n- b(merchantrecipelist, Item.h.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.C.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.R.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.S.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.ai.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.am.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.af.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.aj.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.ag.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.ak.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.ah.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.al.cv, this.ab, this.o(0.2F));\n- b(merchantrecipelist, Item.ae.cv, this.ab, this.o(0.1F));\n- b(merchantrecipelist, Item.ab.cv, this.ab, this.o(0.1F));\n- b(merchantrecipelist, Item.ac.cv, this.ab, this.o(0.1F));\n- b(merchantrecipelist, Item.ad.cv, this.ab, this.o(0.1F));\n+ a(merchantrecipelist, Item.o.cv, this.ab, this.p(0.7F));\n+ a(merchantrecipelist, Item.q.cv, this.ab, this.p(0.5F));\n+ a(merchantrecipelist, Item.r.cv, this.ab, this.p(0.5F));\n+ a(merchantrecipelist, Item.p.cv, this.ab, this.p(0.5F));\n+ b(merchantrecipelist, Item.s.cv, this.ab, this.p(0.5F));\n+ b(merchantrecipelist, Item.B.cv, this.ab, this.p(0.5F));\n+ b(merchantrecipelist, Item.j.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.E.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.i.cv, this.ab, this.p(0.5F));\n+ b(merchantrecipelist, Item.D.cv, this.ab, this.p(0.5F));\n+ b(merchantrecipelist, Item.h.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.C.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.R.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.S.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.ai.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.am.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.af.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.aj.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.ag.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.ak.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.ah.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.al.cv, this.ab, this.p(0.2F));\n+ b(merchantrecipelist, Item.ae.cv, this.ab, this.p(0.1F));\n+ b(merchantrecipelist, Item.ab.cv, this.ab, this.p(0.1F));\n+ b(merchantrecipelist, Item.ac.cv, this.ab, this.p(0.1F));\n+ b(merchantrecipelist, Item.ad.cv, this.ab, this.p(0.1F));\n break;\n \n case 4:\n- a(merchantrecipelist, Item.o.cv, this.ab, this.o(0.7F));\n- a(merchantrecipelist, Item.as.cv, this.ab, this.o(0.5F));\n- a(merchantrecipelist, Item.bk.cv, this.ab, this.o(0.5F));\n- b(merchantrecipelist, Item.aC.cv, this.ab, this.o(0.1F));\n- b(merchantrecipelist, Item.Y.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.aa.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.X.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.Z.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.at.cv, this.ab, this.o(0.3F));\n- b(merchantrecipelist, Item.bl.cv, this.ab, this.o(0.3F));\n+ a(merchantrecipelist, Item.o.cv, this.ab, this.p(0.7F));\n+ a(merchantrecipelist, Item.as.cv, this.ab, this.p(0.5F));\n+ a(merchantrecipelist, Item.bk.cv, this.ab, this.p(0.5F));\n+ b(merchantrecipelist, Item.aC.cv, this.ab, this.p(0.1F));\n+ b(merchantrecipelist, Item.Y.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.aa.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.X.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.Z.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.at.cv, this.ab, this.p(0.3F));\n+ b(merchantrecipelist, Item.bl.cv, this.ab, this.p(0.3F));\n }\n \n if (merchantrecipelist.isEmpty()) {\n@@ -473,7 +473,7 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n return entitylivingdata;\n }\n \n- public void bT() {\n+ public void bX() {\n this.bz = true;\n }\n \n@@ -484,7 +484,7 @@ public EntityVillager b(EntityAgeable entityageable) {\n return entityvillager;\n }\n \n- public boolean bC() {\n+ public boolean bG() {\n return false;\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityVillager.java","sha":"39e2c2294a36e4b1f9721b55232ff15b40f5ece8","status":"modified"},{"additions":16,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitch.java","changes":32,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitch.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":16,"filename":"src/main/java/net/minecraft/server/EntityWitch.java","new_code":" protected String aN() {\n protected String aO() {\n public boolean bT() {\n protected void ay() {\n super.ay();\n public boolean be() {\n if (this.bT()) {\n ItemStack itemstack = this.aY();\n this.c(new PotionEffect(potioneffect));\n if (this.ab.nextFloat() < 0.15F && this.ae() && !this.a(Potion.n)) {\n } else if (this.ab.nextFloat() < 0.05F && this.aM() < this.aS()) {\n } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e(this) > 121.0D) {\n } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e(this) > 121.0D) {\n this.bs = this.aY().n();\n if (!this.bT()) {\n } else if (entitylivingbase.aM() >= 8.0F && !entitylivingbase.a(Potion.u)) {","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWitch.java","implementation":"protected String aO() {\n public boolean bT() {\n protected void ay() {\n super.ay();\n public boolean be() {\n if (this.bT()) {\n ItemStack itemstack = this.aY();\n this.c(new PotionEffect(potioneffect));\n if (this.ab.nextFloat() < 0.15F && this.ae() && !this.a(Potion.n)) {","signature":"String aN()"}],"old_code":" protected String aK() {\n protected String aL() {\n public boolean bP() {\n protected void ax() {\n super.ax();\n public boolean bb() {\n if (this.bP()) {\n ItemStack itemstack = this.aV();\n this.d(new PotionEffect(potioneffect));\n if (this.ab.nextFloat() < 0.15F && this.ad() && !this.a(Potion.n)) {\n } else if (this.ab.nextFloat() < 0.05F && this.aJ() < this.aP()) {\n } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e((Entity) this) > 121.0D) {\n } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e((Entity) this) > 121.0D) {\n this.bs = this.aV().n();\n if (!this.bP()) {\n } else if (entitylivingbase.aJ() >= 8.0F && !entitylivingbase.a(Potion.u)) {","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWitch.java","implementation":"protected String aL() {\n public boolean bP() {\n protected void ax() {\n super.ax();\n public boolean bb() {\n if (this.bP()) {\n ItemStack itemstack = this.aV();\n this.d(new PotionEffect(potioneffect));\n if (this.ab.nextFloat() < 0.15F && this.ad() && !this.a(Potion.n)) {","signature":"String aK()"}],"patch":"@@ -33,38 +33,38 @@ protected String r() {\n return \"mob.witch.idle\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.witch.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.witch.death\";\n }\n \n public void a(boolean flag0) {\n this.u().b(21, Byte.valueOf((byte) (flag0 ? 1 : 0)));\n }\n \n- public boolean bP() {\n+ public boolean bT() {\n return this.u().a(21) == 1;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(26.0D);\n this.a(SharedMonsterAttributes.d).a(0.25D);\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n public void c() {\n if (!this.q.I) {\n- if (this.bP()) {\n+ if (this.bT()) {\n if (this.bs-- <= 0) {\n this.a(false);\n- ItemStack itemstack = this.aV();\n+ ItemStack itemstack = this.aY();\n \n this.c(0, (ItemStack) null);\n if (itemstack != null && itemstack.d == Item.bu.cv) {\n@@ -76,7 +76,7 @@ public void c() {\n while (iterator.hasNext()) {\n PotionEffect potioneffect = (PotionEffect) iterator.next();\n \n- this.d(new PotionEffect(potioneffect));\n+ this.c(new PotionEffect(potioneffect));\n }\n }\n }\n@@ -86,19 +86,19 @@ public void c() {\n } else {\n short short1 = -1;\n \n- if (this.ab.nextFloat() < 0.15F && this.ad() && !this.a(Potion.n)) {\n+ if (this.ab.nextFloat() < 0.15F && this.ae() && !this.a(Potion.n)) {\n short1 = 16307;\n- } else if (this.ab.nextFloat() < 0.05F && this.aJ() < this.aP()) {\n+ } else if (this.ab.nextFloat() < 0.05F && this.aM() < this.aS()) {\n short1 = 16341;\n- } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e((Entity) this) > 121.0D) {\n+ } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e(this) > 121.0D) {\n short1 = 16274;\n- } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e((Entity) this) > 121.0D) {\n+ } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e(this) > 121.0D) {\n short1 = 16274;\n }\n \n if (short1 > -1) {\n this.c(0, new ItemStack(Item.bu, 1, short1));\n- this.bs = this.aV().n();\n+ this.bs = this.aY().n();\n this.a(true);\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\n \n@@ -146,7 +146,7 @@ protected void b(boolean flag0, int i0) {\n }\n \n public void a(EntityLivingBase entitylivingbase, float f0) {\n- if (!this.bP()) {\n+ if (!this.bT()) {\n EntityPotion entitypotion = new EntityPotion(this.q, this, 32732);\n \n entitypotion.B -= -20.0F;\n@@ -157,7 +157,7 @@ public void a(EntityLivingBase entitylivingbase, float f0) {\n \n if (f1 >= 8.0F && !entitylivingbase.a(Potion.d)) {\n entitypotion.a(32698);\n- } else if (entitylivingbase.aJ() >= 8.0F && !entitylivingbase.a(Potion.u)) {\n+ } else if (entitylivingbase.aM() >= 8.0F && !entitylivingbase.a(Potion.u)) {\n entitypotion.a(32660);\n } else if (f1 <= 3.0F && !entitylivingbase.a(Potion.t) && this.ab.nextFloat() < 0.25F) {\n entitypotion.a(32696);","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitch.java","sha":"0554d920941364aac03d7a30e054f36b0f818ffa","status":"modified"},{"additions":31,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWither.java","changes":64,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWither.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":33,"filename":"src/main/java/net/minecraft/server/EntityWither.java","new_code":" this.g(this.aS());\n this.entity = new CanaryWither(this); // CanaryMod: Wrap Entity\n nbttagcompound.a(\"Invul\", this.bU());\n protected String aN() {\n protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {}\n public int aP() {\n if (this.aq()) {\n } else if (this.bU() > 0) {\n if (this.bV()) {\n if (entity != null && !(entity instanceof EntityPlayer) && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).aX() == this.aX()) {\n protected void bo() {\n public void c(PotionEffect potioneffect) {}\n protected boolean be() {\n protected void ay() {\n super.ay();\n public int bU() {\n public boolean bV() {\n return this.aM() <= this.aS() / 2.0F;\n public EnumCreatureAttribute aX() {","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWither.java","implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","signature":"String aN()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWither.java","implementation":"if (this.aq()) {","signature":"int aP()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWither.java","implementation":"public void c(PotionEffect potioneffect) {","signature":"void bo()"}],"old_code":"\n\n this.g(this.aP());\nthis.entity = new CanaryWither(this); // CanaryMod: Wrap Entity\n nbttagcompound.a(\"Invul\", this.bQ());\n protected String aK() {\n protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {}\n public int aM() {\n if (this.ap()) {\n } else if (this.bQ() > 0) {\n if (this.bR()) {\n if (entity != null && !(entity instanceof EntityPlayer) && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).aU() == this.aU()) {\n protected void bk() {\n public void d(PotionEffect potioneffect) {}\n protected boolean bb() {\n protected void ax() {\n super.ax();\n public int bQ() {\n public boolean bR() {\n return this.aJ() <= this.aP() / 2.0F;\n public EnumCreatureAttribute aU() {","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWither.java","implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","signature":"String aK()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWither.java","implementation":"if (this.ap()) {","signature":"int aM()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWither.java","implementation":"public void d(PotionEffect potioneffect) {","signature":"void bk()"}],"patch":"@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n import net.canarymod.api.entity.living.monster.CanaryWither;\n \n-\n public class EntityWither extends EntityMob implements IRangedAttackMob {\n \n private float[] bp = new float[2];\n@@ -18,7 +16,7 @@ public class EntityWither extends EntityMob implements IRangedAttackMob {\n \n public EntityWither(World world) {\n super(world);\n- this.g(this.aP());\n+ this.g(this.aS());\n this.a(0.9F, 4.0F);\n this.ag = true;\n this.k().e(true);\n@@ -30,7 +28,7 @@ public EntityWither(World world) {\n this.d.a(1, new EntityAIHurtByTarget(this, false));\n this.d.a(2, new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, false, false, bw));\n this.b = 50;\n-this.entity = new CanaryWither(this); // CanaryMod: Wrap Entity\n+ this.entity = new CanaryWither(this); // CanaryMod: Wrap Entity\n }\n \n protected void a() {\n@@ -43,7 +41,7 @@ protected void a() {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"Invul\", this.bQ());\n+ nbttagcompound.a(\"Invul\", this.bU());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n@@ -55,11 +53,11 @@ protected String r() {\n return \"mob.wither.idle\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.wither.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.wither.death\";\n }\n \n@@ -73,7 +71,7 @@ public void c() {\n Entity entity = this.q.a(this.q(0));\n \n if (entity != null) {\n- if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n+ if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n if (this.y < 0.0D) {\n this.y = 0.0D;\n }\n@@ -134,7 +132,7 @@ public void c() {\n }\n }\n \n- boolean flag0 = this.bR();\n+ boolean flag0 = this.bV();\n \n for (i1 = 0; i1 < 3; ++i1) {\n double d8 = this.r(i1);\n@@ -147,18 +145,18 @@ public void c() {\n }\n }\n \n- if (this.bQ() > 0) {\n+ if (this.bU() > 0) {\n for (i1 = 0; i1 < 3; ++i1) {\n this.q.a(\"mobSpell\", this.u + this.ab.nextGaussian() * 1.0D, this.v + (double) (this.ab.nextFloat() * 3.3F), this.w + this.ab.nextGaussian() * 1.0D, 0.699999988079071D, 0.699999988079071D, 0.8999999761581421D);\n }\n }\n }\n \n- protected void be() {\n+ protected void bh() {\n int i0;\n \n- if (this.bQ() > 0) {\n- i0 = this.bQ() - 1;\n+ if (this.bU() > 0) {\n+ i0 = this.bU() - 1;\n if (i0 <= 0) {\n this.q.a(this, this.u, this.v + (double) this.f(), this.w, 7.0F, false, this.q.O().b(\"mobGriefing\"));\n this.q.d(1013, (int) this.u, (int) this.v, (int) this.w, 0);\n@@ -169,7 +167,7 @@ protected void be() {\n this.f(10.0F);\n }\n } else {\n- super.be();\n+ super.bh();\n \n int i1;\n \n@@ -197,7 +195,7 @@ protected void be() {\n if (i1 > 0) {\n Entity entity = this.q.a(i1);\n \n- if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n+ if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n this.a(i0 + 1, (EntityLivingBase) entity);\n this.bt[i0 - 1] = this.ac + 40 + this.ab.nextInt(20);\n this.bu[i0 - 1] = 0;\n@@ -210,7 +208,7 @@ protected void be() {\n for (int i4 = 0; i4 < 10 && !list.isEmpty(); ++i4) {\n EntityLivingBase entitylivingbase = (EntityLivingBase) list.get(this.ab.nextInt(list.size()));\n \n- if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n+ if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n if (entitylivingbase instanceof EntityPlayer) {\n if (!((EntityPlayer) entitylivingbase).bG.a) {\n this.c(i0, entitylivingbase.k);\n@@ -268,14 +266,14 @@ protected void be() {\n }\n }\n \n- public void bP() {\n+ public void bT() {\n this.p(220);\n- this.g(this.aP() / 3.0F);\n+ this.g(this.aS() / 3.0F);\n }\n \n- public void ak() {}\n+ public void al() {}\n \n- public int aM() {\n+ public int aP() {\n return 4;\n }\n \n@@ -348,24 +346,24 @@ public void a(EntityLivingBase entitylivingbase, float f0) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else if (damagesource == DamageSource.e) {\n return false;\n- } else if (this.bQ() > 0) {\n+ } else if (this.bU() > 0) {\n return false;\n } else {\n Entity entity;\n \n- if (this.bR()) {\n+ if (this.bV()) {\n entity = damagesource.h();\n if (entity instanceof EntityArrow) {\n return false;\n }\n }\n \n entity = damagesource.i();\n- if (entity != null && !(entity instanceof EntityPlayer) && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).aU() == this.aU()) {\n+ if (entity != null && !(entity instanceof EntityPlayer) && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).aX() == this.aX()) {\n return false;\n } else {\n if (this.bv <= 0) {\n@@ -385,7 +383,7 @@ protected void b(boolean flag0, int i0) {\n this.b(Item.bU.cv, 1);\n }\n \n- protected void bk() {\n+ protected void bo() {\n this.aV = 0;\n }\n \n@@ -395,20 +393,20 @@ public boolean K() {\n \n protected void b(float f0) {}\n \n- public void d(PotionEffect potioneffect) {}\n+ public void c(PotionEffect potioneffect) {}\n \n- protected boolean bb() {\n+ protected boolean be() {\n return true;\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.a).a(300.0D);\n this.a(SharedMonsterAttributes.d).a(0.6000000238418579D);\n this.a(SharedMonsterAttributes.b).a(40.0D);\n }\n \n- public int bQ() {\n+ public int bU() {\n return this.ah.c(20);\n }\n \n@@ -424,11 +422,11 @@ public void c(int i0, int i1) {\n this.ah.b(17 + i0, Integer.valueOf(i1));\n }\n \n- public boolean bR() {\n- return this.aJ() <= this.aP() / 2.0F;\n+ public boolean bV() {\n+ return this.aM() <= this.aS() / 2.0F;\n }\n \n- public EnumCreatureAttribute aU() {\n+ public EnumCreatureAttribute aX() {\n return EnumCreatureAttribute.b;\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWither.java","sha":"5ab1823477cb703ae7649effb70e145153148726","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitherSkull.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitherSkull.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/EntityWitherSkull.java","new_code":" public boolean ae() {\n if (movingobjectposition.g.a(DamageSource.a(this.a), 8.0F) && !movingobjectposition.g.S()) {\n ((EntityLivingBase) movingobjectposition.g).c(new PotionEffect(Potion.v.H, 20 * b0, 1));","new_methods":[],"old_code":" public boolean ad() {\n if (movingobjectposition.g.a(DamageSource.a(this.a), 8.0F) && !movingobjectposition.g.R()) {\n ((EntityLivingBase) movingobjectposition.g).d(new PotionEffect(Potion.v.H, 20 * b0, 1));","old_methods":[],"patch":"@@ -20,7 +20,7 @@ public float c() {\n return /* this.d() ? 0.73F : */super.c(); // CanaryMod: Motion Factor was made configurable\n }\n \n- public boolean ad() {\n+ public boolean ae() {\n return false;\n }\n \n@@ -38,7 +38,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\n if (!this.q.I) {\n if (movingobjectposition.g != null) {\n if (this.a != null) {\n- if (movingobjectposition.g.a(DamageSource.a(this.a), 8.0F) && !movingobjectposition.g.R()) {\n+ if (movingobjectposition.g.a(DamageSource.a(this.a), 8.0F) && !movingobjectposition.g.S()) {\n this.a.f(5.0F);\n }\n } else {\n@@ -57,7 +57,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\n }\n \n if (b0 > 0) {\n- ((EntityLivingBase) movingobjectposition.g).d(new PotionEffect(Potion.v.H, 20 * b0, 1));\n+ ((EntityLivingBase) movingobjectposition.g).c(new PotionEffect(Potion.v.H, 20 * b0, 1));\n }\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitherSkull.java","sha":"b2024c83cdc6f2f23621fb612c62b3e834f08bbd","status":"modified"},{"additions":66,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWolf.java","changes":129,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWolf.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":63,"filename":"src/main/java/net/minecraft/server/EntityWolf.java","new_code":" this.j(false);\n protected void ay() {\n super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);\n } else if (!this.bT()) {\n this.l(true);\n protected void bj() {\n this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);\n } else if (itemstack != null && itemstack.d == Item.aZ.cv && !this.cc()) {\n this.j(true);\n this.d((EntityLivingBase) null);\n this.i(true);\n this.i(false);\n public int bv() {\n public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {\n } else if (!this.bT()) {\n return !entitywolf.bT() ? false : (entitywolf.bU() ? false : this.bY() && entitywolf.bY());\n public boolean ce() {\n return !this.bT() && this.ac > 2400;\n }\n\n public boolean a(EntityLivingBase entitylivingbase, EntityLivingBase entitylivingbase1) {\n if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\n if (entitylivingbase instanceof EntityWolf) {\n EntityWolf entitywolf = (EntityWolf) entitylivingbase;\n\n if (entitywolf.bT() && entitywolf.bV() == entitylivingbase1) {\n return false;\n }\n }\n\n return entitylivingbase instanceof EntityPlayer && entitylivingbase1 instanceof EntityPlayer && !((EntityPlayer) entitylivingbase1).a((EntityPlayer) entitylivingbase) ? false : !(entitylivingbase instanceof EntityHorse) || !((EntityHorse) entitylivingbase).bW();\n } else {\n return false;\n }","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWolf.java","implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","signature":"void ay()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWolf.java","implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","signature":"void bj()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWolf.java","implementation":"public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {","signature":"int bv()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWolf.java","implementation":"return !this.bT() && this.ac > 2400;","signature":"boolean ce()"},{"arguments":["EntityLivingBase entitylivingbase"," EntityLivingBase entitylivingbase1"],"filename":"src/main/java/net/minecraft/server/EntityWolf.java","implementation":"if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\n if (entitylivingbase instanceof EntityWolf) {\n EntityWolf entitywolf = (EntityWolf) entitylivingbase;\n\n if (entitywolf.bT() && entitywolf.bV() == entitylivingbase1) {\n return false;","signature":"boolean a(EntityLivingBase entitylivingbase, EntityLivingBase entitylivingbase1)"}],"old_code":"\n this.k(false);\n protected void ax() {\n super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;\n }\n\n this.m(false);\n List list = this.q.a(this.getClass(), AxisAlignedBB.a().a(this.u, this.v, this.w, this.u + 1.0D, this.v + 1.0D, this.w + 1.0D).b(16.0D, 10.0D, 16.0D));\n Iterator iterator = list.iterator();\n\n while (iterator.hasNext()) {\n EntityWolf entitywolf = (EntityWolf) iterator.next();\n\n if (this != entitywolf) {\n entitywolf.m(false);\n }\n }\n } else {\n this.m(true);\n protected void bg() {\n this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());\n } else if (itemstack != null && itemstack.d == Item.aZ.cv && !this.bY()) {\n this.k(true);\n this.c((EntityLivingBase) null);\n this.j(true);\n this.j(false);\n public int br() {\n public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {\n } else if (!this.bP()) {\n return !entitywolf.bP() ? false : (entitywolf.bQ() ? false : this.bU() && entitywolf.bU());\n public boolean ca() {\n return !this.bP() && this.ac > 2400;","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWolf.java","implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","signature":"void ax()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWolf.java","implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","signature":"void bg()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityWolf.java","implementation":"public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {","signature":"int br()"}],"patch":"@@ -5,7 +5,6 @@\n import net.canarymod.api.entity.living.animal.CanaryWolf;\n import net.canarymod.hook.entity.EntityTameHook;\n \n-\n public class EntityWolf extends EntityTameable {\n \n private float bq;\n@@ -33,54 +32,40 @@ public EntityWolf(World world) {\n this.d.a(2, new EntityAIOwnerHurtTarget(this));\n this.d.a(3, new EntityAIHurtByTarget(this, true));\n this.d.a(4, new EntityAITargetNonTamed(this, EntitySheep.class, 200, false));\n- this.k(false);\n+ this.j(false);\n this.entity = new CanaryWolf(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.d).a(0.30000001192092896D);\n- if (this.bP()) {\n+ if (this.bT()) {\n this.a(SharedMonsterAttributes.a).a(20.0D);\n } else {\n this.a(SharedMonsterAttributes.a).a(8.0D);\n }\n }\n \n- public boolean bb() {\n+ public boolean be() {\n return true;\n }\n \n- public void c(EntityLivingBase entitylivingbase) {\n- super.c(entitylivingbase);\n+ public void d(EntityLivingBase entitylivingbase) {\n+ super.d(entitylivingbase);\n if (entitylivingbase == null) {\n- if (!this.bY()) {\n- return;\n- }\n-\n- this.m(false);\n- List list = this.q.a(this.getClass(), AxisAlignedBB.a().a(this.u, this.v, this.w, this.u + 1.0D, this.v + 1.0D, this.w + 1.0D).b(16.0D, 10.0D, 16.0D));\n- Iterator iterator = list.iterator();\n-\n- while (iterator.hasNext()) {\n- EntityWolf entitywolf = (EntityWolf) iterator.next();\n-\n- if (this != entitywolf) {\n- entitywolf.m(false);\n- }\n- }\n- } else {\n- this.m(true);\n+ this.l(false);\n+ } else if (!this.bT()) {\n+ this.l(true);\n }\n }\n \n- protected void bg() {\n- this.ah.b(18, Float.valueOf(this.aJ()));\n+ protected void bj() {\n+ this.ah.b(18, Float.valueOf(this.aM()));\n }\n \n protected void a() {\n super.a();\n- this.ah.a(18, new Float(this.aJ()));\n+ this.ah.a(18, new Float(this.aM()));\n this.ah.a(19, new Byte((byte) 0));\n this.ah.a(20, new Byte((byte) BlockColored.j_(1)));\n }\n@@ -91,31 +76,31 @@ protected void a(int i0, int i1, int i2, int i3) {\n \n public void b(NBTTagCompound nbttagcompound) {\n super.b(nbttagcompound);\n- nbttagcompound.a(\"Angry\", this.bY());\n- nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n+ nbttagcompound.a(\"Angry\", this.cc());\n+ nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n super.a(nbttagcompound);\n- this.m(nbttagcompound.n(\"Angry\"));\n+ this.l(nbttagcompound.n(\"Angry\"));\n if (nbttagcompound.b(\"CollarColor\")) {\n this.p(nbttagcompound.c(\"CollarColor\"));\n }\n }\n \n protected String r() {\n- return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n+ return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.wolf.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.wolf.death\";\n }\n \n- protected float aW() {\n+ protected float aZ() {\n return 0.4F;\n }\n \n@@ -125,7 +110,7 @@ protected int s() {\n \n public void c() {\n super.c();\n- if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n+ if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n this.bt = true;\n this.bu = 0.0F;\n this.bv = 0.0F;\n@@ -136,13 +121,13 @@ public void c() {\n public void l_() {\n super.l_();\n this.br = this.bq;\n- if (this.ca()) {\n+ if (this.ce()) {\n this.bq += (1.0F - this.bq) * 0.4F;\n } else {\n this.bq += (0.0F - this.bq) * 0.4F;\n }\n \n- if (this.ca()) {\n+ if (this.ce()) {\n this.g = 10;\n }\n \n@@ -153,7 +138,7 @@ public void l_() {\n this.bv = 0.0F;\n } else if ((this.bs || this.bt) && this.bt) {\n if (this.bu == 0.0F) {\n- this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n+ this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n }\n \n this.bv = this.bu;\n@@ -183,12 +168,12 @@ public float f() {\n return this.P * 0.8F;\n }\n \n- public int bl() {\n- return this.bQ() ? 20 : super.bl();\n+ public int bp() {\n+ return this.bU() ? 20 : super.bp();\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n Entity entity = damagesource.i();\n@@ -203,13 +188,13 @@ public boolean a(DamageSource damagesource, float f0) {\n }\n \n public boolean m(Entity entity) {\n- int i0 = this.bP() ? 4 : 2;\n+ int i0 = this.bT() ? 4 : 2;\n \n return entity.a(DamageSource.a((EntityLivingBase) this), (float) i0);\n }\n \n- public void k(boolean flag0) {\n- super.k(flag0);\n+ public void j(boolean flag0) {\n+ super.j(flag0);\n if (flag0) {\n this.a(SharedMonsterAttributes.a).a(20.0D);\n } else {\n@@ -220,7 +205,7 @@ public void k(boolean flag0) {\n public boolean a(EntityPlayer entityplayer) {\n ItemStack itemstack = entityplayer.bn.h();\n \n- if (this.bP()) {\n+ if (this.bT()) {\n if (itemstack != null) {\n if (Item.g[itemstack.d] instanceof ItemFood) {\n ItemFood itemfood = (ItemFood) Item.g[itemstack.d];\n@@ -240,7 +225,7 @@ public boolean a(EntityPlayer entityplayer) {\n } else if (itemstack.d == Item.aY.cv) {\n int i0 = BlockColored.j_(itemstack.k());\n \n- if (i0 != this.bZ()) {\n+ if (i0 != this.cd()) {\n this.p(i0);\n if (!entityplayer.bG.d && --itemstack.b <= 0) {\n entityplayer.bn.a(entityplayer.bn.c, (ItemStack) null);\n@@ -252,11 +237,13 @@ public boolean a(EntityPlayer entityplayer) {\n }\n \n if (entityplayer.c_().equalsIgnoreCase(this.h_()) && !this.q.I && !this.c(itemstack)) {\n- this.bp.a(!this.bQ());\n+ this.bp.a(!this.bU());\n this.bd = false;\n this.a((PathEntity) null);\n+ this.b((Entity) null);\n+ this.d((EntityLivingBase) null);\n }\n- } else if (itemstack != null && itemstack.d == Item.aZ.cv && !this.bY()) {\n+ } else if (itemstack != null && itemstack.d == Item.aZ.cv && !this.cc()) {\n if (!entityplayer.bG.d) {\n --itemstack.b;\n }\n@@ -271,16 +258,16 @@ public boolean a(EntityPlayer entityplayer) {\n \n if (hook.isTamed() && !hook.isCanceled()) {\n //\n- this.k(true);\n+ this.j(true);\n this.a((PathEntity) null);\n- this.c((EntityLivingBase) null);\n+ this.d((EntityLivingBase) null);\n this.bp.a(true);\n this.g(20.0F);\n this.b(entityplayer.c_());\n- this.j(true);\n+ this.i(true);\n this.q.a((Entity) this, (byte) 7);\n } else {\n- this.j(false);\n+ this.i(false);\n this.q.a((Entity) this, (byte) 6);\n }\n }\n@@ -295,15 +282,15 @@ public boolean c(ItemStack itemstack) {\n return itemstack == null ? false : (!(Item.g[itemstack.d] instanceof ItemFood) ? false : ((ItemFood) Item.g[itemstack.d]).j());\n }\n \n- public int br() {\n+ public int bv() {\n return 8;\n }\n \n- public boolean bY() {\n+ public boolean cc() {\n return (this.ah.a(16) & 2) != 0;\n }\n \n- public void m(boolean flag0) {\n+ public void l(boolean flag0) {\n byte b0 = this.ah.a(16);\n \n if (flag0) {\n@@ -313,7 +300,7 @@ public void m(boolean flag0) {\n }\n }\n \n- public int bZ() {\n+ public int cd() {\n return this.ah.a(20) & 15;\n }\n \n@@ -327,13 +314,13 @@ public EntityWolf b(EntityAgeable entityageable) {\n \n if (s0 != null && s0.trim().length() > 0) {\n entitywolf.b(s0);\n- entitywolf.k(true);\n+ entitywolf.j(true);\n }\n \n return entitywolf;\n }\n \n- public void n(boolean flag0) {\n+ public void m(boolean flag0) {\n if (flag0) {\n this.ah.b(19, Byte.valueOf((byte) 1));\n } else {\n@@ -344,23 +331,39 @@ public void n(boolean flag0) {\n public boolean a(EntityAnimal entityanimal) {\n if (entityanimal == this) {\n return false;\n- } else if (!this.bP()) {\n+ } else if (!this.bT()) {\n return false;\n } else if (!(entityanimal instanceof EntityWolf)) {\n return false;\n } else {\n EntityWolf entitywolf = (EntityWolf) entityanimal;\n \n- return !entitywolf.bP() ? false : (entitywolf.bQ() ? false : this.bU() && entitywolf.bU());\n+ return !entitywolf.bT() ? false : (entitywolf.bU() ? false : this.bY() && entitywolf.bY());\n }\n }\n \n- public boolean ca() {\n+ public boolean ce() {\n return this.ah.a(19) == 1;\n }\n \n protected boolean t() {\n- return !this.bP() && this.ac > 2400;\n+ return !this.bT() && this.ac > 2400;\n+ }\n+\n+ public boolean a(EntityLivingBase entitylivingbase, EntityLivingBase entitylivingbase1) {\n+ if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\n+ if (entitylivingbase instanceof EntityWolf) {\n+ EntityWolf entitywolf = (EntityWolf) entitylivingbase;\n+\n+ if (entitywolf.bT() && entitywolf.bV() == entitylivingbase1) {\n+ return false;\n+ }\n+ }\n+\n+ return entitylivingbase instanceof EntityPlayer && entitylivingbase1 instanceof EntityPlayer && !((EntityPlayer) entitylivingbase1).a((EntityPlayer) entitylivingbase) ? false : !(entitylivingbase instanceof EntityHorse) || !((EntityHorse) entitylivingbase).bW();\n+ } else {\n+ return false;\n+ }\n }\n \n public EntityAgeable a(EntityAgeable entityageable) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWolf.java","sha":"ab5b2b5bc74ff968b9be22abbbbbc5c61025180d","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityXPOrb.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityXPOrb.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/EntityXPOrb.java","new_code":" if (this.aq()) {\n public boolean ap() {","new_methods":[],"old_code":" if (this.ap()) {\n public boolean ao() {","old_methods":[],"patch":"@@ -116,7 +116,7 @@ protected void e(int i0) {\n }\n \n public boolean a(DamageSource damagesource, float f0) {\n- if (this.ap()) {\n+ if (this.aq()) {\n return false;\n } else {\n this.J();\n@@ -161,7 +161,7 @@ public static int a(int i0) {\n return i0 >= 2477 ? 2477 : (i0 >= 1237 ? 1237 : (i0 >= 617 ? 617 : (i0 >= 307 ? 307 : (i0 >= 149 ? 149 : (i0 >= 73 ? 73 : (i0 >= 37 ? 37 : (i0 >= 17 ? 17 : (i0 >= 7 ? 7 : (i0 >= 3 ? 3 : 1)))))))));\n }\n \n- public boolean ao() {\n+ public boolean ap() {\n return false;\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityXPOrb.java","sha":"e3450cbf1a977056f8669d577978bc25086f4ac1","status":"modified"},{"additions":54,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityZombie.java","changes":96,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityZombie.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":42,"filename":"src/main/java/net/minecraft/server/EntityZombie.java","new_code":" private static final AttributeModifier br = new AttributeModifier(bq, \"Baby speed boost\", 0.5D, 1);\n this.c.a(4, new EntityAIMoveTowardsRestriction(this, 1.0D));\n protected void ay() {\n super.ay();\n this.aW().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\n public int aP() {\n int i0 = super.aP() + 2;\n protected boolean be() {\n public boolean bT() {\n public void i(boolean flag0) {\n if (entitylivingbase == null && this.bN() instanceof EntityLivingBase) {\n entitylivingbase = (EntityLivingBase) this.bN();\n entityzombie.d(entitylivingbase);\n if (!this.q.I && this.bV()) {\n int i0 = this.bX();\n this.bW();\n if (flag0 && this.aY() == null && this.ae() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\n protected String aN() {\n protected String aO() {\n public EnumCreatureAttribute aX() {\n protected void bw() {\n super.bw();\n if (this.bT()) {\n nbttagcompound.a(\"ConversionTime\", this.bV() ? this.bs : -1);\n this.i(true);\n entityzombie.i(true);\n Object object = super.a(entitylivingdata);\n if (object == null) {\n object = new EntityZombieGroupData(this, this.q.s.nextFloat() < 0.05F, this.q.s.nextFloat() < 0.05F, (EntityZombieINNER1) null);\n if (object instanceof EntityZombieGroupData) {\n EntityZombieGroupData entityzombiegroupdata = (EntityZombieGroupData) object;\n\n if (entityzombiegroupdata.b) {\n this.i(true);\n }\n\n if (entityzombiegroupdata.a) {\n this.a(true);\n }\n }\n\n this.bw();\n this.bx();\n return (EntityLivingData) object;\n ItemStack itemstack = entityplayer.bx();\n if (itemstack != null && itemstack.b() == Item.av && itemstack.k() == 0 && this.bT() && this.a(Potion.t)) {\n protected void a(int i0) {\n this.c(new PotionEffect(Potion.g.H, i0, Math.min(this.q.r - 1, 0)));\n return !this.bV();\n public boolean bV() {\n public void bW() { // CanaryMod: protected => public\n entityvillager.bX();\n entityvillager.c(new PotionEffect(Potion.k.H, 200, 0));\n protected int bX() {","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/EntityZombie.java","implementation":"super.ay();\n this.aW().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\n public int aP() {\n int i0 = super.aP() + 2;\n protected boolean be() {\n public boolean bT() {\n public void i(boolean flag0) {\n if (entitylivingbase == null && this.bN() instanceof EntityLivingBase) {\n entitylivingbase = (EntityLivingBase) this.bN();\n entityzombie.d(entitylivingbase);\n if (!this.q.I && this.bV()) {\n int i0 = this.bX();\n this.bW();\n if (flag0 && this.aY() == null && this.ae() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\n protected String aN() {\n protected String aO() {\n public EnumCreatureAttribute aX() {\n protected void bw() {\n super.bw();\n if (this.bT()) {\n nbttagcompound.a(\"ConversionTime\", this.bV() ? this.bs : -1);\n this.i(true);\n entityzombie.i(true);\n Object object = super.a(entitylivingdata);\n if (object == null) {\n object = new EntityZombieGroupData(this, this.q.s.nextFloat() < 0.05F, this.q.s.nextFloat() < 0.05F, (EntityZombieINNER1) null);\n if (object instanceof EntityZombieGroupData) {\n EntityZombieGroupData entityzombiegroupdata = (EntityZombieGroupData) object;\n\n if (entityzombiegroupdata.b) {\n this.i(true);","signature":"void ay()"}],"old_code":" private static final AttributeModifier br = new AttributeModifier(bq, \"Baby speed boost\", 0.5D, 0);\n this.c.a(4, new EntityAIMoveTwardsRestriction(this, 1.0D));\n protected void ax() {\n super.ax();\n this.aT().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\n public int aM() {\n int i0 = super.aM() + 2;\n protected boolean bb() {\n public boolean bP() {\n public void j(boolean flag0) {\n if (entitylivingbase == null && this.bJ() instanceof EntityLivingBase) {\n entitylivingbase = (EntityLivingBase) this.bJ();\n entityzombie.c(entitylivingbase);\n if (!this.q.I && this.bR()) {\n int i0 = this.bT();\n this.bS();\n if (flag0 && this.aV() == null && this.ad() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\n protected String aK() {\n protected String aL() {\n public EnumCreatureAttribute aU() {\n protected void bs() {\n super.bs();\n if (this.bP()) {\n nbttagcompound.a(\"ConversionTime\", this.bR() ? this.bs : -1);\n this.j(true);\n entityzombie.j(true);\n entitylivingdata = super.a(entitylivingdata);\n if (this.q.s.nextFloat() < 0.05F) {\n this.j(true);\n this.bs();\n this.bt();\n return entitylivingdata;\n ItemStack itemstack = entityplayer.bt();\n if (itemstack != null && itemstack.b() == Item.av && itemstack.k() == 0 && this.bP() && this.a(Potion.t)) {\n public void a(int i0) { // CanaryMod: protected => public\n this.d(new PotionEffect(Potion.g.H, i0, Math.min(this.q.r - 1, 0)));\n return !this.bR();\n public boolean bR() {\n public void bS() { // CanaryMod: protected => public\n entityvillager.bT();\n entityvillager.d(new PotionEffect(Potion.k.H, 200, 0));\n protected int bT() {","old_methods":[],"patch":"@@ -8,7 +8,7 @@ public class EntityZombie extends EntityMob {\n \n protected static final Attribute bp = (new RangedAttribute(\"zombie.spawnReinforcements\", 0.0D, 0.0D, 1.0D)).a(\"Spawn Reinforcements Chance\");\n private static final UUID bq = UUID.fromString(\"B9766B59-9566-4402-BC1F-2EE2A276D836\");\n- private static final AttributeModifier br = new AttributeModifier(bq, \"Baby speed boost\", 0.5D, 0);\n+ private static final AttributeModifier br = new AttributeModifier(bq, \"Baby speed boost\", 0.5D, 1);\n private int bs;\n \n public EntityZombie(World world) {\n@@ -18,7 +18,7 @@ public EntityZombie(World world) {\n this.c.a(1, new EntityAIBreakDoor(this));\n this.c.a(2, new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.0D, false));\n this.c.a(3, new EntityAIAttackOnCollide(this, EntityVillager.class, 1.0D, true));\n- this.c.a(4, new EntityAIMoveTwardsRestriction(this, 1.0D));\n+ this.c.a(4, new EntityAIMoveTowardsRestriction(this, 1.0D));\n this.c.a(5, new EntityAIMoveThroughVillage(this, 1.0D, false));\n this.c.a(6, new EntityAIWander(this, 1.0D));\n this.c.a(7, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));\n@@ -29,12 +29,12 @@ public EntityZombie(World world) {\n this.entity = new CanaryZombie(this); // CanaryMod: Wrap Entity\n }\n \n- protected void ax() {\n- super.ax();\n+ protected void ay() {\n+ super.ay();\n this.a(SharedMonsterAttributes.b).a(40.0D);\n this.a(SharedMonsterAttributes.d).a(0.23000000417232513D);\n this.a(SharedMonsterAttributes.e).a(3.0D);\n- this.aT().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\n+ this.aW().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\n }\n \n protected void a() {\n@@ -44,8 +44,8 @@ protected void a() {\n this.u().a(14, Byte.valueOf((byte) 0));\n }\n \n- public int aM() {\n- int i0 = super.aM() + 2;\n+ public int aP() {\n+ int i0 = super.aP() + 2;\n \n if (i0 > 20) {\n i0 = 20;\n@@ -54,7 +54,7 @@ public int aM() {\n return i0;\n }\n \n- protected boolean bb() {\n+ protected boolean be() {\n return true;\n }\n \n@@ -74,11 +74,11 @@ public void a(boolean flag0) {\n }\n }\n \n- public boolean bP() {\n+ public boolean bT() {\n return this.u().a(13) == 1;\n }\n \n- public void j(boolean flag0) {\n+ public void i(boolean flag0) {\n this.u().b(13, Byte.valueOf((byte) (flag0 ? 1 : 0)));\n }\n \n@@ -117,8 +117,8 @@ public boolean a(DamageSource damagesource, float f0) {\n } else {\n EntityLivingBase entitylivingbase = this.m();\n \n- if (entitylivingbase == null && this.bJ() instanceof EntityLivingBase) {\n- entitylivingbase = (EntityLivingBase) this.bJ();\n+ if (entitylivingbase == null && this.bN() instanceof EntityLivingBase) {\n+ entitylivingbase = (EntityLivingBase) this.bN();\n }\n \n if (entitylivingbase == null && damagesource.i() instanceof EntityLivingBase) {\n@@ -140,7 +140,7 @@ public boolean a(DamageSource damagesource, float f0) {\n entityzombie.b((double) i4, (double) i5, (double) i6);\n if (this.q.b(entityzombie.E) && this.q.a((Entity) entityzombie, entityzombie.E).isEmpty() && !this.q.d(entityzombie.E)) {\n this.q.d((Entity) entityzombie);\n- entityzombie.c(entitylivingbase);\n+ entityzombie.d(entitylivingbase);\n entityzombie.a((EntityLivingData) null);\n this.a(bp).a(new AttributeModifier(\"Zombie reinforcement caller charge\", -0.05000000074505806D, 0));\n entityzombie.a(bp).a(new AttributeModifier(\"Zombie reinforcement callee charge\", -0.05000000074505806D, 0));\n@@ -155,12 +155,12 @@ public boolean a(DamageSource damagesource, float f0) {\n }\n \n public void l_() {\n- if (!this.q.I && this.bR()) {\n- int i0 = this.bT();\n+ if (!this.q.I && this.bV()) {\n+ int i0 = this.bX();\n \n this.bs -= i0;\n if (this.bs <= 0) {\n- this.bS();\n+ this.bW();\n }\n }\n \n@@ -170,7 +170,7 @@ public void l_() {\n public boolean m(Entity entity) {\n boolean flag0 = super.m(entity);\n \n- if (flag0 && this.aV() == null && this.ad() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\n+ if (flag0 && this.aY() == null && this.ae() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\n entity.d(2 * this.q.r);\n }\n \n@@ -181,11 +181,11 @@ protected String r() {\n return \"mob.zombie.say\";\n }\n \n- protected String aK() {\n+ protected String aN() {\n return \"mob.zombie.hurt\";\n }\n \n- protected String aL() {\n+ protected String aO() {\n return \"mob.zombie.death\";\n }\n \n@@ -197,7 +197,7 @@ protected int s() {\n return Item.bo.cv;\n }\n \n- public EnumCreatureAttribute aU() {\n+ public EnumCreatureAttribute aX() {\n return EnumCreatureAttribute.b;\n }\n \n@@ -216,8 +216,8 @@ protected void l(int i0) {\n }\n }\n \n- protected void bs() {\n- super.bs();\n+ protected void bw() {\n+ super.bw();\n if (this.ab.nextFloat() < (this.q.r == 3 ? 0.05F : 0.01F)) {\n int i0 = this.ab.nextInt(3);\n \n@@ -235,11 +235,11 @@ public void b(NBTTagCompound nbttagcompound) {\n nbttagcompound.a(\"IsBaby\", true);\n }\n \n- if (this.bP()) {\n+ if (this.bT()) {\n nbttagcompound.a(\"IsVillager\", true);\n }\n \n- nbttagcompound.a(\"ConversionTime\", this.bR() ? this.bs : -1);\n+ nbttagcompound.a(\"ConversionTime\", this.bV() ? this.bs : -1);\n }\n \n public void a(NBTTagCompound nbttagcompound) {\n@@ -249,7 +249,7 @@ public void a(NBTTagCompound nbttagcompound) {\n }\n \n if (nbttagcompound.n(\"IsVillager\")) {\n- this.j(true);\n+ this.i(true);\n }\n \n if (nbttagcompound.b(\"ConversionTime\") && nbttagcompound.e(\"ConversionTime\") > -1) {\n@@ -269,7 +269,7 @@ public void a(EntityLivingBase entitylivingbase) {\n entityzombie.j(entitylivingbase);\n this.q.e((Entity) entitylivingbase);\n entityzombie.a((EntityLivingData) null);\n- entityzombie.j(true);\n+ entityzombie.i(true);\n if (entitylivingbase.g_()) {\n entityzombie.a(true);\n }\n@@ -280,16 +280,28 @@ public void a(EntityLivingBase entitylivingbase) {\n }\n \n public EntityLivingData a(EntityLivingData entitylivingdata) {\n- entitylivingdata = super.a(entitylivingdata);\n+ Object object = super.a(entitylivingdata);\n float f0 = this.q.b(this.u, this.v, this.w);\n \n this.h(this.ab.nextFloat() < 0.55F * f0);\n- if (this.q.s.nextFloat() < 0.05F) {\n- this.j(true);\n+ if (object == null) {\n+ object = new EntityZombieGroupData(this, this.q.s.nextFloat() < 0.05F, this.q.s.nextFloat() < 0.05F, (EntityZombieINNER1) null);\n }\n \n- this.bs();\n- this.bt();\n+ if (object instanceof EntityZombieGroupData) {\n+ EntityZombieGroupData entityzombiegroupdata = (EntityZombieGroupData) object;\n+\n+ if (entityzombiegroupdata.b) {\n+ this.i(true);\n+ }\n+\n+ if (entityzombiegroupdata.a) {\n+ this.a(true);\n+ }\n+ }\n+\n+ this.bw();\n+ this.bx();\n if (this.n(4) == null) {\n Calendar calendar = this.q.W();\n \n@@ -306,13 +318,13 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\n this.a(SharedMonsterAttributes.a).a(new AttributeModifier(\"Leader zombie bonus\", this.ab.nextDouble() * 3.0D + 1.0D, 2));\n }\n \n- return entitylivingdata;\n+ return (EntityLivingData) object;\n }\n \n public boolean a(EntityPlayer entityplayer) {\n- ItemStack itemstack = entityplayer.bt();\n+ ItemStack itemstack = entityplayer.bx();\n \n- if (itemstack != null && itemstack.b() == Item.av && itemstack.k() == 0 && this.bP() && this.a(Potion.t)) {\n+ if (itemstack != null && itemstack.b() == Item.av && itemstack.k() == 0 && this.bT() && this.a(Potion.t)) {\n if (!entityplayer.bG.d) {\n --itemstack.b;\n }\n@@ -331,39 +343,39 @@ public boolean a(EntityPlayer entityplayer) {\n }\n }\n \n- public void a(int i0) { // CanaryMod: protected => public\n+ protected void a(int i0) {\n this.bs = i0;\n this.u().b(14, Byte.valueOf((byte) 1));\n this.k(Potion.t.H);\n- this.d(new PotionEffect(Potion.g.H, i0, Math.min(this.q.r - 1, 0)));\n+ this.c(new PotionEffect(Potion.g.H, i0, Math.min(this.q.r - 1, 0)));\n this.q.a((Entity) this, (byte) 16);\n }\n \n protected boolean t() {\n- return !this.bR();\n+ return !this.bV();\n }\n \n- public boolean bR() {\n+ public boolean bV() {\n return this.u().a(14) == 1;\n }\n \n- public void bS() { // CanaryMod: protected => public\n+ public void bW() { // CanaryMod: protected => public\n EntityVillager entityvillager = new EntityVillager(this.q);\n \n entityvillager.j(this);\n entityvillager.a((EntityLivingData) null);\n- entityvillager.bT();\n+ entityvillager.bX();\n if (this.g_()) {\n entityvillager.c(-24000);\n }\n \n this.q.e((Entity) this);\n this.q.d((Entity) entityvillager);\n- entityvillager.d(new PotionEffect(Potion.k.H, 200, 0));\n+ entityvillager.c(new PotionEffect(Potion.k.H, 200, 0));\n this.q.a((EntityPlayer) null, 1017, (int) this.u, (int) this.v, (int) this.w, 0);\n }\n \n- protected int bT() {\n+ protected int bX() {\n int i0 = 1;\n \n if (this.ab.nextFloat() < 0.01F) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityZombie.java","sha":"7a578c42957ec52504f6ffa04d2fe25bb21ff8f4","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FFoodStats.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FFoodStats.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/FoodStats.java","new_code":" if (entityplayer.q.O().b(\"naturalRegeneration\") && this.a >= 18 && entityplayer.bI()) {\n if (entityplayer.aM() > 10.0F || i0 >= 3 || entityplayer.aM() > 1.0F && i0 >= 2) {\n DamageHook dmg = (DamageHook) new DamageHook(null, entityplayer.getCanaryEntity(), new CanaryDamageSource(DamageSource.f), 1.0F).call();","new_methods":[],"old_code":" if (entityplayer.q.O().b(\"naturalRegeneration\") && this.a >= 18 && entityplayer.bE()) {\n if (entityplayer.aJ() > 10.0F || i0 >= 3 || entityplayer.aJ() > 1.0F && i0 >= 2) {\n DamageHook dmg = (DamageHook) new DamageHook(null, entityplayer.getCanaryEntity(), new CanaryDamageSource(DamageSource.f), 1).call();","old_methods":[],"patch":"@@ -58,7 +58,7 @@ public void a(EntityPlayer entityplayer) {\n }\n }\n \n- if (entityplayer.q.O().b(\"naturalRegeneration\") && this.a >= 18 && entityplayer.bE()) {\n+ if (entityplayer.q.O().b(\"naturalRegeneration\") && this.a >= 18 && entityplayer.bI()) {\n ++this.d;\n if (this.d >= 80) {\n entityplayer.f(1.0F);\n@@ -68,9 +68,9 @@ public void a(EntityPlayer entityplayer) {\n } else if (this.a <= 0) {\n ++this.d;\n if (this.d >= 80) {\n- if (entityplayer.aJ() > 10.0F || i0 >= 3 || entityplayer.aJ() > 1.0F && i0 >= 2) {\n+ if (entityplayer.aM() > 10.0F || i0 >= 3 || entityplayer.aM() > 1.0F && i0 >= 2) {\n // CanaryMod: DamageHook (starve)\n- DamageHook dmg = (DamageHook) new DamageHook(null, entityplayer.getCanaryEntity(), new CanaryDamageSource(DamageSource.f), 1).call();\n+ DamageHook dmg = (DamageHook) new DamageHook(null, entityplayer.getCanaryEntity(), new CanaryDamageSource(DamageSource.f), 1.0F).call();\n if (!dmg.isCanceled()) {\n entityplayer.a((((CanaryDamageSource) dmg.getDamageSource()).getHandle()), dmg.getDamageDealt());\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FFoodStats.java","sha":"2d7b7f3814dfefceda950d04100da3fba19621d5","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCraftResult.java","changes":1,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCraftResult.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/InventoryCraftResult.java","new_code":"","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class InventoryCraftResult implements IInventory {\n \n public ItemStack[] a = new ItemStack[1]; // CanaryMod: private -> public","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCraftResult.java","sha":"3989e313980236c142dc7414ccfd683c53d7fe25","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCrafting.java","changes":1,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCrafting.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/InventoryCrafting.java","new_code":"","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class InventoryCrafting implements IInventory {\n \n public ItemStack[] a; // CanaryMod: private -> public","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCrafting.java","sha":"51e2b05785ce90add3dc06a239906079af694018","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryLargeChest.java","changes":1,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryLargeChest.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/InventoryLargeChest.java","new_code":"","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class InventoryLargeChest implements IInventory {\n \n private String a;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryLargeChest.java","sha":"22736828a424534ed3bff6e210702545321d960c","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryMerchant.java","changes":1,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryMerchant.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/InventoryMerchant.java","new_code":"","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class InventoryMerchant implements IInventory {\n \n private final IMerchant a;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryMerchant.java","sha":"a82d502077ac78dd658042de461c15d5b2eb9dd0","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemBucketMilk.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemBucketMilk.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/ItemBucketMilk.java","new_code":" entityplayer.aJ();","new_methods":[],"old_code":" entityplayer.aG();","old_methods":[],"patch":"@@ -25,7 +25,7 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\n }\n \n if (!world.I) {\n- entityplayer.aG();\n+ entityplayer.aJ();\n }\n \n return itemstack.b <= 0 ? new ItemStack(Item.ay) : itemstack;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemBucketMilk.java","sha":"9dd9796b8c108a955bbf6b84dda5f70e99416505","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemFood.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemFood.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/ItemFood.java","new_code":" entityplayer.bH().a(hook.getLevelGain(), hook.getSaturationGain());\n entityplayer.c(((CanaryPotionEffect) effect).getHandle());\n entityplayer.c(new PotionEffect(this.cC, this.cD * 20, this.cE));","new_methods":[],"old_code":" entityplayer.bD().a(hook.getLevelGain(), hook.getSaturationGain());\n entityplayer.d(((CanaryPotionEffect) effect).getHandle());\n entityplayer.d(new PotionEffect(this.cC, this.cD * 20, this.cE));","old_methods":[],"patch":"@@ -47,13 +47,13 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\n EatHook hook = (EatHook) new EatHook(((EntityPlayerMP) entityplayer).getPlayer(), itemstack.getCanaryItem(), this.g(), this.i(), effects).call();\n if (!hook.isCanceled()) {\n --itemstack.b;\n- entityplayer.bD().a(hook.getLevelGain(), hook.getSaturationGain());\n+ entityplayer.bH().a(hook.getLevelGain(), hook.getSaturationGain());\n world.a((Entity) entityplayer, \"random.burp\", 0.5F, world.s.nextFloat() * 0.1F + 0.9F);\n // this.c(itemstack, world, entityplayer); moved above and below\n if (hook.getPotionEffects() != null) {\n for (net.canarymod.api.potion.PotionEffect effect : hook.getPotionEffects()) {\n if (effect != null) {\n- entityplayer.d(((CanaryPotionEffect) effect).getHandle());\n+ entityplayer.c(((CanaryPotionEffect) effect).getHandle());\n }\n }\n }\n@@ -64,7 +64,7 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\n \n protected void c(ItemStack itemstack, World world, EntityPlayer entityplayer) {\n if (!world.I && this.cC > 0 && world.s.nextFloat() < this.cF) {\n- entityplayer.d(new PotionEffect(this.cC, this.cD * 20, this.cE));\n+ entityplayer.c(new PotionEffect(this.cC, this.cD * 20, this.cE));\n }\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemFood.java","sha":"1ee10e17bdaa7aa08b949aea75f47b303dbb64ef","status":"modified"},{"additions":5,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemInWorldManager.java","changes":10,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemInWorldManager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":5,"filename":"src/main/java/net/minecraft/server/ItemInWorldManager.java","new_code":" } else if (this.c.d() && this.b.aY() != null && this.b.aY().b() instanceof ItemSword) {\n ItemStack itemstack = this.b.bx();\n this.b.by();\n if (!entityplayer.bq()) {\n if (!entityplayer.ag() || entityplayer.aY() == null) {","new_methods":[],"old_code":" } else if (this.c.d() && this.b.aV() != null && this.b.aV().b() instanceof ItemSword) {\n ItemStack itemstack = this.b.bt();\n this.b.bu();\n if (!entityplayer.bm()) {\n if (!entityplayer.af() || entityplayer.aV() == null) {","old_methods":[],"patch":"@@ -182,7 +182,7 @@ private boolean d(int i0, int i1, int i2) {\n public boolean b(int i0, int i1, int i2) {\n if (this.c.c() && !this.b.d(i0, i1, i2)) {\n return false;\n- } else if (this.c.d() && this.b.aV() != null && this.b.aV().b() instanceof ItemSword) {\n+ } else if (this.c.d() && this.b.aY() != null && this.b.aY().b() instanceof ItemSword) {\n return false;\n } else {\n // CanaryMod: BlockDestroyHook\n@@ -204,13 +204,13 @@ public boolean b(int i0, int i1, int i2) {\n if (this.d()) {\n this.b.a.b(new Packet53BlockChange(i0, i1, i2, this.a));\n } else {\n- ItemStack itemstack = this.b.bt();\n+ ItemStack itemstack = this.b.bx();\n boolean flag1 = this.b.a(Block.s[i3]);\n \n if (itemstack != null) {\n itemstack.a(this.a, i3, i0, i1, i2, this.b);\n if (itemstack.b == 0) {\n- this.b.bu();\n+ this.b.by();\n }\n }\n \n@@ -254,7 +254,7 @@ public boolean a(EntityPlayer entityplayer, World world, ItemStack itemstack) {\n entityplayer.bn.a[entityplayer.bn.c] = null;\n }\n \n- if (!entityplayer.bm()) {\n+ if (!entityplayer.bq()) {\n ((EntityPlayerMP) entityplayer).a(entityplayer.bo);\n }\n \n@@ -265,7 +265,7 @@ public boolean a(EntityPlayer entityplayer, World world, ItemStack itemstack) {\n public boolean a(EntityPlayer entityplayer, World world, ItemStack itemstack, int i0, int i1, int i2, int i3, float f0, float f1, float f2) {\n int i4;\n \n- if (!entityplayer.af() || entityplayer.aV() == null) {\n+ if (!entityplayer.ag() || entityplayer.aY() == null) {\n i4 = world.a(i0, i1, i2);\n if (i4 > 0 && Block.s[i4].a(world, i0, i1, i2, entityplayer, i3, f0, f1, f2)) {\n return true;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemInWorldManager.java","sha":"d5174e04b6c58707939f46b5c6cdb96a6b910527","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemPotion.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemPotion.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/ItemPotion.java","new_code":" // entityplayer.c(new PotionEffect(potioneffect));\n entityplayer.bH().a(hook.getLevelGain(), hook.getSaturationGain());\n entityplayer.c(((CanaryPotionEffect) effect).getHandle());","new_methods":[],"old_code":" // entityplayer.d(new PotionEffect(potioneffect));\n entityplayer.bD().a(hook.getLevelGain(), hook.getSaturationGain());\n entityplayer.d(((CanaryPotionEffect) effect).getHandle());","old_methods":[],"patch":"@@ -73,7 +73,7 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\n while (iterator.hasNext()) {\n PotionEffect potioneffect = (PotionEffect) iterator.next();\n \n- // entityplayer.d(new PotionEffect(potioneffect));\n+ // entityplayer.c(new PotionEffect(potioneffect));\n // add to the array first\n effects[index] = new CanaryPotionEffect(potioneffect);\n index++;\n@@ -88,12 +88,12 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\n return itemstack;\n }\n // Apply food changes\n- entityplayer.bD().a(hook.getLevelGain(), hook.getSaturationGain());\n+ entityplayer.bH().a(hook.getLevelGain(), hook.getSaturationGain());\n // And finally add the effects\n if (hook.getPotionEffects() != null) {\n for (net.canarymod.api.potion.PotionEffect effect : hook.getPotionEffects()) {\n if (effect != null) {\n- entityplayer.d(((CanaryPotionEffect) effect).getHandle());\n+ entityplayer.c(((CanaryPotionEffect) effect).getHandle());\n }\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemPotion.java","sha":"30cbd44078343d61e60f59e04b86633f950a3ef7","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemSign.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemSign.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/ItemSign.java","new_code":" world.f(i0, i1, i2, Block.aI.cF, i4, 3);\n world.f(i0, i1, i2, Block.aN.cF, i3, 3);","new_methods":[],"old_code":" world.f(i0, i1, i2, Block.aI.cF, i4, 2);\n world.f(i0, i1, i2, Block.aN.cF, i3, 2);","old_methods":[],"patch":"@@ -59,9 +59,9 @@ public boolean a(ItemStack itemstack, EntityPlayer entityplayer, World world, in\n if (i3 == 1) {\n int i4 = MathHelper.c((double) ((entityplayer.A + 180.0F) * 16.0F / 360.0F) + 0.5D) & 15;\n \n- world.f(i0, i1, i2, Block.aI.cF, i4, 2);\n+ world.f(i0, i1, i2, Block.aI.cF, i4, 3);\n } else {\n- world.f(i0, i1, i2, Block.aN.cF, i3, 2);\n+ world.f(i0, i1, i2, Block.aN.cF, i3, 3);\n }\n \n --itemstack.b;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemSign.java","sha":"427faae1c882d824772f86dcb97d288b6fe1367f","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemStack.java","changes":4,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemStack.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/ItemStack.java","new_code":" if (this.a(i0, entitylivingbase.aC())) {\n entityplayer.by();","new_methods":[],"old_code":" if (this.a(i0, entitylivingbase.aB())) {\n entityplayer.bu();","old_methods":[],"patch":"@@ -187,15 +187,15 @@ public boolean a(int i0, Random random) {\n public void a(int i0, EntityLivingBase entitylivingbase) {\n if (!(entitylivingbase instanceof EntityPlayer) || !((EntityPlayer) entitylivingbase).bG.d) {\n if (this.g()) {\n- if (this.a(i0, entitylivingbase.aB())) {\n+ if (this.a(i0, entitylivingbase.aC())) {\n entitylivingbase.a(this);\n --this.b;\n if (entitylivingbase instanceof EntityPlayer) {\n EntityPlayer entityplayer = (EntityPlayer) entitylivingbase;\n \n entityplayer.a(StatList.F[this.d], 1);\n if (this.b == 0 && this.b() instanceof ItemBow) {\n- entityplayer.bu();\n+ entityplayer.by();\n }\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemStack.java","sha":"357f687abdfd81a43a159e325aae47207f4222e5","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMerchantRecipe.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMerchantRecipe.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/MerchantRecipe.java","new_code":" return this.a.d == merchantrecipe.a.d && this.c.d == merchantrecipe.c.d ? this.b == null && merchantrecipe.b == null || this.b != null && merchantrecipe.b != null && this.b.d == merchantrecipe.b.d : false;","new_methods":[],"old_code":" return this.a.c == merchantrecipe.a.c && this.c.c == merchantrecipe.c.c ? this.b == null && merchantrecipe.b == null || this.b != null && merchantrecipe.b != null && this.b.c == merchantrecipe.b.c : false;","old_methods":[],"patch":"@@ -46,7 +46,7 @@ public ItemStack d() {\n }\n \n public boolean a(MerchantRecipe merchantrecipe) {\n- return this.a.c == merchantrecipe.a.c && this.c.c == merchantrecipe.c.c ? this.b == null && merchantrecipe.b == null || this.b != null && merchantrecipe.b != null && this.b.c == merchantrecipe.b.c : false;\n+ return this.a.d == merchantrecipe.a.d && this.c.d == merchantrecipe.c.d ? this.b == null && merchantrecipe.b == null || this.b != null && merchantrecipe.b != null && this.b.d == merchantrecipe.b.d : false;\n }\n \n public boolean b(MerchantRecipe merchantrecipe) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMerchantRecipe.java","sha":"18d0e7ba1d5d5f6efe0b8c036c80fbfe8f2288c0","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMinecraftServer.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMinecraftServer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/MinecraftServer.java","new_code":" return \"1.6.2\";","new_methods":[],"old_code":" return \"1.6.1\";","old_methods":[],"patch":"@@ -652,7 +652,7 @@ public String y() {\n }\n \n public String z() {\n- return \"1.6.1\";\n+ return \"1.6.2\";\n }\n \n public int A() {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMinecraftServer.java","sha":"db1000bf9b1baf33ad16f261e24bb1b05f9c5dbe","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMobSpawnerBaseLogic.java","changes":5,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMobSpawnerBaseLogic.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/MobSpawnerBaseLogic.java","new_code":"\n if (entityliving == null || entityliving.bs()) {","new_methods":[],"old_code":"\n\n if (entityliving == null || entityliving.bo()) {","old_methods":[],"patch":"@@ -1,14 +1,12 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import java.util.Collection;\n import java.util.Iterator;\n import java.util.List;\n import net.canarymod.api.CanaryMobSpawnerLogic;\n import net.canarymod.api.MobSpawnerLogic;\n \n-\n public abstract class MobSpawnerBaseLogic {\n \n public int b = 20;\n@@ -27,6 +25,7 @@ public abstract class MobSpawnerBaseLogic {\n \n // CanaryMod: Variable Declaration\n public MobSpawnerLogic logic = (MobSpawnerLogic) new CanaryMobSpawnerLogic(this);\n+\n // CanaryMod: End\n \n public MobSpawnerBaseLogic() {}\n@@ -100,7 +99,7 @@ public void g() {\n EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving) entity : null;\n \n entity.b(d0, d3, d4, this.a().s.nextFloat() * 360.0F, 0.0F);\n- if (entityliving == null || entityliving.bo()) {\n+ if (entityliving == null || entityliving.bs()) {\n this.a(entity);\n this.a().e(2004, this.b(), this.c(), this.d(), 0);\n if (entityliving != null) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMobSpawnerBaseLogic.java","sha":"00750d227b15489369542f8d92d90767683a5853","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNBTTagList.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNBTTagList.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/NBTTagList.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,14 +1,12 @@\n package net.minecraft.server;\n \n-\n import java.io.DataInput;\n import java.io.DataOutput;\n import java.io.IOException;\n import java.util.ArrayList;\n import java.util.Iterator;\n import java.util.List;\n \n-\n public class NBTTagList extends NBTBase {\n \n public List a = new ArrayList(); // CanaryMod: private -> public","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNBTTagList.java","sha":"3a2c934c53e1750567b206e1f00134280336e3c5","status":"modified"},{"additions":12,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetLoginHandler.java","changes":20,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetLoginHandler.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":8,"filename":"src/main/java/net/minecraft/server/NetLoginHandler.java","new_code":" public void d() {\n this.e();\n this.e.an().a(\"Disconnecting \" + this.f() + \": \" + s0);\n if (packet2clientprotocol.d() != 74) {\n if (packet2clientprotocol.d() > 74) {\n public void e() {\n this.e.an().a(this.f() + \" lost connection\");\n public String f() {\n public boolean c() {\n return this.b;\n }\n","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/NetLoginHandler.java","implementation":"this.e();\n this.e.an().a(\"Disconnecting \" + this.f() + \": \" + s0);\n if (packet2clientprotocol.d() != 74) {\n if (packet2clientprotocol.d() > 74) {\n public void e() {\n this.e.an().a(this.f() + \" lost connection\");\n public String f() {\n public boolean c() {\n return this.b;","signature":"void d()"}],"old_code":" public void c() {\n this.d();\n this.e.an().a(\"Disconnecting \" + this.e() + \": \" + s0);\n if (packet2clientprotocol.d() != 73) {\n if (packet2clientprotocol.d() > 73) {\n public void d() {\n this.e.an().a(this.e() + \" lost connection\");\n public String e() {","old_methods":[],"patch":"@@ -33,9 +33,9 @@ public NetLoginHandler(MinecraftServer minecraftserver, Socket socket, String s0\n this.a.e = 0;\n }\n \n- public void c() {\n+ public void d() {\n if (this.h) {\n- this.d();\n+ this.e();\n }\n \n if (this.f++ == 600) {\n@@ -47,7 +47,7 @@ public void c() {\n \n public void a(String s0) {\n try {\n- this.e.an().a(\"Disconnecting \" + this.e() + \": \" + s0);\n+ this.e.an().a(\"Disconnecting \" + this.f() + \": \" + s0);\n this.a.a((Packet) (new Packet255KickDisconnect(s0)));\n this.a.d();\n this.b = true;\n@@ -63,8 +63,8 @@ public void a(Packet2ClientProtocol packet2clientprotocol) {\n } else {\n PublicKey publickey = this.e.H().getPublic();\n \n- if (packet2clientprotocol.d() != 73) {\n- if (packet2clientprotocol.d() > 73) {\n+ if (packet2clientprotocol.d() != 74) {\n+ if (packet2clientprotocol.d() > 74) {\n this.a(\"Outdated server!\");\n } else {\n this.a(\"Outdated client!\");\n@@ -107,7 +107,7 @@ public void a(Packet205ClientCommand packet205clientcommand) {\n \n public void a(Packet1Login packet1login) {}\n \n- public void d() {\n+ public void e() {\n String s0 = this.e.af().a(this.a.c(), this.g);\n \n if (s0 != null) {\n@@ -124,7 +124,7 @@ public void d() {\n }\n \n public void a(String s0, Object[] aobject) {\n- this.e.an().a(this.e() + \" lost connection\");\n+ this.e.an().a(this.f() + \" lost connection\");\n this.b = true;\n }\n \n@@ -177,14 +177,18 @@ public void a(Packet packet) {\n this.a(\"Protocol error\");\n }\n \n- public String e() {\n+ public String f() {\n return this.g != null ? this.g + \" [\" + this.a.c().toString() + \"]\" : this.a.c().toString();\n }\n \n public boolean a() {\n return true;\n }\n \n+ public boolean c() {\n+ return this.b;\n+ }\n+\n static String a(NetLoginHandler netloginhandler) {\n return netloginhandler.i;\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetLoginHandler.java","sha":"e057bd03060d80334bca973c2ed5bdd717c9a732","status":"modified"},{"additions":39,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetServerHandler.java","changes":93,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetServerHandler.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":54,"filename":"src/main/java/net/minecraft/server/NetServerHandler.java","new_code":" public void e() {\n this.c.o.V();\n this.c.X = 0.0F;\n this.c.o.V();\n if (this.c.bg()) {\n double d4;\n\n if (!this.c.bg() && (d4 > 1.65D || d4 < 0.1D)) {\n double d5 = d2 - this.c.v;\n double d6 = d3 - this.c.w;\n double d7 = Math.min(Math.abs(d4), Math.abs(this.c.x));\n double d8 = Math.min(Math.abs(d5), Math.abs(this.c.y));\n double d9 = Math.min(Math.abs(d6), Math.abs(this.c.z));\n double d10 = d7 * d7 + d8 * d8 + d9 * d9;\n\n if (d10 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\n this.d.an().b(this.c.c_() + \" moved too quickly! \" + d4 + \",\" + d5 + \",\" + d6 + \" (\" + d7 + \", \" + d8 + \", \" + d9 + \")\");\n if (this.c.F && !packet10flying.g && d5 > 0.0D) {\n this.c.d(d4, d5, d6);\n this.c.j(d4, d5, d6);\n double d11 = d5;\n d5 = d2 - this.c.v;\n if (d5 > -0.5D || d5 < 0.5D) {\n d5 = 0.0D;\n d6 = d3 - this.c.w;\n d10 = d4 * d4 + d5 * d5 + d6 * d6;\n if (d10 > 0.0625D && !this.c.bg() && !this.c.c.d()) {\n if (flag0 && (flag1 || !flag2) && !this.c.bg()) {\n if (d11 >= -0.03125D) {\n this.c.bs();\n ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\"chat.type.text\", new Object[] { this.c.ax(), s0});\n this.c.aU();\n public int f() {\n if (this.c.aM() > 0.0F) {\n if (!tileentitysign.a() || tileentitysign.b() != this.c) {\n public boolean c() {\n return this.b;\n }\n","new_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/NetServerHandler.java","implementation":"this.c.o.V();\n this.c.X = 0.0F;\n this.c.o.V();\n if (this.c.bg()) {\n double d4;\n\n if (!this.c.bg() && (d4 > 1.65D || d4 < 0.1D)) {\n double d5 = d2 - this.c.v;\n double d6 = d3 - this.c.w;\n double d7 = Math.min(Math.abs(d4), Math.abs(this.c.x));\n double d8 = Math.min(Math.abs(d5), Math.abs(this.c.y));\n double d9 = Math.min(Math.abs(d6), Math.abs(this.c.z));\n double d10 = d7 * d7 + d8 * d8 + d9 * d9;\n\n if (d10 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\n this.d.an().b(this.c.c_() + \" moved too quickly! \" + d4 + \",\" + d5 + \",\" + d6 + \" (\" + d7 + \", \" + d8 + \", \" + d9 + \")\");\n if (this.c.F && !packet10flying.g && d5 > 0.0D) {\n this.c.d(d4, d5, d6);\n this.c.j(d4, d5, d6);\n double d11 = d5;\n d5 = d2 - this.c.v;\n if (d5 > -0.5D || d5 < 0.5D) {\n d5 = 0.0D;\n d6 = d3 - this.c.w;\n d10 = d4 * d4 + d5 * d5 + d6 * d6;\n if (d10 > 0.0625D && !this.c.bg() && !this.c.c.d()) {\n if (flag0 && (flag1 || !flag2) && !this.c.bg()) {\n if (d11 >= -0.03125D) {\n this.c.bs();\n ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\"chat.type.text\", new Object[] { this.c.ax(), s0","signature":"void e()"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/NetServerHandler.java","implementation":"if (this.c.aM() > 0.0F) {\n if (!tileentitysign.a() || tileentitysign.b() != this.c) {\n public boolean c() {\n return this.b;","signature":"int f()"}],"old_code":" public void d() {\n double d4;\n this.c.o.U();\n double d5 = 0.0D;\n\n d4 = 0.0D;\n if (packet10flying.h && packet10flying.b == -999.0D && packet10flying.d == -999.0D) {\n if (Math.abs(packet10flying.a) > 1.0D || Math.abs(packet10flying.c) > 1.0D) {\n System.err.println(this.c.c_() + \" was caught trying to crash the server with an invalid position.\");\n this.c(\"Nope!\");\n return;\n }\n\n d5 = packet10flying.a;\n d4 = packet10flying.c;\n }\n\n this.c.d(d5, 0.0D, d4);\n this.c.x = d5;\n this.c.z = d4;\n worldserver.b(this.c.o, true);\n }\n\n if (this.c.o != null) {\n this.c.o.U();\n if (this.c.bd()) {\n if (!this.c.bd() && (d4 > 1.65D || d4 < 0.1D)) {\n double d6 = d2 - this.c.v;\n double d7 = d3 - this.c.w;\n double d8 = Math.min(Math.abs(d4), Math.abs(this.c.x));\n double d9 = Math.min(Math.abs(d6), Math.abs(this.c.y));\n double d10 = Math.min(Math.abs(d7), Math.abs(this.c.z));\n double d11 = d8 * d8 + d9 * d9 + d10 * d10;\n\n if (d11 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\n this.d.an().b(this.c.c_() + \" moved too quickly! \" + d4 + \",\" + d6 + \",\" + d7 + \" (\" + d8 + \", \" + d9 + \", \" + d10 + \")\");\n if (this.c.F && !packet10flying.g && d6 > 0.0D) {\n this.c.d(d4, d6, d7);\n this.c.j(d4, d6, d7);\n double d12 = d6;\n d6 = d2 - this.c.v;\n if (d6 > -0.5D || d6 < 0.5D) {\n d6 = 0.0D;\n d7 = d3 - this.c.w;\n d11 = d4 * d4 + d6 * d6 + d7 * d7;\n if (d11 > 0.0625D && !this.c.bd() && !this.c.c.d()) {\n if (flag0 && (flag1 || !flag2) && !this.c.bd()) {\n if (d12 >= -0.03125D) {\n this.c.bo();\n ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\"chat.type.text\", new Object[]{ this.c.aw(), s0 });\n this.c.aR();\n public int e() {\n if (this.c.aJ() > 0.0F) {\n if (!tileentitysign.a()) {","old_methods":[{"arguments":[],"filename":"src/main/java/net/minecraft/server/NetServerHandler.java","implementation":"double d4;\n this.c.o.U();\n double d5 = 0.0D;\n\n d4 = 0.0D;\n if (packet10flying.h && packet10flying.b == -999.0D && packet10flying.d == -999.0D) {\n if (Math.abs(packet10flying.a) > 1.0D || Math.abs(packet10flying.c) > 1.0D) {\n System.err.println(this.c.c_() + \" was caught trying to crash the server with an invalid position.\");\n this.c(\"Nope!\");\n return;","signature":"void d()"}],"patch":"@@ -69,7 +69,7 @@ public NetServerHandler(MinecraftServer minecraftserver, INetworkManager inetwor\n serverHandler = new CanaryNetServerHandler(this);\n }\n \n- public void d() {\n+ public void e() {\n this.g = false;\n ++this.e;\n this.d.a.a(\"packetflow\");\n@@ -150,47 +150,26 @@ public void a(Packet10Flying packet10flying) {\n double d1;\n double d2;\n double d3;\n- double d4;\n \n if (this.c.o != null) {\n float f0 = this.c.A;\n float f1 = this.c.B;\n \n- this.c.o.U();\n+ this.c.o.V();\n d1 = this.c.u;\n d2 = this.c.v;\n d3 = this.c.w;\n- double d5 = 0.0D;\n-\n- d4 = 0.0D;\n if (packet10flying.i) {\n f0 = packet10flying.e;\n f1 = packet10flying.f;\n }\n \n- if (packet10flying.h && packet10flying.b == -999.0D && packet10flying.d == -999.0D) {\n- if (Math.abs(packet10flying.a) > 1.0D || Math.abs(packet10flying.c) > 1.0D) {\n- System.err.println(this.c.c_() + \" was caught trying to crash the server with an invalid position.\");\n- this.c(\"Nope!\");\n- return;\n- }\n-\n- d5 = packet10flying.a;\n- d4 = packet10flying.c;\n- }\n-\n this.c.F = packet10flying.g;\n this.c.h();\n- this.c.d(d5, 0.0D, d4);\n+ this.c.X = 0.0F;\n this.c.a(d1, d2, d3, f0, f1);\n- this.c.x = d5;\n- this.c.z = d4;\n if (this.c.o != null) {\n- worldserver.b(this.c.o, true);\n- }\n-\n- if (this.c.o != null) {\n- this.c.o.U();\n+ this.c.o.V();\n }\n \n this.d.af().d(this.c);\n@@ -204,7 +183,7 @@ public void a(Packet10Flying packet10flying) {\n return;\n }\n \n- if (this.c.bd()) {\n+ if (this.c.bg()) {\n this.c.h();\n this.c.a(this.n, this.o, this.p, this.c.A, this.c.B);\n worldserver.g(this.c);\n@@ -225,12 +204,14 @@ public void a(Packet10Flying packet10flying) {\n packet10flying.h = false;\n }\n \n+ double d4;\n+\n if (packet10flying.h) {\n d1 = packet10flying.a;\n d2 = packet10flying.b;\n d3 = packet10flying.c;\n d4 = packet10flying.d - packet10flying.b;\n- if (!this.c.bd() && (d4 > 1.65D || d4 < 0.1D)) {\n+ if (!this.c.bg() && (d4 > 1.65D || d4 < 0.1D)) {\n this.c(\"Illegal stance\");\n this.d.an().b(this.c.c_() + \" had an illegal stance: \" + d4);\n return;\n@@ -255,50 +236,50 @@ public void a(Packet10Flying packet10flying) {\n }\n \n d4 = d1 - this.c.u;\n- double d6 = d2 - this.c.v;\n- double d7 = d3 - this.c.w;\n- double d8 = Math.min(Math.abs(d4), Math.abs(this.c.x));\n- double d9 = Math.min(Math.abs(d6), Math.abs(this.c.y));\n- double d10 = Math.min(Math.abs(d7), Math.abs(this.c.z));\n- double d11 = d8 * d8 + d9 * d9 + d10 * d10;\n-\n- if (d11 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\n- this.d.an().b(this.c.c_() + \" moved too quickly! \" + d4 + \",\" + d6 + \",\" + d7 + \" (\" + d8 + \", \" + d9 + \", \" + d10 + \")\");\n+ double d5 = d2 - this.c.v;\n+ double d6 = d3 - this.c.w;\n+ double d7 = Math.min(Math.abs(d4), Math.abs(this.c.x));\n+ double d8 = Math.min(Math.abs(d5), Math.abs(this.c.y));\n+ double d9 = Math.min(Math.abs(d6), Math.abs(this.c.z));\n+ double d10 = d7 * d7 + d8 * d8 + d9 * d9;\n+\n+ if (d10 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\n+ this.d.an().b(this.c.c_() + \" moved too quickly! \" + d4 + \",\" + d5 + \",\" + d6 + \" (\" + d7 + \", \" + d8 + \", \" + d9 + \")\");\n this.a(this.n, this.o, this.p, this.c.A, this.c.B, this.c.q.getCanaryWorld().getType().getId(), this.c.q.getCanaryWorld().getName(), TeleportHook.TeleportCause.MOVEMENT);\n return;\n }\n \n float f4 = 0.0625F;\n boolean flag0 = worldserver.a(this.c, this.c.E.c().e((double) f4, (double) f4, (double) f4)).isEmpty();\n \n- if (this.c.F && !packet10flying.g && d6 > 0.0D) {\n+ if (this.c.F && !packet10flying.g && d5 > 0.0D) {\n this.c.a(0.2F);\n }\n \n- this.c.d(d4, d6, d7);\n+ this.c.d(d4, d5, d6);\n this.c.F = packet10flying.g;\n- this.c.j(d4, d6, d7);\n- double d12 = d6;\n+ this.c.j(d4, d5, d6);\n+ double d11 = d5;\n \n d4 = d1 - this.c.u;\n- d6 = d2 - this.c.v;\n- if (d6 > -0.5D || d6 < 0.5D) {\n- d6 = 0.0D;\n+ d5 = d2 - this.c.v;\n+ if (d5 > -0.5D || d5 < 0.5D) {\n+ d5 = 0.0D;\n }\n \n- d7 = d3 - this.c.w;\n- d11 = d4 * d4 + d6 * d6 + d7 * d7;\n+ d6 = d3 - this.c.w;\n+ d10 = d4 * d4 + d5 * d5 + d6 * d6;\n boolean flag1 = false;\n \n- if (d11 > 0.0625D && !this.c.bd() && !this.c.c.d()) {\n+ if (d10 > 0.0625D && !this.c.bg() && !this.c.c.d()) {\n flag1 = true;\n this.d.an().b(this.c.c_() + \" moved wrongly!\");\n }\n \n this.c.a(d1, d2, d3, f2, f3);\n boolean flag2 = worldserver.a(this.c, this.c.E.c().e((double) f4, (double) f4, (double) f4)).isEmpty();\n \n- if (flag0 && (flag1 || !flag2) && !this.c.bd()) {\n+ if (flag0 && (flag1 || !flag2) && !this.c.bg()) {\n this.a(this.n, this.o, this.p, f2, f3, c.getCanaryWorld().getType().getId(), c.getCanaryWorld().getName(), TeleportHook.TeleportCause.MOVEMENT);\n return;\n }\n@@ -308,7 +289,7 @@ public void a(Packet10Flying packet10flying) {\n // CanaryMod: check on flying capability instead of mode\n // moved allow-flight to per-world config\n if (!Configuration.getWorldConfig(c.getCanaryWorld().getFqName()).isFlightAllowed() && !this.c.bG.c && !worldserver.c(axisalignedbb)) {\n- if (d12 >= -0.03125D) {\n+ if (d11 >= -0.03125D) {\n ++this.f;\n if (this.f > 80) {\n this.d.an().b(this.c.c_() + \" was kicked for floating too long!\");\n@@ -356,7 +337,7 @@ public void a(Packet14BlockDig packet14blockdig) {\n } else if (packet14blockdig.e == 3) {\n this.c.a(true);\n } else if (packet14blockdig.e == 5) {\n- this.c.bo();\n+ this.c.bs();\n } else {\n boolean flag0 = false;\n \n@@ -598,7 +579,7 @@ public void a(Packet3Chat packet3chat) {\n return;\n }\n \n- ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\"chat.type.text\", new Object[]{ this.c.aw(), s0 });\n+ ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\"chat.type.text\", new Object[] { this.c.ax(), s0});\n \n this.d.af().a(chatmessagecomponent, false);\n }\n@@ -622,7 +603,7 @@ public void a(Packet18Animation packet18animation) {\n if (packet18animation.b == 1) {\n // CanaryMod: PlayerLeftClick\n new PlayerLeftClickHook(this.c.getPlayer()).call();\n- this.c.aR();\n+ this.c.aU();\n }\n }\n \n@@ -653,7 +634,7 @@ public void a(Packet255KickDisconnect packet255kickdisconnect) {\n this.a.a(\"disconnect.quitting\", new Object[0]);\n }\n \n- public int e() {\n+ public int f() {\n return this.a.e();\n }\n \n@@ -695,7 +676,7 @@ public void a(Packet205ClientCommand packet205clientcommand) {\n this.c.a.c(\"You have died. Game over, man, it\\'s game over!\");\n }\n } else {\n- if (this.c.aJ() > 0.0F) {\n+ if (this.c.aM() > 0.0F) {\n return;\n }\n \n@@ -825,7 +806,7 @@ public void a(Packet130UpdateSign packet130updatesign) {\n if (tileentity instanceof TileEntitySign) {\n TileEntitySign tileentitysign = (TileEntitySign) tileentity;\n \n- if (!tileentitysign.a()) {\n+ if (!tileentitysign.a() || tileentitysign.b() != this.c) {\n this.d.f(\"Player \" + this.c.c_() + \" just tried to change non-editable sign\");\n return;\n }\n@@ -1081,6 +1062,10 @@ public void a(Packet250CustomPayload packet250custompayload) {\n \n }\n \n+ public boolean c() {\n+ return this.b;\n+ }\n+\n /**\n * gets the CanaryNetServerHandler wrapper\n * ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetServerHandler.java","sha":"2514183a8023a6aef4990b91d0f829394d218f6d","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/Packet.java","new_code":" public boolean s;\n eofexception.printStackTrace();\n a(133, true, false, Packet133TileEditorOpen.class);","new_methods":[],"old_code":" public boolean s = false;\n\n","old_methods":[],"patch":"@@ -22,7 +22,7 @@ public abstract class Packet {\n public static long p;\n public static long q;\n public static long r;\n- public boolean s = false;\n+ public boolean s;\n \n public Packet() {}\n \n@@ -82,9 +82,7 @@ public static Packet a(ILogAgent ilogagent, DataInput datainput, boolean flag0,\n boolean flag1 = false;\n Packet packet = null;\n int i0 = socket.getSoTimeout();\n-\n int i1;\n-\n try {\n i1 = datainput.readUnsignedByte();\n if (flag0 && !c.contains(Integer.valueOf(i1)) || !flag0 && !b.contains(Integer.valueOf(i1))) {\n@@ -106,6 +104,7 @@ public static Packet a(ILogAgent ilogagent, DataInput datainput, boolean flag0,\n p += (long) packet.a();\n } catch (EOFException eofexception) {\n ilogagent.c(\"Reached end of stream for \" + socket.getInetAddress());\n+ eofexception.printStackTrace();\n return null;\n }\n \n@@ -299,6 +298,7 @@ protected static void a(NBTTagCompound nbttagcompound, DataOutput dataoutput) th\n a(130, true, true, Packet130UpdateSign.class);\n a(131, true, false, Packet131MapData.class);\n a(132, true, false, Packet132TileEntityData.class);\n+ a(133, true, false, Packet133TileEditorOpen.class);\n a(200, true, false, Packet200Statistic.class);\n a(201, true, false, Packet201PlayerInfo.class);\n a(202, true, true, Packet202PlayerAbilities.class);","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket.java","sha":"bdcc929f955aff7e713fcfb1fcf907a5bc74ef22","status":"modified"},{"additions":21,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket63WorldParticles.java","changes":42,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket63WorldParticles.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":21,"filename":"src/main/java/net/minecraft/server/Packet63WorldParticles.java","new_code":" public void a(DataInput datainput) throws IOException {\n this.a = a(datainput, 64);\n this.b = datainput.readFloat();\n this.c = datainput.readFloat();\n this.d = datainput.readFloat();\n this.e = datainput.readFloat();\n this.f = datainput.readFloat();\n this.g = datainput.readFloat();\n this.h = datainput.readFloat();\n this.i = datainput.readInt();\n public void a(DataOutput dataoutput) throws IOException {\n a(this.a, dataoutput);\n dataoutput.writeFloat(this.b);\n dataoutput.writeFloat(this.c);\n dataoutput.writeFloat(this.d);\n dataoutput.writeFloat(this.e);\n dataoutput.writeFloat(this.f);\n dataoutput.writeFloat(this.g);\n dataoutput.writeFloat(this.h);\n dataoutput.writeInt(this.i);\n}","new_methods":[],"old_code":" public void a(DataInput datainputstream) throws IOException {\n this.a = a(datainputstream, 64);\n this.b = datainputstream.readFloat();\n this.c = datainputstream.readFloat();\n this.d = datainputstream.readFloat();\n this.e = datainputstream.readFloat();\n this.f = datainputstream.readFloat();\n this.g = datainputstream.readFloat();\n this.h = datainputstream.readFloat();\n this.i = datainputstream.readInt();\n public void a(DataOutput dataoutputstream) throws IOException {\n a(this.a, dataoutputstream);\n dataoutputstream.writeFloat(this.b);\n dataoutputstream.writeFloat(this.c);\n dataoutputstream.writeFloat(this.d);\n dataoutputstream.writeFloat(this.e);\n dataoutputstream.writeFloat(this.f);\n dataoutputstream.writeFloat(this.g);\n dataoutputstream.writeFloat(this.h);\n dataoutputstream.writeInt(this.i);\n}","old_methods":[],"patch":"@@ -32,28 +32,28 @@ public Packet63WorldParticles(Particle particle) {\n this.i = particle.quantity;\n }//\n \n- public void a(DataInput datainputstream) throws IOException {\n- this.a = a(datainputstream, 64);\n- this.b = datainputstream.readFloat();\n- this.c = datainputstream.readFloat();\n- this.d = datainputstream.readFloat();\n- this.e = datainputstream.readFloat();\n- this.f = datainputstream.readFloat();\n- this.g = datainputstream.readFloat();\n- this.h = datainputstream.readFloat();\n- this.i = datainputstream.readInt();\n+ public void a(DataInput datainput) throws IOException {\n+ this.a = a(datainput, 64);\n+ this.b = datainput.readFloat();\n+ this.c = datainput.readFloat();\n+ this.d = datainput.readFloat();\n+ this.e = datainput.readFloat();\n+ this.f = datainput.readFloat();\n+ this.g = datainput.readFloat();\n+ this.h = datainput.readFloat();\n+ this.i = datainput.readInt();\n }\n \n- public void a(DataOutput dataoutputstream) throws IOException {\n- a(this.a, dataoutputstream);\n- dataoutputstream.writeFloat(this.b);\n- dataoutputstream.writeFloat(this.c);\n- dataoutputstream.writeFloat(this.d);\n- dataoutputstream.writeFloat(this.e);\n- dataoutputstream.writeFloat(this.f);\n- dataoutputstream.writeFloat(this.g);\n- dataoutputstream.writeFloat(this.h);\n- dataoutputstream.writeInt(this.i);\n+ public void a(DataOutput dataoutput) throws IOException {\n+ a(this.a, dataoutput);\n+ dataoutput.writeFloat(this.b);\n+ dataoutput.writeFloat(this.c);\n+ dataoutput.writeFloat(this.d);\n+ dataoutput.writeFloat(this.e);\n+ dataoutput.writeFloat(this.f);\n+ dataoutput.writeFloat(this.g);\n+ dataoutput.writeFloat(this.h);\n+ dataoutput.writeInt(this.i);\n }\n \n public void a(NetHandler nethandler) {\n@@ -63,4 +63,4 @@ public void a(NetHandler nethandler) {\n public int a() {\n return 64;\n }\n-}\n\\ No newline at end of file\n+}","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket63WorldParticles.java","sha":"7b5818d8c3e542ecd03312f18ea6218cfdbda0d4","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPlayerInstance.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPlayerInstance.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/PlayerInstance.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import java.util.List;\n \n-\n class PlayerInstance {\n \n private final List b;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPlayerInstance.java","sha":"d119b8b8367db9af0f370fcaf8beda86ff076c29","status":"modified"},{"additions":7,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotion.java","changes":14,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotion.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":7,"filename":"src/main/java/net/minecraft/server/Potion.java","new_code":" if (entitylivingbase.aM() < entitylivingbase.aS()) {\n if (entitylivingbase.aM() > 1.0F) {\n ((EntityPlayer) entitylivingbase).bH().a(i0 + 1, 1.0F);\n } else if ((this.H != h.H || entitylivingbase.aL()) && (this.H != i.H || !entitylivingbase.aL())) {\n if (this.H == i.H && !entitylivingbase.aL() || this.H == h.H && entitylivingbase.aL()) {\n if ((this.H != h.H || entitylivingbase1.aL()) && (this.H != i.H || !entitylivingbase1.aL())) {\n if (this.H == i.H && !entitylivingbase1.aL() || this.H == h.H && entitylivingbase1.aL()) {","new_methods":[],"old_code":" if (entitylivingbase.aJ() < entitylivingbase.aP()) {\n if (entitylivingbase.aJ() > 1.0F) {\n ((EntityPlayer) entitylivingbase).bD().a(i0 + 1, 1.0F);\n } else if ((this.H != h.H || entitylivingbase.aI()) && (this.H != i.H || !entitylivingbase.aI())) {\n if (this.H == i.H && !entitylivingbase.aI() || this.H == h.H && entitylivingbase.aI()) {\n if ((this.H != h.H || entitylivingbase1.aI()) && (this.H != i.H || !entitylivingbase1.aI())) {\n if (this.H == i.H && !entitylivingbase1.aI() || this.H == h.H && entitylivingbase1.aI()) {","old_methods":[],"patch":"@@ -80,11 +80,11 @@ public int c() {\n \n public void a(EntityLivingBase entitylivingbase, int i0) {\n if (this.H == l.H) {\n- if (entitylivingbase.aJ() < entitylivingbase.aP()) {\n+ if (entitylivingbase.aM() < entitylivingbase.aS()) {\n entitylivingbase.f(1.0F);\n }\n } else if (this.H == u.H) {\n- if (entitylivingbase.aJ() > 1.0F) {\n+ if (entitylivingbase.aM() > 1.0F) {\n entitylivingbase.a(DamageSource.k, 1.0F);\n }\n } else if (this.H == v.H) {\n@@ -93,10 +93,10 @@ public void a(EntityLivingBase entitylivingbase, int i0) {\n ((EntityPlayer) entitylivingbase).a(0.025F * (float) (i0 + 1));\n } else if (this.H == y.H && entitylivingbase instanceof EntityPlayer) {\n if (!entitylivingbase.q.I) {\n- ((EntityPlayer) entitylivingbase).bD().a(i0 + 1, 1.0F);\n+ ((EntityPlayer) entitylivingbase).bH().a(i0 + 1, 1.0F);\n }\n- } else if ((this.H != h.H || entitylivingbase.aI()) && (this.H != i.H || !entitylivingbase.aI())) {\n- if (this.H == i.H && !entitylivingbase.aI() || this.H == h.H && entitylivingbase.aI()) {\n+ } else if ((this.H != h.H || entitylivingbase.aL()) && (this.H != i.H || !entitylivingbase.aL())) {\n+ if (this.H == i.H && !entitylivingbase.aL() || this.H == h.H && entitylivingbase.aL()) {\n entitylivingbase.a(DamageSource.k, (float) (6 << i0));\n }\n } else {\n@@ -114,8 +114,8 @@ public void a(EntityLivingBase entitylivingbase, EntityLivingBase entitylivingba\n //\n int i1;\n \n- if ((this.H != h.H || entitylivingbase1.aI()) && (this.H != i.H || !entitylivingbase1.aI())) {\n- if (this.H == i.H && !entitylivingbase1.aI() || this.H == h.H && entitylivingbase1.aI()) {\n+ if ((this.H != h.H || entitylivingbase1.aL()) && (this.H != i.H || !entitylivingbase1.aL())) {\n+ if (this.H == i.H && !entitylivingbase1.aL() || this.H == h.H && entitylivingbase1.aL()) {\n i1 = (int) (d0 * (double) (6 << i0) + 0.5D);\n if (entitylivingbase == null) {\n entitylivingbase1.a(DamageSource.k, (float) i1);","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotion.java","sha":"f743fda33fc006c2ebe362ccbaa60a84e7f2a71a","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotionEffect.java","changes":1,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotionEffect.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/PotionEffect.java","new_code":"","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class PotionEffect {\n \n private int a;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotionEffect.java","sha":"ee40ae8c24e6f84378247ba42f5de1af60ea0725","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveFormatOld.java","changes":3,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveFormatOld.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/SaveFormatOld.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,15 +1,14 @@\n package net.minecraft.server;\n \n-\n import java.io.File;\n import java.io.FileInputStream;\n import java.io.InputStream;\n \n-\n public class SaveFormatOld implements ISaveFormat {\n \n protected final File a;\n protected net.canarymod.api.world.DimensionType type;\n+\n // CanaryMod changed constructor\n \n public SaveFormatOld(File file1, net.canarymod.api.world.DimensionType type) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveFormatOld.java","sha":"acc6085981a6afa4820457d36d70d14cf5512803","status":"modified"},{"additions":8,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveHandler.java","changes":15,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveHandler.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":7,"filename":"src/main/java/net/minecraft/server/SaveHandler.java","new_code":" * \n * \n }\n finally {\n }\n finally {\n // CanaryMod enable writing dat files from player name and a given base tag\n // This is a copy of this.a(EntityPlayer and might need adjustments accordingly!)","new_methods":[],"old_code":"\n\n\n } finally {\n } finally {\n //CanaryMod enable writing dat files from player name and a given base tag\n //This is a copy of this.a(EntityPlayer and might need adjustments accordingly!)","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n import java.io.DataInputStream;\n import java.io.DataOutputStream;\n import java.io.File;\n@@ -9,10 +8,8 @@\n import java.io.IOException;\n import java.io.InputStream;\n import java.io.OutputStream;\n-\n import net.canarymod.api.nbt.CanaryCompoundTag;\n \n-\n public class SaveHandler implements ISaveHandler, IPlayerFileData {\n \n private final File a;\n@@ -44,6 +41,7 @@ public SaveHandler(File file1, String s0, boolean flag0, net.canarymod.api.world\n // CanaryMod added getname\n /**\n * get the base name of this world saver (only world name, without dimension appendix)\n+ * \n * @return\n */\n public String getBaseName() {\n@@ -53,6 +51,7 @@ public String getBaseName() {\n // CanaryMod\n /**\n * get the dir folder (worlds/)\n+ * \n * @return\n */\n public File getWorldBaseDir() {\n@@ -66,7 +65,8 @@ private void h() {\n \n try {\n dataoutputstream.writeLong(this.d);\n- } finally {\n+ }\n+ finally {\n dataoutputstream.close();\n }\n } catch (IOException ioexception) {\n@@ -89,7 +89,8 @@ public void c() throws MinecraftException {\n if (datainputstream.readLong() != this.d) {\n throw new MinecraftException(\"The save is being accessed from another location, aborting\");\n }\n- } finally {\n+ }\n+ finally {\n datainputstream.close();\n }\n } catch (IOException ioexception) {\n@@ -272,8 +273,8 @@ public String g() {\n return this.e;\n }\n \n- //CanaryMod enable writing dat files from player name and a given base tag\n- //This is a copy of this.a(EntityPlayer and might need adjustments accordingly!)\n+ // CanaryMod enable writing dat files from player name and a given base tag\n+ // This is a copy of this.a(EntityPlayer and might need adjustments accordingly!)\n public void writePlayerNbt(String player, CanaryCompoundTag tag) {\n try {\n NBTTagCompound nbttagcompound = tag.getHandle();","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveHandler.java","sha":"3c1740763e22b7e020333546f8c2aa48e730b5f5","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScore.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScore.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/Score.java","new_code":"","new_methods":[],"old_code":" ","old_methods":[],"patch":"@@ -77,5 +77,5 @@ public void a(List list) {\n public CanaryScore getCanaryScore() {\n return this.score;\n }\n- \n+\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScore.java","sha":"67a8bb4afd68d95e717e2a1c52d9ba37a2528912","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreDummyCriteria.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreDummyCriteria.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/ScoreDummyCriteria.java","new_code":" // CanaryMod: Set Variable","new_methods":[],"old_code":" // CanaryMod: Set Variable","old_methods":[],"patch":"@@ -15,7 +15,7 @@ public ScoreDummyCriteria(String s0) {\n if (!ScoreObjectiveCriteria.a.containsKey(s0)) {\n ScoreObjectiveCriteria.a.put(s0, this);\n }//\n- // CanaryMod: Set Variable\n+ // CanaryMod: Set Variable\n if (!(this instanceof ScoreHealthCriteria)) {\n criteria = new CanaryScoreDummyCriteria(this);\n }//","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreDummyCriteria.java","sha":"41a0c583c579a769a223a81c87ff9cfb430c3f4e","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreHealthCriteria.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreHealthCriteria.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/ScoreHealthCriteria.java","new_code":" for (Iterator iterator = list.iterator(); iterator.hasNext(); f0 += entityplayer.aM() + entityplayer.bm()) {","new_methods":[],"old_code":" for (Iterator iterator = list.iterator(); iterator.hasNext(); f0 += entityplayer.aJ() + entityplayer.bj()) {","old_methods":[],"patch":"@@ -17,7 +17,7 @@ public int a(List list) {\n \n EntityPlayer entityplayer;\n \n- for (Iterator iterator = list.iterator(); iterator.hasNext(); f0 += entityplayer.aJ() + entityplayer.bj()) {\n+ for (Iterator iterator = list.iterator(); iterator.hasNext(); f0 += entityplayer.aM() + entityplayer.bm()) {\n entityplayer = (EntityPlayer) iterator.next();\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreHealthCriteria.java","sha":"e31fa9cef7fd7597cdf30d6e8a56ed094fe7cd2d","status":"modified"},{"additions":8,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScorePlayerTeam.java","changes":12,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScorePlayerTeam.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":4,"filename":"src/main/java/net/minecraft/server/ScorePlayerTeam.java","new_code":"public class ScorePlayerTeam extends Team {\n public final Scoreboard a; // CanaryMod: private to public\n public String d(String s0) {\n return this.e() + s0 + this.f();\n }\n\n public static String a(Team team, String s0) {\n return team == null ? s0 : team.d(s0);","new_methods":[{"arguments":["String s0"],"filename":"src/main/java/net/minecraft/server/ScorePlayerTeam.java","implementation":"return this.e() + s0 + this.f();","signature":"String d(String s0)"}],"old_code":"public class ScorePlayerTeam {\n public final Scoreboard a; //CanaryMod: private to public\n public static String a(ScorePlayerTeam scoreplayerteam, String s0) {\n return scoreplayerteam == null ? s0 : scoreplayerteam.e() + s0 + scoreplayerteam.f();","old_methods":[],"patch":"@@ -5,9 +5,9 @@\n import java.util.Set;\n import net.canarymod.api.scoreboard.CanaryTeam;\n \n-public class ScorePlayerTeam {\n+public class ScorePlayerTeam extends Team {\n \n- public final Scoreboard a; //CanaryMod: private to public\n+ public final Scoreboard a; // CanaryMod: private to public\n private final String b;\n private final Set c = new HashSet();\n private String d;\n@@ -71,8 +71,12 @@ public void c(String s0) {\n }\n }\n \n- public static String a(ScorePlayerTeam scoreplayerteam, String s0) {\n- return scoreplayerteam == null ? s0 : scoreplayerteam.e() + s0 + scoreplayerteam.f();\n+ public String d(String s0) {\n+ return this.e() + s0 + this.f();\n+ }\n+\n+ public static String a(Team team, String s0) {\n+ return team == null ? s0 : team.d(s0);\n }\n \n public boolean g() {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScorePlayerTeam.java","sha":"3848beb60ef8f03f30b20752b141963bfc7b38be","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerBlockEventList.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerBlockEventList.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/ServerBlockEventList.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n \n-\n class ServerBlockEventList extends ArrayList {\n \n private ServerBlockEventList() {}","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerBlockEventList.java","sha":"0f76c5648598bbbf3792543104e27e0702ebdc11","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandManager.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandManager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/ServerCommandManager.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,11 +1,9 @@\n package net.minecraft.server;\n \n-\n import java.util.Iterator;\n import net.canarymod.Canary;\n import net.canarymod.api.world.CanaryWorld;\n \n-\n public class ServerCommandManager extends CommandHandler implements IAdminCommand {\n \n public ServerCommandManager() {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandManager.java","sha":"6668074ef444b6daf0838f3557c237dac64d1b46","status":"modified"},{"additions":5,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandScoreboard.java","changes":9,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandScoreboard.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":4,"filename":"src/main/java/net/minecraft/server/ServerCommandScoreboard.java","new_code":" return ((CanaryWorld) Canary.getServer().getDefaultWorld()).getHandle().D;\n\n return ((CanaryWorld) Canary.getServer().getDefaultWorld()).getHandle().D;\n s0 = b(icommandsender).am();\n s0 = b(icommandsender).am();","new_methods":[],"old_code":" return ((CanaryWorld)Canary.getServer().getDefaultWorld()).getHandle().D;\n return ((CanaryWorld)Canary.getServer().getDefaultWorld()).getHandle().D;\n s0 = b(icommandsender).al();\n s0 = b(icommandsender).al();","old_methods":[],"patch":"@@ -168,11 +168,12 @@ public void b(ICommandSender icommandsender, String[] astring) {\n \n protected Scoreboard d() {\n // CanaryMod: This here returns the default world to get the default scoreboard.\n- return ((CanaryWorld)Canary.getServer().getDefaultWorld()).getHandle().D;\n+ return ((CanaryWorld) Canary.getServer().getDefaultWorld()).getHandle().D;\n }\n+\n protected Scoreboard getScoreboard(World world) {\n // CanaryMod: This here returns the default world to get the default scoreboard.\n- return ((CanaryWorld)Canary.getServer().getDefaultWorld()).getHandle().D;\n+ return ((CanaryWorld) Canary.getServer().getDefaultWorld()).getHandle().D;\n }\n \n protected ScoreObjective a(String s0, boolean flag0) {\n@@ -357,7 +358,7 @@ protected void g(ICommandSender icommandsender, String[] astring, int i0) {\n String s0;\n \n if (icommandsender instanceof EntityPlayer && i0 == astring.length) {\n- s0 = b(icommandsender).al();\n+ s0 = b(icommandsender).am();\n scoreboard.a(s0, scoreplayerteam);\n hashset.add(s0);\n } else {\n@@ -380,7 +381,7 @@ protected void h(ICommandSender icommandsender, String[] astring, int i0) {\n String s0;\n \n if (icommandsender instanceof EntityPlayer && i0 == astring.length) {\n- s0 = b(icommandsender).al();\n+ s0 = b(icommandsender).am();\n if (scoreboard.g(s0)) {\n hashset.add(s0);\n } else {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandScoreboard.java","sha":"fb3208db7f8d5503ea1caf98301e0f38e71e350f","status":"modified"},{"additions":19,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerConfigurationManager.java","changes":38,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerConfigurationManager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":19,"filename":"src/main/java/net/minecraft/server/ServerConfigurationManager.java","new_code":" ConnectionHook hook = (ConnectionHook) new ConnectionHook(entityplayermp.getPlayer(), ChatMessageComponent.b(\"multiplayer.player.joined\", new Object[]{ entityplayermp.ax() }).a(EnumChatFormatting.o).toString(), firstTime).call();\n Iterator iterator = entityplayermp.aK().iterator();\n // ChunkCoordinates chunkcoordinates = entityplayermp.bE(); //CanaryMod removed in favor of a real location\n boolean flag1 = entityplayermp.bF();\n entityplayermp1.g(entityplayermp1.aM());\n Iterator iterator = entityplayermp.aK().iterator();\n if (entity.S()) {\n if (entity.S()) {\n if (entity.S()) {\n if (entity.S()) {\n if ((world == null || entityplayermp.q == world) && (s0 == null || flag1 != s0.equalsIgnoreCase(entityplayermp.am()))) {\n Team team = entityplayermp.bn();\n String s2 = team == null ? \"\" : team.b();\n Scoreboard scoreboard = entityplayer.bL();\n Score score = entityplayer.bL().a(entityplayer.am(), scoreobjective);\n public void a(ChatMessageComponent chatmessagecomponent) {\n this.a(chatmessagecomponent, true);\n }\n","new_methods":[{"arguments":["ChatMessageComponent chatmessagecomponent"],"filename":"src/main/java/net/minecraft/server/ServerConfigurationManager.java","implementation":"this.a(chatmessagecomponent, true);","signature":"void a(ChatMessageComponent chatmessagecomponent)"}],"old_code":" ConnectionHook hook = (ConnectionHook) new ConnectionHook(entityplayermp.getPlayer(), ChatMessageComponent.b(\"multiplayer.player.joined\", new Object[]{ entityplayermp.aw() }).a(EnumChatFormatting.o).toString(), firstTime).call();\n Iterator iterator = entityplayermp.aH().iterator();\n // ChunkCoordinates chunkcoordinates = entityplayermp.bA(); //CanaryMod removed in favor of a real location\n boolean flag1 = entityplayermp.bB();\n entityplayermp1.g(entityplayermp1.aJ());\n Iterator iterator = entityplayermp.aH().iterator();\n if (entity.R()) {\n if (entity.R()) {\n if (entity.R()) {\n if (entity.R()) {\n if ((world == null || entityplayermp.q == world) && (s0 == null || flag1 != s0.equalsIgnoreCase(entityplayermp.al()))) {\n ScorePlayerTeam scoreplayerteam = entityplayermp.bI();\n String s2 = scoreplayerteam == null ? \"\" : scoreplayerteam.b();\n Scoreboard scoreboard = entityplayer.bH();\n Score score = entityplayer.bH().a(entityplayer.al(), scoreobjective);\n public void a(ChatMessageComponent chatmessagecomponent) {\n this.a(chatmessagecomponent, true);\n }\n","old_methods":[{"arguments":["ChatMessageComponent chatmessagecomponent"],"filename":"src/main/java/net/minecraft/server/ServerConfigurationManager.java","implementation":"this.a(chatmessagecomponent, true);","signature":"void a(ChatMessageComponent chatmessagecomponent)"}],"patch":"@@ -94,7 +94,7 @@ public void a(INetworkManager inetworkmanager, EntityPlayerMP entityplayermp) {\n this.a((ServerScoreboard) worldserver.X(), entityplayermp);\n this.b(entityplayermp, worldserver);\n // CanaryMod Connection hook\n- ConnectionHook hook = (ConnectionHook) new ConnectionHook(entityplayermp.getPlayer(), ChatMessageComponent.b(\"multiplayer.player.joined\", new Object[]{ entityplayermp.aw() }).a(EnumChatFormatting.o).toString(), firstTime).call();\n+ ConnectionHook hook = (ConnectionHook) new ConnectionHook(entityplayermp.getPlayer(), ChatMessageComponent.b(\"multiplayer.player.joined\", new Object[]{ entityplayermp.ax() }).a(EnumChatFormatting.o).toString(), firstTime).call();\n if (!hook.isHidden()) {\n this.a((Packet) (new Packet3Chat(ChatMessageComponent.e(hook.getMessage()))));\n }\n@@ -107,7 +107,7 @@ public void a(INetworkManager inetworkmanager, EntityPlayerMP entityplayermp) {\n entityplayermp.a(this.e.S(), this.e.U());\n }\n \n- Iterator iterator = entityplayermp.aH().iterator();\n+ Iterator iterator = entityplayermp.aK().iterator();\n \n while (iterator.hasNext()) {\n PotionEffect potioneffect = (PotionEffect) iterator.next();\n@@ -411,9 +411,9 @@ public EntityPlayerMP a(EntityPlayerMP entityplayermp, int i0, boolean flag0, Lo\n entityplayermp.p().s().c(entityplayermp);\n this.a.remove(entityplayermp);\n this.e.getWorld(entityplayermp.getCanaryWorld().getName(), entityplayermp.ar).f(entityplayermp); // CanaryMod: added multiworld support\n- // ChunkCoordinates chunkcoordinates = entityplayermp.bA(); //CanaryMod removed in favor of a real location\n+ // ChunkCoordinates chunkcoordinates = entityplayermp.bE(); //CanaryMod removed in favor of a real location\n Location respawnLocation = entityplayermp.getRespawnLocation();\n- boolean flag1 = entityplayermp.bB();\n+ boolean flag1 = entityplayermp.bF();\n boolean isBedSpawn = respawnLocation != null;\n entityplayermp.ar = i0;\n Object object;\n@@ -486,7 +486,7 @@ public EntityPlayerMP a(EntityPlayerMP entityplayermp, int i0, boolean flag0, Lo\n worldserver.d(entityplayermp1);\n this.a.add(entityplayermp1);\n entityplayermp1.d();\n- entityplayermp1.g(entityplayermp1.aJ());\n+ entityplayermp1.g(entityplayermp1.aM());\n //\n return entityplayermp1;\n }\n@@ -518,7 +518,7 @@ public void a(EntityPlayerMP entityplayermp, String worldName, int i0) {\n entityplayermp.c.a(worldserver1);\n this.b(entityplayermp, worldserver1);\n this.f(entityplayermp);\n- Iterator iterator = entityplayermp.aH().iterator();\n+ Iterator iterator = entityplayermp.aK().iterator();\n \n while (iterator.hasNext()) {\n PotionEffect potioneffect = (PotionEffect) iterator.next();\n@@ -541,14 +541,14 @@ public void a(Entity entity, int i0, WorldServer worldserver, WorldServer worlds\n d0 /= d2;\n d1 /= d2;\n entity.b(d0, entity.v, d1, entity.A, entity.B);\n- if (entity.R()) {\n+ if (entity.S()) {\n worldserver.a(entity, false);\n }\n } else if (entity.ar == 0) {\n d0 *= d2;\n d1 *= d2;\n entity.b(d0, entity.v, d1, entity.A, entity.B);\n- if (entity.R()) {\n+ if (entity.S()) {\n worldserver.a(entity, false);\n }\n } else {\n@@ -564,7 +564,7 @@ public void a(Entity entity, int i0, WorldServer worldserver, WorldServer worlds\n entity.v = (double) chunkcoordinates.b;\n d1 = (double) chunkcoordinates.c;\n entity.b(d0, entity.v, d1, 90.0F, 0.0F);\n- if (entity.R()) {\n+ if (entity.S()) {\n worldserver.a(entity, false);\n }\n }\n@@ -574,7 +574,7 @@ public void a(Entity entity, int i0, WorldServer worldserver, WorldServer worlds\n worldserver.C.a(\"placing\");\n d0 = (double) MathHelper.a((int) d0, -29999872, 29999872);\n d1 = (double) MathHelper.a((int) d1, -29999872, 29999872);\n- if (entity.R()) {\n+ if (entity.S()) {\n worldserver1.d(entity);\n entity.b(d0, entity.v, d1, entity.A, entity.B);\n worldserver1.a(entity, false);\n@@ -729,10 +729,10 @@ public List a(ChunkCoordinates chunkcoordinates, int i0, int i1, int i2, int i3,\n for (int i8 = 0; i8 < this.a.size(); ++i8) {\n EntityPlayerMP entityplayermp = (EntityPlayerMP) this.a.get(i8);\n \n- if ((world == null || entityplayermp.q == world) && (s0 == null || flag1 != s0.equalsIgnoreCase(entityplayermp.al()))) {\n+ if ((world == null || entityplayermp.q == world) && (s0 == null || flag1 != s0.equalsIgnoreCase(entityplayermp.am()))) {\n if (s1 != null) {\n- ScorePlayerTeam scoreplayerteam = entityplayermp.bI();\n- String s2 = scoreplayerteam == null ? \"\" : scoreplayerteam.b();\n+ Team team = entityplayermp.bn();\n+ String s2 = team == null ? \"\" : team.b();\n \n if (flag2 == s1.equalsIgnoreCase(s2)) {\n continue;\n@@ -791,14 +791,14 @@ private boolean a(EntityPlayer entityplayer, Map map) {\n s0 = s0.substring(0, s0.length() - 4);\n }\n \n- Scoreboard scoreboard = entityplayer.bH();\n+ Scoreboard scoreboard = entityplayer.bL();\n ScoreObjective scoreobjective = scoreboard.b(s0);\n \n if (scoreobjective == null) {\n return false;\n }\n \n- Score score = entityplayer.bH().a(entityplayer.al(), scoreobjective);\n+ Score score = entityplayer.bL().a(entityplayer.am(), scoreobjective);\n \n i0 = score.c();\n if (i0 < ((Integer) entry.getValue()).intValue() && flag0) {\n@@ -930,10 +930,6 @@ private void a(EntityPlayerMP entityplayermp, EntityPlayerMP entityplayermp1, Wo\n entityplayermp.c.b(world.N().r());\n }\n \n- public void a(ChatMessageComponent chatmessagecomponent) {\n- this.a(chatmessagecomponent, true);\n- }\n-\n public void r() {\n // CanaryMod shutdown hook\n ServerShutdownHook hook = (ServerShutdownHook) new ServerShutdownHook(\"Server closed\").call();\n@@ -943,6 +939,10 @@ public void r() {\n }\n }\n \n+ public void a(ChatMessageComponent chatmessagecomponent) {\n+ this.a(chatmessagecomponent, true);\n+ }\n+\n public void a(ChatMessageComponent chatmessagecomponent, boolean flag0) {\n this.e.a(chatmessagecomponent);\n this.a((Packet) (new Packet3Chat(chatmessagecomponent, flag0)));","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerConfigurationManager.java","sha":"f7b98c1a7bc8d02023020ae4cfebb056b26a609f","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerListenThread.java","changes":7,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerListenThread.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":5,"filename":"src/main/java/net/minecraft/server/ServerListenThread.java","new_code":" netloginhandler.d();\n this.e.d().an().b(\"Failed to handle packet for \" + netloginhandler.f() + \": \" + exception, (Throwable) exception);","new_methods":[],"old_code":"\n\n\n netloginhandler.c();\n this.e.d().an().b(\"Failed to handle packet for \" + netloginhandler.e() + \": \" + exception, (Throwable) exception);","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n import java.io.IOException;\n import java.net.InetAddress;\n import java.net.ServerSocket;\n@@ -9,10 +8,8 @@\n import java.util.Collections;\n import java.util.HashMap;\n import java.util.List;\n-\n import net.canarymod.Canary;\n \n-\n public class ServerListenThread extends Thread {\n \n private final List a = Collections.synchronizedList(new ArrayList());\n@@ -40,10 +37,10 @@ public void a() {\n NetLoginHandler netloginhandler = (NetLoginHandler) this.a.get(i0);\n \n try {\n- netloginhandler.c();\n+ netloginhandler.d();\n } catch (Exception exception) {\n netloginhandler.a(\"Internal server error\");\n- this.e.d().an().b(\"Failed to handle packet for \" + netloginhandler.e() + \": \" + exception, (Throwable) exception);\n+ this.e.d().an().b(\"Failed to handle packet for \" + netloginhandler.f() + \": \" + exception, (Throwable) exception);\n }\n \n if (netloginhandler.b) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerListenThread.java","sha":"65dcde73e93e9b798fc5952af0ffc5f3c0001ad3","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdPieces.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdPieces.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/StructureStrongholdPieces.java","new_code":" private static final StructureStrongholdPieceWeight[] b = new StructureStrongholdPieceWeight[]{ new StructureStrongholdPieceWeight(ComponentStrongholdStraight.class, 40, 0), new StructureStrongholdPieceWeight(ComponentStrongholdPrison.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdLeftTurn.class, 20, 0),\n new StructureStrongholdPieceWeight(ComponentStrongholdRightTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRoomCrossing.class, 10, 6), new StructureStrongholdPieceWeight(ComponentStrongholdStairsStraight.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdStairs.class, 5, 5),\n new StructureStrongholdPieceWeight(ComponentStrongholdCrossing.class, 5, 4), new StructureStrongholdPieceWeight(ComponentStrongholdChestCorridor.class, 5, 4), new StructureStrongholdPieceWeight2(ComponentStrongholdLibrary.class, 10, 2), new StructureStrongholdPieceWeight3(ComponentStrongholdPortalRoom.class, 20, 1) };","new_methods":[],"old_code":"\n\n private static final StructureStrongholdPieceWeight[] b = new StructureStrongholdPieceWeight[]{ new StructureStrongholdPieceWeight(ComponentStrongholdStraight.class, 40, 0), new StructureStrongholdPieceWeight(ComponentStrongholdPrison.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdLeftTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRightTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRoomCrossing.class, 10, 6), new StructureStrongholdPieceWeight(ComponentStrongholdStairsStraight.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdStairs.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdCrossing.class, 5, 4), new StructureStrongholdPieceWeight(ComponentStrongholdChestCorridor.class, 5, 4), new StructureStrongholdPieceWeight2(ComponentStrongholdLibrary.class, 10, 2), new StructureStrongholdPieceWeight3(ComponentStrongholdPortalRoom.class, 20, 1) };","old_methods":[],"patch":"@@ -1,15 +1,15 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import java.util.Iterator;\n import java.util.List;\n import java.util.Random;\n \n-\n public class StructureStrongholdPieces {\n \n- private static final StructureStrongholdPieceWeight[] b = new StructureStrongholdPieceWeight[]{ new StructureStrongholdPieceWeight(ComponentStrongholdStraight.class, 40, 0), new StructureStrongholdPieceWeight(ComponentStrongholdPrison.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdLeftTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRightTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRoomCrossing.class, 10, 6), new StructureStrongholdPieceWeight(ComponentStrongholdStairsStraight.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdStairs.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdCrossing.class, 5, 4), new StructureStrongholdPieceWeight(ComponentStrongholdChestCorridor.class, 5, 4), new StructureStrongholdPieceWeight2(ComponentStrongholdLibrary.class, 10, 2), new StructureStrongholdPieceWeight3(ComponentStrongholdPortalRoom.class, 20, 1) };\n+ private static final StructureStrongholdPieceWeight[] b = new StructureStrongholdPieceWeight[]{ new StructureStrongholdPieceWeight(ComponentStrongholdStraight.class, 40, 0), new StructureStrongholdPieceWeight(ComponentStrongholdPrison.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdLeftTurn.class, 20, 0),\n+ new StructureStrongholdPieceWeight(ComponentStrongholdRightTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRoomCrossing.class, 10, 6), new StructureStrongholdPieceWeight(ComponentStrongholdStairsStraight.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdStairs.class, 5, 5),\n+ new StructureStrongholdPieceWeight(ComponentStrongholdCrossing.class, 5, 4), new StructureStrongholdPieceWeight(ComponentStrongholdChestCorridor.class, 5, 4), new StructureStrongholdPieceWeight2(ComponentStrongholdLibrary.class, 10, 2), new StructureStrongholdPieceWeight3(ComponentStrongholdPortalRoom.class, 20, 1) };\n private static List c;\n private static Class d;\n static int a = 0;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdPieces.java","sha":"9860ffe43c1e928a73e247949f51aa39b497c766","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdStones.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdStones.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/StructureStrongholdStones.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import java.util.Random;\n \n-\n class StructureStrongholdStones extends StructurePieceBlockSelector {\n \n private StructureStrongholdStones() {}","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdStones.java","sha":"7cbdb6999a72deca9c1a5ce24cee60ca85ecdce0","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntity.java","changes":5,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntity.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/TileEntity.java","new_code":"\n public World az() {","new_methods":[],"old_code":"\n\n public World ay() {","old_methods":[],"patch":"@@ -1,13 +1,11 @@\n package net.minecraft.server;\n \n-\n import java.util.HashMap;\n import java.util.Map;\n import java.util.concurrent.Callable;\n import net.canarymod.api.nbt.CanaryCompoundTag;\n import net.canarymod.api.world.blocks.ComplexBlock;\n \n-\n public class TileEntity {\n \n private static Map a = new HashMap();\n@@ -23,6 +21,7 @@ public class TileEntity {\n // CanaryMod: Variable Declaration\n public ComplexBlock complexBlock;\n private CanaryCompoundTag meta = new CanaryCompoundTag(\"Canary\"); // hold it for extra data\n+\n // CanaryMod: End\n \n public TileEntity() {}\n@@ -36,7 +35,7 @@ private static void a(Class oclass0, String s0) {\n }\n }\n \n- public World ay() {\n+ public World az() {\n return this.k;\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntity.java","sha":"44d815001c91f60a8146d824da2aea3b68429dd1","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBeacon.java","changes":8,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBeacon.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":5,"filename":"src/main/java/net/minecraft/server/TileEntityBeacon.java","new_code":" public static final Potion[][] a = new Potion[][]{ { Potion.c, Potion.e }, { Potion.m, Potion.j }, { Potion.g }, { Potion.l } };\n entityplayer.c(new PotionEffect(this.f, 180, b0, true));\n entityplayer.c(new PotionEffect(this.g, 180, 0, true));","new_methods":[],"old_code":"\n\n public static final Potion[][] a = new Potion[][] { { Potion.c, Potion.e}, { Potion.m, Potion.j}, { Potion.g}, { Potion.l}};\n entityplayer.d(new PotionEffect(this.f, 180, b0, true));\n entityplayer.d(new PotionEffect(this.g, 180, 0, true));","old_methods":[],"patch":"@@ -1,14 +1,12 @@\n package net.minecraft.server;\n \n-\n import java.util.Iterator;\n import java.util.List;\n import net.canarymod.api.world.blocks.CanaryBeacon;\n \n-\n public class TileEntityBeacon extends TileEntity implements IInventory {\n \n- public static final Potion[][] a = new Potion[][] { { Potion.c, Potion.e}, { Potion.m, Potion.j}, { Potion.g}, { Potion.l}};\n+ public static final Potion[][] a = new Potion[][]{ { Potion.c, Potion.e }, { Potion.m, Potion.j }, { Potion.g }, { Potion.l } };\n private boolean d;\n private int e = -1;\n private int f;\n@@ -46,15 +44,15 @@ private void u() {\n \n while (iterator.hasNext()) {\n entityplayer = (EntityPlayer) iterator.next();\n- entityplayer.d(new PotionEffect(this.f, 180, b0, true));\n+ entityplayer.c(new PotionEffect(this.f, 180, b0, true));\n }\n \n if (this.e >= 4 && this.f != this.g && this.g > 0) {\n iterator = list.iterator();\n \n while (iterator.hasNext()) {\n entityplayer = (EntityPlayer) iterator.next();\n- entityplayer.d(new PotionEffect(this.g, 180, 0, true));\n+ entityplayer.c(new PotionEffect(this.g, 180, 0, true));\n }\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBeacon.java","sha":"f1b102cf4f5f9878f735dcfb8692f2b499ee644b","status":"modified"},{"additions":2,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBrewingStand.java","changes":6,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBrewingStand.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":4,"filename":"src/main/java/net/minecraft/server/TileEntityBrewingStand.java","new_code":" private static final int[] a = new int[]{ 3 };\n private static final int[] b = new int[]{ 0, 1, 2 };","new_methods":[],"old_code":"\n\n private static final int[] a = new int[] { 3};\n private static final int[] b = new int[] { 0, 1, 2};","old_methods":[],"patch":"@@ -1,14 +1,12 @@\n package net.minecraft.server;\n \n-\n import java.util.List;\n import net.canarymod.api.world.blocks.CanaryBrewingStand;\n \n-\n public class TileEntityBrewingStand extends TileEntity implements ISidedInventory {\n \n- private static final int[] a = new int[] { 3};\n- private static final int[] b = new int[] { 0, 1, 2};\n+ private static final int[] a = new int[]{ 3 };\n+ private static final int[] b = new int[]{ 0, 1, 2 };\n public ItemStack[] c = new ItemStack[4]; // CanaryMod: private => public\n private int d;\n private int e;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBrewingStand.java","sha":"324e198ec68c11176db85014e9e4abe3079152ec","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityChest.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityChest.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/TileEntityChest.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,11 +1,9 @@\n package net.minecraft.server;\n \n-\n import java.util.Iterator;\n import java.util.List;\n import net.canarymod.api.world.blocks.CanaryChest;\n \n-\n public class TileEntityChest extends TileEntity implements IInventory {\n \n public ItemStack[] i = new ItemStack[36]; // CanaryMod: private => public","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityChest.java","sha":"17c91226e9be44275dfb77ec1061e5bce2b8b923","status":"modified"},{"additions":1,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityCommandBlock.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityCommandBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/TileEntityCommandBlock.java","new_code":" return this.az();","new_methods":[],"old_code":" return this.ay();","old_methods":[],"patch":"@@ -74,7 +74,7 @@ public ChunkCoordinates b() {\n }\n \n public World f_() {\n- return this.ay();\n+ return this.az();\n }\n \n public Packet m() {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityCommandBlock.java","sha":"de83634386b8b4f8b9c52cd3387456de6f2c2e74","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityComparator.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityComparator.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/TileEntityComparator.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanaryComparator;\n \n-\n public class TileEntityComparator extends TileEntity {\n \n private int a = 0;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityComparator.java","sha":"a7ee0583b9746aae8fbc18a4e5631fba0ab46c44","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDaylightDetector.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDaylightDetector.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/TileEntityDaylightDetector.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanaryDaylightDetector;\n \n-\n public class TileEntityDaylightDetector extends TileEntity {\n \n public TileEntityDaylightDetector() {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDaylightDetector.java","sha":"e5ec583b91e9c44c9a270b49ba98aeffbf659dab","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDispenser.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDispenser.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/TileEntityDispenser.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,10 +1,8 @@\n package net.minecraft.server;\n \n-\n import java.util.Random;\n import net.canarymod.api.world.blocks.CanaryDispenser;\n \n-\n public class TileEntityDispenser extends TileEntity implements IInventory {\n \n public ItemStack[] b = new ItemStack[9]; // CanaryMod: private => public","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDispenser.java","sha":"8c9bc7a691c835536113bd97343f6624c4078565","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDropper.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDropper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/TileEntityDropper.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanaryDropper;\n \n-\n public class TileEntityDropper extends TileEntityDispenser {\n \n public TileEntityDropper() {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDropper.java","sha":"5b51ee58c72cb1162b136a81c55b26085030aeef","status":"modified"},{"additions":6,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityHopper.java","changes":12,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityHopper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":6,"filename":"src/main/java/net/minecraft/server/TileEntityHopper.java","new_code":" EntityItem entityitem = a(hopper.az(), hopper.aA(), hopper.aB() + 1.0D, hopper.aC());\n return b(this.az(), (double) (this.l + Facing.b[i0]), (double) (this.m + Facing.c[i0]), (double) (this.n + Facing.d[i0]));\n return b(hopper.az(), hopper.aA(), hopper.aB() + 1.0D, hopper.aC());\n public double aA() {\n public double aB() {\n public double aC() {","new_methods":[],"old_code":" EntityItem entityitem = a(hopper.ay(), hopper.az(), hopper.aA() + 1.0D, hopper.aB());\n return b(this.ay(), (double) (this.l + Facing.b[i0]), (double) (this.m + Facing.c[i0]), (double) (this.n + Facing.d[i0]));\n return b(hopper.ay(), hopper.az(), hopper.aA() + 1.0D, hopper.aB());\n public double az() {\n public double aA() {\n public double aB() {","old_methods":[],"patch":"@@ -219,7 +219,7 @@ public static boolean a(Hopper hopper) {\n }\n }\n } else {\n- EntityItem entityitem = a(hopper.ay(), hopper.az(), hopper.aA() + 1.0D, hopper.aB());\n+ EntityItem entityitem = a(hopper.az(), hopper.aA(), hopper.aB() + 1.0D, hopper.aC());\n \n if (entityitem != null) {\n return a((IInventory) hopper, entityitem);\n@@ -346,11 +346,11 @@ private static ItemStack c(IInventory iinventory, ItemStack itemstack, int i0, i\n private IInventory v() {\n int i0 = BlockHopper.c(this.p());\n \n- return b(this.ay(), (double) (this.l + Facing.b[i0]), (double) (this.m + Facing.c[i0]), (double) (this.n + Facing.d[i0]));\n+ return b(this.az(), (double) (this.l + Facing.b[i0]), (double) (this.m + Facing.c[i0]), (double) (this.n + Facing.d[i0]));\n }\n \n public static IInventory b(Hopper hopper) {\n- return b(hopper.ay(), hopper.az(), hopper.aA() + 1.0D, hopper.aB());\n+ return b(hopper.az(), hopper.aA(), hopper.aB() + 1.0D, hopper.aC());\n }\n \n public static EntityItem a(World world, double d0, double d1, double d2) {\n@@ -393,15 +393,15 @@ private static boolean a(ItemStack itemstack, ItemStack itemstack1) {\n return itemstack.d != itemstack1.d ? false : (itemstack.k() != itemstack1.k() ? false : (itemstack.b > itemstack.e() ? false : ItemStack.a(itemstack, itemstack1)));\n }\n \n- public double az() {\n+ public double aA() {\n return (double) this.l;\n }\n \n- public double aA() {\n+ public double aB() {\n return (double) this.m;\n }\n \n- public double aB() {\n+ public double aC() {\n return (double) this.n;\n }\n ","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityHopper.java","sha":"eabdce1b3a547f1682a3230e16235d5c65a9a0fd","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityMobSpawner.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityMobSpawner.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/TileEntityMobSpawner.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanaryMobSpawner;\n \n-\n public class TileEntityMobSpawner extends TileEntity {\n \n private final MobSpawnerBaseLogic a = new TileEntityMobSpawnerLogic(this);","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityMobSpawner.java","sha":"e914ddf7e6a3a3b708b4cd985952f7dcac15ec33","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityNote.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityNote.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/TileEntityNote.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanaryNoteBlock;\n \n-\n public class TileEntityNote extends TileEntity {\n \n public byte a = 0;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityNote.java","sha":"235f09619b5db538a35ede5dff6e33c83562a23a","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityRecordPlayer.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityRecordPlayer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/TileEntityRecordPlayer.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanaryJukebox;\n \n-\n public class TileEntityRecordPlayer extends TileEntity {\n \n private ItemStack a;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityRecordPlayer.java","sha":"b33d89ec241a5efbdeeaa27bf5532c4b645bdeb2","status":"modified"},{"additions":10,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySign.java","changes":13,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySign.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":3,"filename":"src/main/java/net/minecraft/server/TileEntitySign.java","new_code":" public String[] a = new String[]{ \"\", \"\", \"\", \"\" };\n private EntityPlayer d;\n public void a(EntityPlayer entityplayer) {\n this.d = entityplayer;\n }\n\n public EntityPlayer b() {\n return this.d;\n }\n","new_methods":[{"arguments":["EntityPlayer entityplayer"],"filename":"src/main/java/net/minecraft/server/TileEntitySign.java","implementation":"this.d = entityplayer;","signature":"void a(EntityPlayer entityplayer)"},{"arguments":[],"filename":"src/main/java/net/minecraft/server/TileEntitySign.java","implementation":"return this.d;","signature":"EntityPlayer b()"}],"old_code":"\n\n public String[] a = new String[] { \"\", \"\", \"\", \"\"};","old_methods":[],"patch":"@@ -1,14 +1,13 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanarySign;\n \n-\n public class TileEntitySign extends TileEntity {\n \n- public String[] a = new String[] { \"\", \"\", \"\", \"\"};\n+ public String[] a = new String[]{ \"\", \"\", \"\", \"\" };\n public int b = -1;\n private boolean c = true;\n+ private EntityPlayer d;\n \n public TileEntitySign() {\n this.complexBlock = new CanarySign(this); // CanaryMod: wrap sign\n@@ -45,6 +44,14 @@ public boolean a() {\n return this.c;\n }\n \n+ public void a(EntityPlayer entityplayer) {\n+ this.d = entityplayer;\n+ }\n+\n+ public EntityPlayer b() {\n+ return this.d;\n+ }\n+\n // CanaryMod\n public CanarySign getCanarySign() {\n return (CanarySign) complexBlock;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySign.java","sha":"9daa8eb3cdc6417195fe1d1af1005d26dcbb36b5","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySkull.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySkull.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/TileEntitySkull.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import net.canarymod.api.world.blocks.CanarySkull;\n \n-\n public class TileEntitySkull extends TileEntity {\n \n private int a;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySkull.java","sha":"269500b10d09c49ad033ff3d188c101d2169191c","status":"modified"},{"additions":3,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FVillage.java","changes":7,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FVillage.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":4,"filename":"src/main/java/net/minecraft/server/Village.java","new_code":" }\n while (villagedoorinfo.a != i0 || villagedoorinfo.c != i2 || Math.abs(villagedoorinfo.b - i1) > 1);\n if (!villageagressor.a.S() || Math.abs(this.g - villageagressor.b) > 300) {","new_methods":[],"old_code":"\n\n } while (villagedoorinfo.a != i0 || villagedoorinfo.c != i2 || Math.abs(villagedoorinfo.b - i1) > 1);\n if (!villageagressor.a.R() || Math.abs(this.g - villageagressor.b) > 300) {","old_methods":[],"patch":"@@ -1,13 +1,11 @@\n package net.minecraft.server;\n \n-\n import java.util.ArrayList;\n import java.util.Iterator;\n import java.util.List;\n import java.util.TreeMap;\n import net.canarymod.api.world.CanaryVillage;\n \n-\n public class Village {\n \n private World a;\n@@ -202,7 +200,8 @@ public VillageDoorInfo e(int i0, int i1, int i2) {\n }\n \n villagedoorinfo = (VillageDoorInfo) iterator.next();\n- } while (villagedoorinfo.a != i0 || villagedoorinfo.c != i2 || Math.abs(villagedoorinfo.b - i1) > 1);\n+ }\n+ while (villagedoorinfo.a != i0 || villagedoorinfo.c != i2 || Math.abs(villagedoorinfo.b - i1) > 1);\n \n return villagedoorinfo;\n }\n@@ -287,7 +286,7 @@ private void l() {\n while (iterator.hasNext()) {\n VillageAgressor villageagressor = (VillageAgressor) iterator.next();\n \n- if (!villageagressor.a.R() || Math.abs(this.g - villageagressor.b) > 300) {\n+ if (!villageagressor.a.S() || Math.abs(this.g - villageagressor.b) > 300) {\n iterator.remove();\n }\n }","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FVillage.java","sha":"a99feb182034bfecf5a62aec254c69fe4ce7264e","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWatchableObject.java","changes":1,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWatchableObject.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/WatchableObject.java","new_code":"","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class WatchableObject {\n \n private final int a;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWatchableObject.java","sha":"463fdb6cf23eb9eec86e09e431533d5cf25d7644","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWeightedRandomChestContent.java","changes":2,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWeightedRandomChestContent.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":2,"filename":"src/main/java/net/minecraft/server/WeightedRandomChestContent.java","new_code":"","new_methods":[],"old_code":"\n","old_methods":[],"patch":"@@ -1,9 +1,7 @@\n package net.minecraft.server;\n \n-\n import java.util.Random;\n \n-\n public class WeightedRandomChestContent extends WeightedRandomItem {\n \n private ItemStack b = null;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWeightedRandomChestContent.java","sha":"20bd5111fc24c2fc24ff24afcc984b1b8c70e213","status":"modified"},{"additions":8,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorld.java","changes":16,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorld.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":8,"filename":"src/main/java/net/minecraft/server/World.java","new_code":" ++entity.ac;\n entity.U();\n if (vec3.b() > 0.0D && entity.aw()) {\n if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).bE()) && oclass0.isAssignableFrom(entity.getClass())) {\n if (!entityplayer1.bG.a && entityplayer1.S()) {\n if (entityplayer1.ag()) {\n if (entityplayer1.ai()) {\n float f0 = entityplayer1.bw();","new_methods":[],"old_code":" entity.T();\n ++entity.ac;\n if (vec3.b() > 0.0D && entity.av()) {\n if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).bA()) && oclass0.isAssignableFrom(entity.getClass())) {\n if (!entityplayer1.bG.a && entityplayer1.R()) {\n if (entityplayer1.af()) {\n if (entityplayer1.ah()) {\n float f0 = entityplayer1.bs();","old_methods":[],"patch":"@@ -1269,10 +1269,10 @@ public void a(Entity entity, boolean flag0) {\n entity.C = entity.A;\n entity.D = entity.B;\n if (flag0 && entity.ai) {\n+ ++entity.ac;\n if (entity.o != null) {\n- entity.T();\n+ entity.U();\n } else {\n- ++entity.ac;\n entity.l_();\n }\n }\n@@ -1471,7 +1471,7 @@ public boolean a(AxisAlignedBB axisalignedbb, Material material, Entity entity)\n }\n }\n \n- if (vec3.b() > 0.0D && entity.av()) {\n+ if (vec3.b() > 0.0D && entity.aw()) {\n vec3 = vec3.a();\n double d1 = 0.014D;\n \n@@ -2245,7 +2245,7 @@ public int a(Class oclass0) {\n for (int i1 = 0; i1 < this.e.size(); ++i1) {\n Entity entity = (Entity) this.e.get(i1);\n \n- if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).bA()) && oclass0.isAssignableFrom(entity.getClass())) {\n+ if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).bE()) && oclass0.isAssignableFrom(entity.getClass())) {\n ++i0;\n }\n }\n@@ -2430,16 +2430,16 @@ public EntityPlayer b(double d0, double d1, double d2, double d3) {\n for (int i0 = 0; i0 < this.h.size(); ++i0) {\n EntityPlayer entityplayer1 = (EntityPlayer) this.h.get(i0);\n \n- if (!entityplayer1.bG.a && entityplayer1.R()) {\n+ if (!entityplayer1.bG.a && entityplayer1.S()) {\n double d5 = entityplayer1.e(d0, d1, d2);\n double d6 = d3;\n \n- if (entityplayer1.af()) {\n+ if (entityplayer1.ag()) {\n d6 = d3 * 0.800000011920929D;\n }\n \n- if (entityplayer1.ah()) {\n- float f0 = entityplayer1.bs();\n+ if (entityplayer1.ai()) {\n+ float f0 = entityplayer1.bw();\n \n if (f0 < 0.1F) {\n f0 = 0.1F;","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorld.java","sha":"fb823ba886343fcfab7bade80dee395b25ad4275","status":"modified"},{"additions":9,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServer.java","changes":27,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":18,"filename":"src/main/java/net/minecraft/server/WorldServer.java","new_code":" if (!entityplayer.bg()) {\n if (entityplayer.bg()) {\n while (entityplayer.bC());\n if (!this.a.Y() && entity instanceof INpc) {\n entity.w();\n\n super.a(entity, flag0);\n Entity[] aentity = entity.an();\n Entity[] aentity = entity.an();","new_methods":[],"old_code":" if (!entityplayer.bd()) {\n if (entityplayer.bd()) {\n while (entityplayer.by());\n if (!(entity.n instanceof EntityPlayer)) {\n super.a(entity, flag0);\n }\n }\n\n public void b(Entity entity, boolean flag0) {\n try {\n super.a(entity, flag0);\n } catch (Throwable throwable) {\n CrashReport crashreport = CrashReport.a(throwable, \"Forcefully ticking entity\");\n CrashReportCategory crashreportcategory = crashreport.a(\"Entity being force ticked\");\n entity.a(crashreportcategory);\n throw new ReportedException(crashreport);\n Entity[] aentity = entity.am();\n Entity[] aentity = entity.am();","old_methods":[{"arguments":["Entity entity"," boolean flag0"],"filename":"src/main/java/net/minecraft/server/WorldServer.java","implementation":"try {\n super.a(entity, flag0);","signature":"void b(Entity entity, boolean flag0)"}],"patch":"@@ -140,7 +140,7 @@ public void c() {\n while (iterator.hasNext()) {\n EntityPlayer entityplayer = (EntityPlayer) iterator.next();\n \n- if (!entityplayer.bd()) {\n+ if (!entityplayer.bg()) {\n this.N = false;\n break;\n }\n@@ -154,7 +154,7 @@ protected void d() {\n while (iterator.hasNext()) {\n EntityPlayer entityplayer = (EntityPlayer) iterator.next();\n \n- if (entityplayer.bd()) {\n+ if (entityplayer.bg()) {\n entityplayer.a(false, false, true);\n }\n }\n@@ -190,7 +190,7 @@ public boolean e() {\n \n entityplayer = (EntityPlayer) iterator.next();\n }\n- while (entityplayer.by());\n+ while (entityplayer.bC());\n \n return false;\n } else {\n@@ -480,21 +480,12 @@ public void a(Entity entity, boolean flag0) {\n if (!canSpawn(entity)) {\n entity.w();\n }\n- if (!(entity.n instanceof EntityPlayer)) {\n- super.a(entity, flag0);\n- }\n- }\n-\n- public void b(Entity entity, boolean flag0) {\n- try {\n- super.a(entity, flag0);\n- } catch (Throwable throwable) {\n- CrashReport crashreport = CrashReport.a(throwable, \"Forcefully ticking entity\");\n- CrashReportCategory crashreportcategory = crashreport.a(\"Entity being force ticked\");\n \n- entity.a(crashreportcategory);\n- throw new ReportedException(crashreport);\n+ if (!this.a.Y() && entity instanceof INpc) {\n+ entity.w();\n }\n+\n+ super.a(entity, flag0);\n }\n \n protected IChunkProvider j() {\n@@ -627,7 +618,7 @@ protected void a() throws MinecraftException {\n protected void a(Entity entity) {\n super.a(entity);\n this.V.a(entity.k, entity);\n- Entity[] aentity = entity.am();\n+ Entity[] aentity = entity.an();\n \n if (aentity != null) {\n for (int i0 = 0; i0 < aentity.length; ++i0) {\n@@ -639,7 +630,7 @@ protected void a(Entity entity) {\n protected void b(Entity entity) {\n super.b(entity);\n this.V.d(entity.k);\n- Entity[] aentity = entity.am();\n+ Entity[] aentity = entity.an();\n \n if (aentity != null) {\n for (int i0 = 0; i0 < aentity.length; ++i0) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServer.java","sha":"0c72905083bf42806cc1dbf15cc7816eb30d2305","status":"modified"},{"additions":0,"blob_url":"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServerMulti.java","changes":1,"contents_url":"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServerMulti.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5","deletions":1,"filename":"src/main/java/net/minecraft/server/WorldServerMulti.java","new_code":"","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -1,6 +1,5 @@\n package net.minecraft.server;\n \n-\n public class WorldServerMulti extends WorldServer {\n \n public WorldServerMulti(MinecraftServer minecraftserver, ISaveHandler isavehandler, String s0, int i0, WorldSettings worldsettings, WorldServer worldserver, Profiler profiler, ILogAgent ilogagent) {","raw_url":"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServerMulti.java","sha":"80262d21709a43c9bd2e44d037aeca4901f7302e","status":"modified"}],"string":"[\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/pom.xml\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/pom.xml?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"pom.xml\",\n \"new_code\": \" 1.6.2\\n ${minecraft.server.version}\",\n \"new_methods\": [],\n \"old_code\": \" 1.6.1\\n ${minecraft.server.version}_1\",\n \"old_methods\": [],\n \"patch\": \"@@ -14,7 +14,7 @@\\n 2012\\n \\n UTF-8\\n- 1.6.1\\n+ 1.6.2\\n 0.9\\n \\n \\n@@ -75,7 +75,7 @@\\n \\n net.minecraft\\n server\\n- ${minecraft.server.version}_1\\n+ ${minecraft.server.version}\\n \\n \\n junit\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/pom.xml\",\n \"sha\": \"9e4e17aa873ee96c5ab2c4a3d19a8af145fda798\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2FCanaryEntity.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2FCanaryEntity.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/canarymod/api/entity/CanaryEntity.java\",\n \"new_code\": \" return entity.am();\\n return entity.av();\\n return ((net.minecraft.server.EntityLiving) entity).bs();\",\n \"new_methods\": [],\n \"old_code\": \" return entity.al();\\n return entity.au();\\n return ((net.minecraft.server.EntityLiving) entity).bo();\",\n \"old_methods\": [],\n \"patch\": \"@@ -259,7 +259,7 @@ public void setInvisible(boolean invisible) {\\n \\n @Override\\n public String getName() {\\n- return entity.al();\\n+ return entity.am();\\n }\\n \\n @Override\\n@@ -279,7 +279,7 @@ public int getID() {\\n \\n @Override\\n public UUID getUUID() {\\n- return entity.au();\\n+ return entity.av();\\n }\\n \\n @Override\\n@@ -302,7 +302,7 @@ public void translate(Vector3D factor) {\\n @Override\\n public boolean canSpawn() {\\n if (this.isLiving()) {\\n- return ((net.minecraft.server.EntityLiving) entity).bo();\\n+ return ((net.minecraft.server.EntityLiving) entity).bs();\\n }\\n return true;\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2FCanaryEntity.java\",\n \"sha\": \"961d85d064afbbf58e8acab4c51542d6c4695676\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 6,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryEntityLiving.java\",\n \"changes\": 12,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryEntityLiving.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 6,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/CanaryEntityLiving.java\",\n \"new_code\": \" return getHandle().aY().getCanaryItem();\\n return CanaryItem.stackArrayToItemArray(getHandle().ad());\\n return getHandle().bD();\\n return getHandle().bE();\\n return getHandle().bB();\\n return getHandle().bA();\",\n \"new_methods\": [],\n \"old_code\": \" return getHandle().aV().getCanaryItem();\\n return CanaryItem.stackArrayToItemArray(getHandle().ac());\\n return getHandle().bz();\\n return getHandle().bA();\\n return getHandle().bx();\\n return getHandle().bw();\",\n \"old_methods\": [],\n \"patch\": \"@@ -92,15 +92,15 @@ public void setAttackTarget(LivingBase livingbase) {\\n */\\n @Override\\n public Item getItemInHand() {\\n- return getHandle().aV().getCanaryItem();\\n+ return getHandle().aY().getCanaryItem();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public Item[] getEquipment() {\\n- return CanaryItem.stackArrayToItemArray(getHandle().ac());\\n+ return CanaryItem.stackArrayToItemArray(getHandle().ad());\\n }\\n \\n /**\\n@@ -166,7 +166,7 @@ public void setDropChance(int slot, float chance) {\\n */\\n @Override\\n public boolean canPickUpLoot() {\\n- return getHandle().bz();\\n+ return getHandle().bD();\\n }\\n \\n /**\\n@@ -182,7 +182,7 @@ public void setCanPickUpLoot(boolean loot) {\\n */\\n @Override\\n public boolean isPersistenceRequired() {\\n- return getHandle().bA();\\n+ return getHandle().bE();\\n }\\n \\n /**\\n@@ -206,15 +206,15 @@ public AIManager getAITaskManager() {\\n */\\n @Override\\n public boolean hasDisplayName() {\\n- return getHandle().bx();\\n+ return getHandle().bB();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public String getDisplayName() {\\n- return getHandle().bw();\\n+ return getHandle().bA();\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryEntityLiving.java\",\n \"sha\": \"8cec8599022a99ea59050d801b34f992b56d63a0\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 5,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryIronGolem.java\",\n \"changes\": 10,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryIronGolem.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 5,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/CanaryIronGolem.java\",\n \"new_code\": \" return getHandle().bT().getCanaryVillage();\\n return getHandle().bW();\\n getHandle().i(created);\\n return getHandle().bV() > 0;\\n return getHandle().bV();\",\n \"new_methods\": [],\n \"old_code\": \" return getHandle().bP().getCanaryVillage();\\n return getHandle().bS();\\n getHandle().j(created);\\n return getHandle().bR() > 0;\\n return getHandle().bR();\",\n \"old_methods\": [],\n \"patch\": \"@@ -40,7 +40,7 @@ public String getFqName() {\\n */\\n @Override\\n public Village getVillage() {\\n- return getHandle().bP().getCanaryVillage();\\n+ return getHandle().bT().getCanaryVillage();\\n }\\n \\n /**\\n@@ -56,23 +56,23 @@ public void setVillage(Village village) {\\n */\\n @Override\\n public boolean isPlayerCreated() {\\n- return getHandle().bS();\\n+ return getHandle().bW();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setPlayerCreated(boolean created) {\\n- getHandle().j(created);\\n+ getHandle().i(created);\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public boolean isHoldingRose() {\\n- return getHandle().bR() > 0;\\n+ return getHandle().bV() > 0;\\n }\\n \\n /**\\n@@ -88,7 +88,7 @@ public void setHoldingRose(boolean holding) {\\n */\\n @Override\\n public int getHoldRoseTicks() {\\n- return getHandle().bR();\\n+ return getHandle().bV();\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryIronGolem.java\",\n \"sha\": \"af206393a2afb24cc28853dcfd7c1acdaae1e894\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 4,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryLivingBase.java\",\n \"changes\": 8,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryLivingBase.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 4,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/CanaryLivingBase.java\",\n \"new_code\": \" return getHandle().aM();\\n Collection effect_collection = ((net.minecraft.server.EntityLivingBase) entity).aK();\\n net.minecraft.server.EntityLivingBase target = getHandle().aD();\\n return getHandle().aT();\",\n \"new_methods\": [],\n \"old_code\": \" return getHandle().aJ();\\n Collection effect_collection = ((net.minecraft.server.EntityLivingBase) entity).aH();\\n net.minecraft.server.EntityLivingBase target = getHandle().aC();\\n return getHandle().aQ();\",\n \"old_methods\": [],\n \"patch\": \"@@ -32,7 +32,7 @@ public CanaryLivingBase(EntityLivingBase entity) {\\n */\\n @Override\\n public float getHealth() {\\n- return getHandle().aJ();\\n+ return getHandle().aM();\\n }\\n \\n /**\\n@@ -182,7 +182,7 @@ public PotionEffect getActivePotionEffect(Potion potion) {\\n @SuppressWarnings(\\\"unchecked\\\")\\n @Override\\n public List getAllActivePotionEffects() {\\n- Collection effect_collection = ((net.minecraft.server.EntityLivingBase) entity).aH();\\n+ Collection effect_collection = ((net.minecraft.server.EntityLivingBase) entity).aK();\\n List list = new ArrayList();\\n \\n for (net.minecraft.server.PotionEffect nms_effect : effect_collection) {\\n@@ -196,7 +196,7 @@ public List getAllActivePotionEffects() {\\n */\\n @Override\\n public LivingBase getRevengeTarget() {\\n- net.minecraft.server.EntityLivingBase target = getHandle().aC();\\n+ net.minecraft.server.EntityLivingBase target = getHandle().aD();\\n if (target != null) {\\n return (LivingBase) target.getCanaryEntity();\\n }\\n@@ -298,7 +298,7 @@ public void lookAt(Entity entity) {\\n */\\n @Override\\n public int getArrowCountInEntity() {\\n- return getHandle().aQ();\\n+ return getHandle().aT();\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2FCanaryLivingBase.java\",\n \"sha\": \"c16c0da2439db7e63042edf40c8daa38abce41f1\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryBat.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryBat.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/animal/CanaryBat.java\",\n \"new_code\": \" return getHandle().bG();\",\n \"new_methods\": [],\n \"old_code\": \" return getHandle().bF();\",\n \"old_methods\": [],\n \"patch\": \"@@ -38,7 +38,7 @@ public String getFqName() {\\n */\\n @Override\\n public boolean isHanging() {\\n- return getHandle().bF();\\n+ return getHandle().bG();\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryBat.java\",\n \"sha\": \"47bb1aee2b860ddc751238cae3b89bc427bdf6bb\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 12,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryHorse.java\",\n \"changes\": 24,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryHorse.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 12,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/animal/CanaryHorse.java\",\n \"new_code\": \" return getHandle().cg();\\n return getHandle().ci();\\n getHandle().k(bred);\\n return getHandle().ce();\\n getHandle().l(chested);\\n return getHandle().cj();\\n getHandle().m(reproduced);\\n return getHandle().bT();\\n return getHandle().bU();\\n return getHandle().ck();\\n return getHandle().bW();\\n getHandle().i(tame);\",\n \"new_methods\": [],\n \"old_code\": \" return getHandle().cc();\\n return getHandle().ce();\\n getHandle().l(bred);\\n return getHandle().ca();\\n getHandle().m(chested);\\n return getHandle().cf();\\n getHandle().n(reproduced);\\n return getHandle().bP();\\n return getHandle().bQ();\\n return getHandle().cg();\\n return getHandle().bS();\\n getHandle().j(tame);\",\n \"old_methods\": [],\n \"patch\": \"@@ -47,55 +47,55 @@ public String getFqName() {\\n */\\n @Override\\n public boolean isEatingHay() {\\n- return getHandle().cc();\\n+ return getHandle().cg();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public boolean isBred() {\\n- return getHandle().ce();\\n+ return getHandle().ci();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setIsBred(boolean bred) {\\n- getHandle().l(bred);\\n+ getHandle().k(bred);\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public boolean isChested() {\\n- return getHandle().ca();\\n+ return getHandle().ce();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setIsChested(boolean chested) {\\n- getHandle().m(chested);\\n+ getHandle().l(chested);\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public boolean hasReproduced() {\\n- return getHandle().cf();\\n+ return getHandle().cj();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setHasReproduced(boolean reproduced) {\\n- getHandle().n(reproduced);\\n+ getHandle().m(reproduced);\\n }\\n \\n /**\\n@@ -111,7 +111,7 @@ public HorseType getType() {\\n */\\n @Override\\n public int getRawType() {\\n- return getHandle().bP();\\n+ return getHandle().bT();\\n }\\n \\n /**\\n@@ -135,7 +135,7 @@ public void setType(int type) {\\n */\\n @Override\\n public int getVariant() {\\n- return getHandle().bQ();\\n+ return getHandle().bU();\\n }\\n \\n /**\\n@@ -151,7 +151,7 @@ public void setVariant(int variant) {\\n */\\n @Override\\n public int getTemper() {\\n- return getHandle().cg();\\n+ return getHandle().ck();\\n }\\n \\n /**\\n@@ -167,15 +167,15 @@ public void setTemper(int temper) {\\n */\\n @Override\\n public boolean isTame() {\\n- return getHandle().bS();\\n+ return getHandle().bW();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setTame(boolean tame) {\\n- getHandle().j(tame);\\n+ getHandle().i(tame);\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryHorse.java\",\n \"sha\": \"6cdb2b79f6d32e35f6181f6d269d0fa6fad4b561\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryOcelot.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryOcelot.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/animal/CanaryOcelot.java\",\n \"new_code\": \" return SkinType.values()[getHandle().ca()];\",\n \"new_methods\": [],\n \"old_code\": \" return SkinType.values()[getHandle().bW()];\",\n \"old_methods\": [],\n \"patch\": \"@@ -38,7 +38,7 @@ public String getFqName() {\\n */\\n @Override\\n public SkinType getSkinType() {\\n- return SkinType.values()[getHandle().bW()];\\n+ return SkinType.values()[getHandle().ca()];\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryOcelot.java\",\n \"sha\": \"2a1a82fd408aa307c835c407a3da83fecb33ab28\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryPig.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryPig.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/animal/CanaryPig.java\",\n \"new_code\": \" return ((EntityPig) entity).bT();\\n ((EntityPig) entity).i(saddled);\",\n \"new_methods\": [],\n \"old_code\": \" return ((EntityPig) entity).bP();\\n ((EntityPig) entity).j(saddled);\",\n \"old_methods\": [],\n \"patch\": \"@@ -38,15 +38,15 @@ public String getFqName() {\\n */\\n @Override\\n public boolean isSaddled() {\\n- return ((EntityPig) entity).bP();\\n+ return ((EntityPig) entity).bT();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setSaddled(boolean saddled) {\\n- ((EntityPig) entity).j(saddled);\\n+ ((EntityPig) entity).i(saddled);\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryPig.java\",\n \"sha\": \"fb939b7946db09dc212b153ea9f4450a0b36ffb3\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanarySheep.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanarySheep.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/animal/CanarySheep.java\",\n \"new_code\": \" return DyeColor.values()[getHandle().bT()];\\n return getHandle().bU();\\n getHandle().i(sheared);\",\n \"new_methods\": [],\n \"old_code\": \" return DyeColor.values()[getHandle().bP()];\\n return getHandle().bQ();\\n getHandle().j(sheared);\",\n \"old_methods\": [],\n \"patch\": \"@@ -47,7 +47,7 @@ public void eatGrass() {\\n */\\n @Override\\n public DyeColor getColor() {\\n- return DyeColor.values()[getHandle().bP()];\\n+ return DyeColor.values()[getHandle().bT()];\\n }\\n \\n /**\\n@@ -63,15 +63,15 @@ public void setColor(DyeColor color) {\\n */\\n @Override\\n public boolean isSheared() {\\n- return getHandle().bQ();\\n+ return getHandle().bU();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setSheared(boolean sheared) {\\n- getHandle().j(sheared);\\n+ getHandle().i(sheared);\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanarySheep.java\",\n \"sha\": \"5b098e19e867b6c2ad9e854784c80982dab29b68\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 6,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryTameable.java\",\n \"changes\": 12,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryTameable.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 6,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/animal/CanaryTameable.java\",\n \"new_code\": \" return (LivingBase) getHandle().bV().getCanaryEntity();\\n getHandle().b(name);\\n return getHandle().bT();\\n getHandle().j(tamed);\\n return getHandle().bU();\\n ((EntityTameable) entity).k(sitting);\",\n \"new_methods\": [],\n \"old_code\": \" return (LivingBase) getHandle().bR().getCanaryEntity();\\n ((EntityTameable) entity).b(name);\\n return ((EntityTameable) entity).bP();\\n ((EntityTameable) entity).k(tamed);\\n return ((EntityTameable) entity).bQ();\\n ((EntityTameable) entity).l(sitting);\",\n \"old_methods\": [],\n \"patch\": \"@@ -25,7 +25,7 @@ public CanaryTameable(EntityTameable entity) {\\n */\\n @Override\\n public LivingBase getOwner() {\\n- return (LivingBase) getHandle().bR().getCanaryEntity();\\n+ return (LivingBase) getHandle().bV().getCanaryEntity();\\n }\\n \\n /**\\n@@ -49,39 +49,39 @@ public void setOwner(LivingBase entity) {\\n */\\n @Override\\n public void setOwner(String name) {\\n- ((EntityTameable) entity).b(name);\\n+ getHandle().b(name);\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public boolean isTamed() {\\n- return ((EntityTameable) entity).bP();\\n+ return getHandle().bT();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setTamed(boolean tamed) {\\n- ((EntityTameable) entity).k(tamed);\\n+ getHandle().j(tamed);\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public boolean isSitting() {\\n- return ((EntityTameable) entity).bQ();\\n+ return getHandle().bU();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setSitting(boolean sitting) {\\n- ((EntityTameable) entity).l(sitting);\\n+ ((EntityTameable) entity).k(sitting);\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryTameable.java\",\n \"sha\": \"b6df508cfa9cf3db9d161a6c458fd225afa5189c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryWolf.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryWolf.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/animal/CanaryWolf.java\",\n \"new_code\": \" return DyeColor.values()[getHandle().cd()];\",\n \"new_methods\": [],\n \"old_code\": \" return DyeColor.values()[getHandle().bZ()];\",\n \"old_methods\": [],\n \"patch\": \"@@ -63,7 +63,7 @@ public void setCollarColor(DyeColor color) {\\n */\\n @Override\\n public DyeColor getCollarColor() {\\n- return DyeColor.values()[getHandle().bZ()];\\n+ return DyeColor.values()[getHandle().cd()];\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fanimal%2FCanaryWolf.java\",\n \"sha\": \"4f26598264d2631b271fbc992bc2e271c571148d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 8,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryPlayer.java\",\n \"changes\": 16,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryPlayer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 8,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/humanoid/CanaryPlayer.java\",\n \"new_code\": \" ChunkCoordinates loc = ((EntityPlayerMP) entity).bE();\\n getHandle().bH().a(exhaustion);\\n getHandle().bH().setExhaustionLevel(exhaustion);\\n return getHandle().bH().getExhaustionLevel();\\n getHandle().bH().setFoodLevel(hunger);\\n return getHandle().bH().a();\\n return getHandle().bg();\\n return getHandle().bC();\",\n \"new_methods\": [],\n \"old_code\": \" ChunkCoordinates loc = ((EntityPlayerMP) entity).bA();\\n getHandle().bD().a(exhaustion);\\n getHandle().bD().setExhaustionLevel(exhaustion);\\n return getHandle().bD().getExhaustionLevel();\\n getHandle().bD().setFoodLevel(hunger);\\n return getHandle().bD().a();\\n return getHandle().bd();\\n return getHandle().by();\",\n \"old_methods\": [],\n \"patch\": \"@@ -116,7 +116,7 @@ public void notice(String message) {\\n @Override\\n public Location getSpawnPosition() {\\n Location spawn = Canary.getServer().getDefaultWorld().getSpawnLocation();\\n- ChunkCoordinates loc = ((EntityPlayerMP) entity).bA();\\n+ ChunkCoordinates loc = ((EntityPlayerMP) entity).bE();\\n \\n if (loc != null) {\\n spawn = new Location(Canary.getServer().getDefaultWorld(), loc.a, loc.b, loc.c, 0.0F, 0.0F);\\n@@ -469,27 +469,27 @@ public void sendPlayerListEntry(PlayerListEntry plentry) {\\n \\n @Override\\n public void addExhaustion(float exhaustion) {\\n- getHandle().bD().a(exhaustion);\\n+ getHandle().bH().a(exhaustion);\\n }\\n \\n @Override\\n public void setExhaustion(float exhaustion) {\\n- getHandle().bD().setExhaustionLevel(exhaustion);\\n+ getHandle().bH().setExhaustionLevel(exhaustion);\\n }\\n \\n @Override\\n public float getExhaustionLevel() {\\n- return getHandle().bD().getExhaustionLevel();\\n+ return getHandle().bH().getExhaustionLevel();\\n }\\n \\n @Override\\n public void setHunger(int hunger) {\\n- getHandle().bD().setFoodLevel(hunger);\\n+ getHandle().bH().setFoodLevel(hunger);\\n }\\n \\n @Override\\n public int getHunger() {\\n- return getHandle().bD().a();\\n+ return getHandle().bH().a();\\n }\\n \\n @Override\\n@@ -522,12 +522,12 @@ public int getLevel() {\\n \\n @Override\\n public boolean isSleeping() {\\n- return getHandle().bd();\\n+ return getHandle().bg();\\n }\\n \\n @Override\\n public boolean isDeeplySleeping() {\\n- return getHandle().by();\\n+ return getHandle().bC();\\n }\\n \\n @Override\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryPlayer.java\",\n \"sha\": \"c2107a350390921dbde1e9ae596eab49b9fdd165\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 5,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryVillager.java\",\n \"changes\": 10,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryVillager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 5,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/humanoid/CanaryVillager.java\",\n \"new_code\": \" return Profession.fromId(getHandle().bT());\\n return getHandle().bU();\\n getHandle().j(isMating);\\n return getHandle().bS();\\n getHandle().i(playing);\",\n \"new_methods\": [],\n \"old_code\": \" return Profession.fromId(getHandle().bP());\\n return getHandle().bQ();\\n getHandle().i(isMating);\\n return getHandle().bR();\\n getHandle().j(playing);\",\n \"old_methods\": [],\n \"patch\": \"@@ -44,7 +44,7 @@ public String getFqName() {\\n */\\n @Override\\n public Profession getProfession() {\\n- return Profession.fromId(getHandle().bP());\\n+ return Profession.fromId(getHandle().bT());\\n }\\n \\n /**\\n@@ -60,31 +60,31 @@ public void setProfession(Profession profession) {\\n */\\n @Override\\n public boolean isMating() {\\n- return getHandle().bQ();\\n+ return getHandle().bU();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setMating(boolean isMating) {\\n- getHandle().i(isMating);\\n+ getHandle().j(isMating);\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public boolean isPlaying() {\\n- return getHandle().bR();\\n+ return getHandle().bS();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setPlaying(boolean playing) {\\n- getHandle().j(playing);\\n+ getHandle().i(playing);\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FCanaryVillager.java\",\n \"sha\": \"f4dad2939c03e3bb25f87f5eb62e9f451f7f6823\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FEntityNonPlayableCharacter.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FEntityNonPlayableCharacter.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/humanoid/EntityNonPlayableCharacter.java\",\n \"new_code\": \" protected void bh() {\",\n \"new_methods\": [],\n \"old_code\": \" protected void be() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -97,7 +97,7 @@ public void w() {\\n getNPC().destroyed();\\n }\\n \\n- protected void be() {\\n+ protected void bh() {\\n this.move_helper.c();\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fhumanoid%2FEntityNonPlayableCharacter.java\",\n \"sha\": \"6c61324142c515a8dec5234840315bbd2bdffefe\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryBlaze.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryBlaze.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/monster/CanaryBlaze.java\",\n \"new_code\": \" return getHandle().bT();\",\n \"new_methods\": [],\n \"old_code\": \" return getHandle().bP();\",\n \"old_methods\": [],\n \"patch\": \"@@ -38,7 +38,7 @@ public String getFqName() {\\n */\\n @Override\\n public boolean isBurning() {\\n- return getHandle().bP();\\n+ return getHandle().bT();\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryBlaze.java\",\n \"sha\": \"cd3c32bb14a12d4dbb09d709c5d6693981a49345\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryCreeper.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryCreeper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/monster/CanaryCreeper.java\",\n \"new_code\": \" return getHandle().bT();\\n return getHandle().bV() == 1;\",\n \"new_methods\": [],\n \"old_code\": \" return getHandle().bP();\\n return getHandle().bR() == 1;\",\n \"old_methods\": [],\n \"patch\": \"@@ -73,7 +73,7 @@ public boolean canDamageEntities() {\\n */\\n @Override\\n public boolean isCharged() {\\n- return getHandle().bP();\\n+ return getHandle().bT();\\n }\\n \\n /**\\n@@ -145,7 +145,7 @@ public void decreaseFuse(int decrease) {\\n */\\n @Override\\n public boolean isAgro() {\\n- return getHandle().bR() == 1;\\n+ return getHandle().bV() == 1;\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryCreeper.java\",\n \"sha\": \"f858ec789f8aae374818bb8aaf3672009e34b2aa\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 4,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryEnderman.java\",\n \"changes\": 8,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryEnderman.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 4,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/monster/CanaryEnderman.java\",\n \"new_code\": \" return (short) getHandle().bW();\\n return (short) getHandle().bV();\\n return getHandle().bT();\\n return getHandle().bX();\",\n \"new_methods\": [],\n \"old_code\": \" return (short) getHandle().bR();\\n return (short) getHandle().bS();\\n return getHandle().bP();\\n return getHandle().bT();\",\n \"old_methods\": [],\n \"patch\": \"@@ -38,7 +38,7 @@ public String getFqName() {\\n */\\n @Override\\n public short getCarriedBlockID() {\\n- return (short) getHandle().bR();\\n+ return (short) getHandle().bW();\\n }\\n \\n /**\\n@@ -54,7 +54,7 @@ public void setCarriedBlockID(short blockId) {\\n */\\n @Override\\n public short getCarriedBlockMetaData() {\\n- return (short) getHandle().bS();\\n+ return (short) getHandle().bV();\\n }\\n \\n /**\\n@@ -70,15 +70,15 @@ public void setCarriedBlockMetaData(short metadata) {\\n */\\n @Override\\n public boolean randomTeleport() {\\n- return getHandle().bP();\\n+ return getHandle().bT();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public boolean isScreaming() {\\n- return getHandle().bT();\\n+ return getHandle().bX();\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryEnderman.java\",\n \"sha\": \"5a0332f4853ae1da7ba5961ecc584726e4dc060a\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySkeleton.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySkeleton.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/monster/CanarySkeleton.java\",\n \"new_code\": \" return getHandle().bV() == 1;\",\n \"new_methods\": [],\n \"old_code\": \" return getHandle().bR() == 1;\",\n \"old_methods\": [],\n \"patch\": \"@@ -38,7 +38,7 @@ public String getFqName() {\\n */\\n @Override\\n public boolean isWitherSkeleton() {\\n- return getHandle().bR() == 1;\\n+ return getHandle().bV() == 1;\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySkeleton.java\",\n \"sha\": \"92f6aae3d73ad00dbca0a265271c9bf3de72628d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySlime.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySlime.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/monster/CanarySlime.java\",\n \"new_code\": \" return Size.fromByte((byte) getHandle().bR());\",\n \"new_methods\": [],\n \"old_code\": \" return Size.fromByte((byte) getHandle().bN());\",\n \"old_methods\": [],\n \"patch\": \"@@ -39,7 +39,7 @@ public String getFqName() {\\n */\\n @Override\\n public Size getSize() {\\n- return Size.fromByte((byte) getHandle().bN());\\n+ return Size.fromByte((byte) getHandle().bR());\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanarySlime.java\",\n \"sha\": \"b2d70c199e66bf5b22f7046426c5476fbb82d08c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryWitch.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryWitch.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/monster/CanaryWitch.java\",\n \"new_code\": \" return getHandle().bT();\",\n \"new_methods\": [],\n \"old_code\": \" return getHandle().bP();\",\n \"old_methods\": [],\n \"patch\": \"@@ -38,7 +38,7 @@ public String getFqName() {\\n */\\n @Override\\n public boolean isAgressive() {\\n- return getHandle().bP();\\n+ return getHandle().bT();\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryWitch.java\",\n \"sha\": \"ecd83f37c24ce10338e97db9541b66ba91165fee\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 9,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryZombie.java\",\n \"changes\": 18,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryZombie.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 9,\n \"filename\": \"src/main/java/net/canarymod/api/entity/living/monster/CanaryZombie.java\",\n \"new_code\": \" return getHandle().bT();\\n getHandle().i(villager);\\n return getHandle().g_();\\n getHandle().a(child);\\n return getHandle().getConvertTicks();\\n getHandle().b(ticks);\\n return getHandle().bV();\\n getHandle().stopConversion();\\n getHandle().bS();\",\n \"new_methods\": [],\n \"old_code\": \" return ((EntityZombie) entity).bP();\\n ((EntityZombie) entity).j(villager);\\n return ((EntityZombie) entity).g_();\\n ((EntityZombie) entity).a(child);\\n return ((EntityZombie) entity).getConvertTicks();\\n ((EntityZombie) entity).a(ticks);\\n return ((EntityZombie) entity).bR();\\n ((EntityZombie) entity).stopConversion();\\n ((EntityZombie) entity).bS();\",\n \"old_methods\": [],\n \"patch\": \"@@ -38,71 +38,71 @@ public String getFqName() {\\n */\\n @Override\\n public boolean isVillager() {\\n- return ((EntityZombie) entity).bP();\\n+ return getHandle().bT();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setVillager(boolean villager) {\\n- ((EntityZombie) entity).j(villager);\\n+ getHandle().i(villager);\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public boolean isChild() {\\n- return ((EntityZombie) entity).g_();\\n+ return getHandle().g_();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setChild(boolean child) {\\n- ((EntityZombie) entity).a(child);\\n+ getHandle().a(child);\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public int getConversionTime() {\\n- return ((EntityZombie) entity).getConvertTicks();\\n+ return getHandle().getConvertTicks();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void setConversionTime(int ticks) {\\n- ((EntityZombie) entity).a(ticks);\\n+ getHandle().b(ticks);\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public boolean isConverting() {\\n- return ((EntityZombie) entity).bR();\\n+ return getHandle().bV();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void stopConverting() {\\n- ((EntityZombie) entity).stopConversion();\\n+ getHandle().stopConversion();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void convertToVillager() {\\n- ((EntityZombie) entity).bS();\\n+ getHandle().bS();\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fliving%2Fmonster%2FCanaryZombie.java\",\n \"sha\": \"5ff93b49f5d7951cafaca6880ec9ec1c9b5d24a4\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fvehicle%2FCanaryHopperMinecart.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fvehicle%2FCanaryHopperMinecart.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/canarymod/api/entity/vehicle/CanaryHopperMinecart.java\",\n \"new_code\": \" return getHandle().ay();\",\n \"new_methods\": [],\n \"old_code\": \" return getHandle().ax();\",\n \"old_methods\": [],\n \"patch\": \"@@ -67,7 +67,7 @@ public void setTransferCooldown(int cooldown) {\\n */\\n @Override\\n public boolean isBlocked() {\\n- return getHandle().ax();\\n+ return getHandle().ay();\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fentity%2Fvehicle%2FCanaryHopperMinecart.java\",\n \"sha\": \"2209cc177dbfb819f2006182452e0bf31a241fcc\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryComplexBlock.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryComplexBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/canarymod/api/world/blocks/CanaryComplexBlock.java\",\n \"new_code\": \" return tileentity.az().getCanaryWorld();\\n tileentity.az().j(getX(), getY(), getZ());\",\n \"new_methods\": [],\n \"old_code\": \" return tileentity.ay().getCanaryWorld();\\n tileentity.ay().j(getX(), getY(), getZ());\",\n \"old_methods\": [],\n \"patch\": \"@@ -78,15 +78,15 @@ public int getZ() {\\n */\\n @Override\\n public World getWorld() {\\n- return tileentity.ay().getCanaryWorld();\\n+ return tileentity.az().getCanaryWorld();\\n }\\n \\n /**\\n * {@inheritDoc}\\n */\\n @Override\\n public void update() {\\n- tileentity.ay().j(getX(), getY(), getZ());\\n+ tileentity.az().j(getX(), getY(), getZ());\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryComplexBlock.java\",\n \"sha\": \"1eaf3233e48838b5bd54da7b948bde0e12216a52\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryHopperBlock.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryHopperBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/canarymod/api/world/blocks/CanaryHopperBlock.java\",\n \"new_code\": \" return this.getTileEntity().az().getCanaryWorld();\",\n \"new_methods\": [],\n \"old_code\": \" return this.getTileEntity().ay().getCanaryWorld();\",\n \"old_methods\": [],\n \"patch\": \"@@ -82,7 +82,7 @@ public boolean isOutputConnected() {\\n */\\n @Override\\n public World getWorld() {\\n- return this.getTileEntity().ay().getCanaryWorld();\\n+ return this.getTileEntity().az().getCanaryWorld();\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryHopperBlock.java\",\n \"sha\": \"8b90e9bdd26706f75bafd342a6cfc6430a3da2b3\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryNoteBlock.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryNoteBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/canarymod/api/world/blocks/CanaryNoteBlock.java\",\n \"new_code\": \" Material material = tileentity.az().g(getX(), getY() - 1, getZ());\\n getTileEntity().a(tileentity.az(), getX(), getY(), getZ());\",\n \"new_methods\": [],\n \"old_code\": \" Material material = tileentity.ay().g(getX(), getY() - 1, getZ());\\n getTileEntity().a(tileentity.ay(), getX(), getY(), getZ());\",\n \"old_methods\": [],\n \"patch\": \"@@ -25,7 +25,7 @@ public CanaryNoteBlock(TileEntityNote tileentity) {\\n */\\n @Override\\n public byte getInstrument() {\\n- Material material = tileentity.ay().g(getX(), getY() - 1, getZ());\\n+ Material material = tileentity.az().g(getX(), getY() - 1, getZ());\\n byte instrument = 0;\\n \\n if (material == Material.e) {\\n@@ -60,7 +60,7 @@ public byte getNote() {\\n */\\n @Override\\n public void play() {\\n- getTileEntity().a(tileentity.ay(), getX(), getY(), getZ());\\n+ getTileEntity().a(tileentity.az(), getX(), getY(), getZ());\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fcanarymod%2Fapi%2Fworld%2Fblocks%2FCanaryNoteBlock.java\",\n \"sha\": \"ba03a53585304ba9babbca81a86e99bd0ba75d75\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAchievement.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAchievement.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/Achievement.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n public class Achievement extends StatBase {\\n \\n public final int a;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAchievement.java\",\n \"sha\": \"98d39ca093b920b83a7a8769f0434841841d03e6\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveConverter.java\",\n \"changes\": 3,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveConverter.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/AnvilSaveConverter.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n import java.io.DataInput;\\n import java.io.DataInputStream;\\n import java.io.DataOutput;\\n@@ -11,10 +10,8 @@\\n import java.util.Collection;\\n import java.util.Collections;\\n import java.util.Iterator;\\n-\\n import net.canarymod.Canary;\\n \\n-\\n public class AnvilSaveConverter extends SaveFormatOld {\\n \\n public AnvilSaveConverter(File file1, net.canarymod.api.world.DimensionType type) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveConverter.java\",\n \"sha\": \"f288c413533d66a877ff8d1602fc7d89511a8f1e\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveHandler.java\",\n \"changes\": 3,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveHandler.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/AnvilSaveHandler.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,11 +1,8 @@\\n package net.minecraft.server;\\n \\n-\\n import java.io.File;\\n-\\n import net.canarymod.api.world.DimensionType;\\n \\n-\\n public class AnvilSaveHandler extends SaveHandler {\\n \\n public AnvilSaveHandler(File file1, String s0, boolean flag0, DimensionType type) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FAnvilSaveHandler.java\",\n \"sha\": \"afa45f028bb470a52c92f4b5ca9761bc0c3ead83\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBehaviorDispenseMinecart.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBehaviorDispenseMinecart.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/BehaviorDispenseMinecart.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \" // MERGE: This seems to be new - Chris\",\n \"old_methods\": [],\n \"patch\": \"@@ -31,7 +31,6 @@ public ItemStack b(IBlockSource iblocksource, ItemStack itemstack) {\\n }\\n \\n EntityMinecart entityminecart = EntityMinecart.a(world, d0, d1 + d3, d2, ((ItemMinecart) itemstack.b()).a);\\n- // MERGE: This seems to be new - Chris\\n if (itemstack.u()) {\\n entityminecart.a(itemstack.s());\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBehaviorDispenseMinecart.java\",\n \"sha\": \"b03753db03d2e3374d4df0878c3b5c36b3ca7a37\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlock.java\",\n \"changes\": 3,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/Block.java\",\n \"new_code\": \" protected final void a(float f0, float f1, float f2, float f3, float f4, float f5) {\",\n \"new_methods\": [],\n \"old_code\": \" protected final void a(float f0, float f1, float f2, float f3, float f4,\\n float f5) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -296,8 +296,7 @@ public boolean t() {\\n return this.cL;\\n }\\n \\n- protected final void a(float f0, float f1, float f2, float f3, float f4,\\n- float f5) {\\n+ protected final void a(float f0, float f1, float f2, float f3, float f4, float f5) {\\n this.cM = (double) f0;\\n this.cN = (double) f1;\\n this.cO = (double) f2;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlock.java\",\n \"sha\": \"ad5dbacac3903fe3043c3670251fc9ba1af76536\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockDoor.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockDoor.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/BlockDoor.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.Random;\\n \\n-\\n public class BlockDoor extends Block {\\n \\n protected BlockDoor(int i0, Material material) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockDoor.java\",\n \"sha\": \"32355c83cbb9391f6b71648065bf0a269e11e668\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockFluid.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockFluid.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/BlockFluid.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.Random;\\n \\n-\\n public abstract class BlockFluid extends Block {\\n \\n protected BlockFluid(int i0, Material material) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockFluid.java\",\n \"sha\": \"d5dd852f73c295ca5ad22e213f3e799117861994\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockHalfSlab.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockHalfSlab.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/BlockHalfSlab.java\",\n \"new_code\": \" this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod cast to IBlockAccess\",\n \"new_methods\": [],\n \"old_code\": \" this.a((IBlockAccess)world, i0, i1, i2); //CanaryMod cast to IBlockAccess\",\n \"old_methods\": [],\n \"patch\": \"@@ -42,7 +42,7 @@ public void g() {\\n }\\n \\n public void a(World world, int i0, int i1, int i2, AxisAlignedBB axisalignedbb, List list, Entity entity) {\\n- this.a((IBlockAccess)world, i0, i1, i2); //CanaryMod cast to IBlockAccess\\n+ this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod cast to IBlockAccess\\n super.a(world, i0, i1, i2, axisalignedbb, list, entity);\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockHalfSlab.java\",\n \"sha\": \"43da760086f787302eb3f1ab84ee2adb85998bf0\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLadder.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLadder.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/BlockLadder.java\",\n \"new_code\": \" this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod: cast to IBlockAccess\",\n \"new_methods\": [],\n \"old_code\": \" this.a((IBlockAccess) world, i0, i1, i2); //CanaryMod: cast to IBlockAccess\",\n \"old_methods\": [],\n \"patch\": \"@@ -10,7 +10,7 @@ protected BlockLadder(int i0) {\\n }\\n \\n public AxisAlignedBB b(World world, int i0, int i1, int i2) {\\n- this.a((IBlockAccess) world, i0, i1, i2); //CanaryMod: cast to IBlockAccess\\n+ this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod: cast to IBlockAccess\\n return super.b(world, i0, i1, i2);\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLadder.java\",\n \"sha\": \"607dcebe225336b8082c1a5a272529ef5d35ebcf\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLeaves.java\",\n \"changes\": 10,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLeaves.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 7,\n \"filename\": \"src/main/java/net/minecraft/server/BlockLeaves.java\",\n \"new_code\": \" public static final String[] a = new String[]{ \\\"oak\\\", \\\"spruce\\\", \\\"birch\\\", \\\"jungle\\\" };\\n public static final String[][] b = new String[][]{ { \\\"leaves_oak\\\", \\\"leaves_spruce\\\", \\\"leaves_birch\\\", \\\"leaves_jungle\\\" }, { \\\"leaves_oak_opaque\\\", \\\"leaves_spruce_opaque\\\", \\\"leaves_birch_opaque\\\", \\\"leaves_jungle_opaque\\\" } };\\n if (!world.I && entityplayer.bx() != null && entityplayer.bx().d == Item.bg.cv) {\",\n \"new_methods\": [],\n \"old_code\": \" public static final String[] a = new String[]{ \\\"oak\\\", \\\"spruce\\\", \\\"birch\\\",\\n \\\"jungle\\\" };\\n public static final String[][] b = new String[][]{\\n { \\\"leaves_oak\\\", \\\"leaves_spruce\\\", \\\"leaves_birch\\\", \\\"leaves_jungle\\\" },\\n { \\\"leaves_oak_opaque\\\", \\\"leaves_spruce_opaque\\\",\\n \\\"leaves_birch_opaque\\\", \\\"leaves_jungle_opaque\\\" } };\\n if (!world.I && entityplayer.bt() != null && entityplayer.bt().d == Item.bg.cv) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -6,12 +6,8 @@\\n \\n public class BlockLeaves extends BlockLeavesBase {\\n \\n- public static final String[] a = new String[]{ \\\"oak\\\", \\\"spruce\\\", \\\"birch\\\",\\n- \\\"jungle\\\" };\\n- public static final String[][] b = new String[][]{\\n- { \\\"leaves_oak\\\", \\\"leaves_spruce\\\", \\\"leaves_birch\\\", \\\"leaves_jungle\\\" },\\n- { \\\"leaves_oak_opaque\\\", \\\"leaves_spruce_opaque\\\",\\n- \\\"leaves_birch_opaque\\\", \\\"leaves_jungle_opaque\\\" } };\\n+ public static final String[] a = new String[]{ \\\"oak\\\", \\\"spruce\\\", \\\"birch\\\", \\\"jungle\\\" };\\n+ public static final String[][] b = new String[][]{ { \\\"leaves_oak\\\", \\\"leaves_spruce\\\", \\\"leaves_birch\\\", \\\"leaves_jungle\\\" }, { \\\"leaves_oak_opaque\\\", \\\"leaves_spruce_opaque\\\", \\\"leaves_birch_opaque\\\", \\\"leaves_jungle_opaque\\\" } };\\n private Icon[][] cX = new Icon[2][];\\n int[] c;\\n \\n@@ -179,7 +175,7 @@ public void a(World world, int i0, int i1, int i2, int i3, float f0, int i4) {\\n }\\n \\n public void a(World world, EntityPlayer entityplayer, int i0, int i1, int i2, int i3) {\\n- if (!world.I && entityplayer.bt() != null && entityplayer.bt().d == Item.bg.cv) {\\n+ if (!world.I && entityplayer.bx() != null && entityplayer.bx().d == Item.bg.cv) {\\n entityplayer.a(StatList.C[this.cF], 1);\\n this.b(world, i0, i1, i2, new ItemStack(Block.P.cF, 1, i3 & 3));\\n } else {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLeaves.java\",\n \"sha\": \"88bb9e39274470f021972b4d76ce37c31ace7f30\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLever.java\",\n \"changes\": 10,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLever.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 8,\n \"filename\": \"src/main/java/net/minecraft/server/BlockLever.java\",\n \"new_code\": \" return i3 == 0 && world.u(i0, i1 + 1, i2) ? true : (i3 == 1 && world.w(i0, i1 - 1, i2) ? true : (i3 == 2 && world.u(i0, i1, i2 + 1) ? true : (i3 == 3 && world.u(i0, i1, i2 - 1) ? true : (i3 == 4 && world.u(i0 + 1, i1, i2) ? true : i3 == 5 && world.u(i0 - 1, i1, i2)))));\\n world.a((double) i0 + 0.5D, (double) i1 + 0.5D, (double) i2 + 0.5D, \\\"random.click\\\", 0.3F, i6 > 0 ? 0.6F : 0.5F);\",\n \"new_methods\": [],\n \"old_code\": \" return i3 == 0 && world.u(i0, i1 + 1, i2) ? true : (i3 == 1\\n && world.w(i0, i1 - 1, i2) ? true : (i3 == 2\\n && world.u(i0, i1, i2 + 1) ? true : (i3 == 3\\n && world.u(i0, i1, i2 - 1) ? true : (i3 == 4\\n && world.u(i0 + 1, i1, i2) ? true : i3 == 5\\n && world.u(i0 - 1, i1, i2)))));\\n world.a((double) i0 + 0.5D, (double) i1 + 0.5D, (double) i2 + 0.5D,\\n \\\"random.click\\\", 0.3F, i6 > 0 ? 0.6F : 0.5F);\",\n \"old_methods\": [],\n \"patch\": \"@@ -26,12 +26,7 @@ public int d() {\\n }\\n \\n public boolean c(World world, int i0, int i1, int i2, int i3) {\\n- return i3 == 0 && world.u(i0, i1 + 1, i2) ? true : (i3 == 1\\n- && world.w(i0, i1 - 1, i2) ? true : (i3 == 2\\n- && world.u(i0, i1, i2 + 1) ? true : (i3 == 3\\n- && world.u(i0, i1, i2 - 1) ? true : (i3 == 4\\n- && world.u(i0 + 1, i1, i2) ? true : i3 == 5\\n- && world.u(i0 - 1, i1, i2)))));\\n+ return i3 == 0 && world.u(i0, i1 + 1, i2) ? true : (i3 == 1 && world.w(i0, i1 - 1, i2) ? true : (i3 == 2 && world.u(i0, i1, i2 + 1) ? true : (i3 == 3 && world.u(i0, i1, i2 - 1) ? true : (i3 == 4 && world.u(i0 + 1, i1, i2) ? true : i3 == 5 && world.u(i0 - 1, i1, i2)))));\\n }\\n \\n public boolean c(World world, int i0, int i1, int i2) {\\n@@ -210,8 +205,7 @@ public boolean a(World world, int i0, int i1, int i2, EntityPlayer entityplayer,\\n } // CanaryMod: end\\n \\n world.b(i0, i1, i2, i5 + i6, 3);\\n- world.a((double) i0 + 0.5D, (double) i1 + 0.5D, (double) i2 + 0.5D,\\n- \\\"random.click\\\", 0.3F, i6 > 0 ? 0.6F : 0.5F);\\n+ world.a((double) i0 + 0.5D, (double) i1 + 0.5D, (double) i2 + 0.5D, \\\"random.click\\\", 0.3F, i6 > 0 ? 0.6F : 0.5F);\\n world.f(i0, i1, i2, this.cF);\\n if (i5 == 1) {\\n world.f(i0 - 1, i1, i2, this.cF);\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockLever.java\",\n \"sha\": \"e95a5c3cb77536f945e07978a73fb704cbb5959f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPistonBase.java\",\n \"changes\": 14,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPistonBase.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 12,\n \"filename\": \"src/main/java/net/minecraft/server/BlockPistonBase.java\",\n \"new_code\": \" return i3 != 0 && world.k(i0, i1 - 1, i2, 0) ? true : (i3 != 1 && world.k(i0, i1 + 1, i2, 1) ? true : (i3 != 2 && world.k(i0, i1, i2 - 1, 2) ? true : (i3 != 3 && world.k(i0, i1, i2 + 1, 3) ? true : (i3 != 5 && world.k(i0 + 1, i1, i2, 5) ? true : (i3 != 4 && world.k(i0 - 1, i1, i2, 4) ? true : (world.k(i0, i1, i2, 0) ? true : (world.k(i0, i1 + 2, i2,\\n 1) ? true : (world.k(i0, i1 + 1, i2 - 1, 2) ? true : (world.k(i0, i1 + 1, i2 + 1, 3) ? true : (world.k(i0 - 1, i1 + 1, i2, 4) ? true : world.k(i0 + 1, i1 + 1, i2, 5)))))))))));\",\n \"new_methods\": [],\n \"old_code\": \" return i3 != 0 && world.k(i0, i1 - 1, i2, 0) ? true : (i3 != 1\\n && world.k(i0, i1 + 1, i2, 1) ? true : (i3 != 2\\n && world.k(i0, i1, i2 - 1, 2) ? true : (i3 != 3\\n && world.k(i0, i1, i2 + 1, 3) ? true : (i3 != 5\\n && world.k(i0 + 1, i1, i2, 5) ? true : (i3 != 4\\n && world.k(i0 - 1, i1, i2, 4) ? true\\n : (world.k(i0, i1, i2, 0) ? true\\n : (world.k(i0, i1 + 2, i2, 1) ? true : (world.k(i0,\\n i1 + 1, i2 - 1, 2) ? true : (world.k(i0,\\n i1 + 1, i2 + 1, 3) ? true : (world.k(i0 - 1,\\n i1 + 1, i2, 4) ? true : world.k(i0 + 1, i1 + 1,\\n i2, 5)))))))))));\",\n \"old_methods\": [],\n \"patch\": \"@@ -87,18 +87,8 @@ private void k(World world, int i0, int i1, int i2) {\\n }\\n \\n private boolean d(World world, int i0, int i1, int i2, int i3) {\\n- return i3 != 0 && world.k(i0, i1 - 1, i2, 0) ? true : (i3 != 1\\n- && world.k(i0, i1 + 1, i2, 1) ? true : (i3 != 2\\n- && world.k(i0, i1, i2 - 1, 2) ? true : (i3 != 3\\n- && world.k(i0, i1, i2 + 1, 3) ? true : (i3 != 5\\n- && world.k(i0 + 1, i1, i2, 5) ? true : (i3 != 4\\n- && world.k(i0 - 1, i1, i2, 4) ? true\\n- : (world.k(i0, i1, i2, 0) ? true\\n- : (world.k(i0, i1 + 2, i2, 1) ? true : (world.k(i0,\\n- i1 + 1, i2 - 1, 2) ? true : (world.k(i0,\\n- i1 + 1, i2 + 1, 3) ? true : (world.k(i0 - 1,\\n- i1 + 1, i2, 4) ? true : world.k(i0 + 1, i1 + 1,\\n- i2, 5)))))))))));\\n+ return i3 != 0 && world.k(i0, i1 - 1, i2, 0) ? true : (i3 != 1 && world.k(i0, i1 + 1, i2, 1) ? true : (i3 != 2 && world.k(i0, i1, i2 - 1, 2) ? true : (i3 != 3 && world.k(i0, i1, i2 + 1, 3) ? true : (i3 != 5 && world.k(i0 + 1, i1, i2, 5) ? true : (i3 != 4 && world.k(i0 - 1, i1, i2, 4) ? true : (world.k(i0, i1, i2, 0) ? true : (world.k(i0, i1 + 2, i2,\\n+ 1) ? true : (world.k(i0, i1 + 1, i2 - 1, 2) ? true : (world.k(i0, i1 + 1, i2 + 1, 3) ? true : (world.k(i0 - 1, i1 + 1, i2, 4) ? true : world.k(i0 + 1, i1 + 1, i2, 5)))))))))));\\n }\\n \\n public boolean b(World world, int i0, int i1, int i2, int i3, int i4) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPistonBase.java\",\n \"sha\": \"121e2fec9a9f21b1c274eb80e2c6aeee8e6fcedd\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPortal.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPortal.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/BlockPortal.java\",\n \"new_code\": \" entity.ao = entity.ab();\\n entity.aa();\",\n \"new_methods\": [],\n \"old_code\": \" entity.ao = entity.aa();\\n entity.Z();\",\n \"old_methods\": [],\n \"patch\": \"@@ -24,7 +24,7 @@ public void a(World world, int i0, int i1, int i2, Random random) {\\n Entity entity = ItemMonsterPlacer.a(world, 57, (double) i0 + 0.5D, (double) i3 + 1.1D, (double) i2 + 0.5D);\\n \\n if (entity != null) {\\n- entity.ao = entity.aa();\\n+ entity.ao = entity.ab();\\n }\\n }\\n }\\n@@ -167,7 +167,7 @@ public int a(Random random) {\\n \\n public void a(World world, int i0, int i1, int i2, Entity entity) {\\n if (entity.o == null && entity.n == null) {\\n- entity.Z();\\n+ entity.aa();\\n }\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockPortal.java\",\n \"sha\": \"82f2ea0f912a91db791ded28df23ce51ed9e7518\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockRedstoneTorch.java\",\n \"changes\": 7,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockRedstoneTorch.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 6,\n \"filename\": \"src/main/java/net/minecraft/server/BlockRedstoneTorch.java\",\n \"new_code\": \" world.a((double) ((float) i0 + 0.5F), (double) ((float) i1 + 0.5F), (double) ((float) i2 + 0.5F), \\\"random.fizz\\\", 0.5F, 2.6F + (world.s.nextFloat() - world.s.nextFloat()) * 0.8F);\",\n \"new_methods\": [],\n \"old_code\": \" world.a((double) ((float) i0 + 0.5F),\\n (double) ((float) i1 + 0.5F),\\n (double) ((float) i2 + 0.5F),\\n \\\"random.fizz\\\",\\n 0.5F,\\n 2.6F + (world.s.nextFloat() - world.s.nextFloat()) * 0.8F);\",\n \"old_methods\": [],\n \"patch\": \"@@ -122,12 +122,7 @@ public void a(World world, int i0, int i1, int i2, Random random) {\\n //\\n world.f(i0, i1, i2, Block.aU.cF, world.h(i0, i1, i2), 3);\\n if (this.a(world, i0, i1, i2, true)) {\\n- world.a((double) ((float) i0 + 0.5F),\\n- (double) ((float) i1 + 0.5F),\\n- (double) ((float) i2 + 0.5F),\\n- \\\"random.fizz\\\",\\n- 0.5F,\\n- 2.6F + (world.s.nextFloat() - world.s.nextFloat()) * 0.8F);\\n+ world.a((double) ((float) i0 + 0.5F), (double) ((float) i1 + 0.5F), (double) ((float) i2 + 0.5F), \\\"random.fizz\\\", 0.5F, 2.6F + (world.s.nextFloat() - world.s.nextFloat()) * 0.8F);\\n \\n for (int i3 = 0; i3 < 5; ++i3) {\\n double d0 = (double) i0 + random.nextDouble() * 0.6D + 0.2D;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockRedstoneTorch.java\",\n \"sha\": \"3011fa0bff599685656a910e830e411df42a1b8c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockStairs.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockStairs.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/BlockStairs.java\",\n \"new_code\": \" private static final int[][] a = new int[][]{ { 2, 6 }, { 3, 7 }, { 2, 3 }, { 6, 7 }, { 0, 4 }, { 1, 5 }, { 0, 1 }, { 4, 5 } };\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n private static final int[][] a = new int[][] { { 2, 6}, { 3, 7}, { 2, 3}, { 6, 7}, { 0, 4}, { 1, 5}, { 0, 1}, { 4, 5}};\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,13 +1,11 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.List;\\n import java.util.Random;\\n \\n-\\n public class BlockStairs extends Block {\\n \\n- private static final int[][] a = new int[][] { { 2, 6}, { 3, 7}, { 2, 3}, { 6, 7}, { 0, 4}, { 1, 5}, { 0, 1}, { 4, 5}};\\n+ private static final int[][] a = new int[][]{ { 2, 6 }, { 3, 7 }, { 2, 3 }, { 6, 7 }, { 0, 4 }, { 1, 5 }, { 0, 1 }, { 4, 5 } };\\n private final Block b;\\n private final int c;\\n private boolean d;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockStairs.java\",\n \"sha\": \"88fcaf1eb81f769f4a40d2964a8a625ce715b142\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockTrapDoor.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockTrapDoor.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/BlockTrapDoor.java\",\n \"new_code\": \" this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod Cast to IBlockAccess\",\n \"new_methods\": [],\n \"old_code\": \" this.a((IBlockAccess)world, i0, i1, i2); //CanaryMod Cast to IBlockAccess\",\n \"old_methods\": [],\n \"patch\": \"@@ -28,7 +28,7 @@ public int d() {\\n }\\n \\n public AxisAlignedBB b(World world, int i0, int i1, int i2) {\\n- this.a((IBlockAccess)world, i0, i1, i2); //CanaryMod Cast to IBlockAccess\\n+ this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod Cast to IBlockAccess\\n return super.b(world, i0, i1, i2);\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockTrapDoor.java\",\n \"sha\": \"ae0023eccc9a2ca834b3d009b4d99a224e5c37d2\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockWall.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockWall.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/BlockWall.java\",\n \"new_code\": \" public static final String[] a = new String[]{ \\\"normal\\\", \\\"mossy\\\" };\\n this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod Cast to IBlockAccess\",\n \"new_methods\": [],\n \"old_code\": \" public static final String[] a = new String[] { \\\"normal\\\", \\\"mossy\\\"};\\n this.a((IBlockAccess) world, i0, i1, i2); //CanaryMod Cast to IBlockAccess\",\n \"old_methods\": [],\n \"patch\": \"@@ -2,7 +2,7 @@\\n \\n public class BlockWall extends Block {\\n \\n- public static final String[] a = new String[] { \\\"normal\\\", \\\"mossy\\\"};\\n+ public static final String[] a = new String[]{ \\\"normal\\\", \\\"mossy\\\" };\\n \\n public BlockWall(int i0, Block block) {\\n super(i0, block.cU);\\n@@ -69,7 +69,7 @@ public void a(IBlockAccess iblockaccess, int i0, int i1, int i2) {\\n }\\n \\n public AxisAlignedBB b(World world, int i0, int i1, int i2) {\\n- this.a((IBlockAccess) world, i0, i1, i2); //CanaryMod Cast to IBlockAccess\\n+ this.a((IBlockAccess) world, i0, i1, i2); // CanaryMod Cast to IBlockAccess\\n this.cQ = 1.5D;\\n return super.b(world, i0, i1, i2);\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FBlockWall.java\",\n \"sha\": \"1095fdd7b4fecdbe0e9f72f862eb53dba68bf9fb\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 9,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCallableSuspiciousClasses.java\",\n \"changes\": 29,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCallableSuspiciousClasses.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 20,\n \"filename\": \"src/main/java/net/minecraft/server/CallableSuspiciousClasses.java\",\n \"new_code\": \" public String a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {\\n if (s1 != null && !s1.startsWith(\\\"org.lwjgl.\\\") && !s1.startsWith(\\\"paulscode.\\\") && !s1.startsWith(\\\"org.bouncycastle.\\\") && !s1.startsWith(\\\"argo.\\\") && !s1.startsWith(\\\"com.jcraft.\\\") && !s1.startsWith(\\\"com.fasterxml.\\\") && !s1.startsWith(\\\"com.google.\\\") && !s1.startsWith(\\\"joptsimple.\\\") && !s1.startsWith(\\\"org.apache.\\\") && !s1.equals(\\\"util.GLX\\\")) {\\n if (s1.length() <= 3 || s1.equals(\\\"net.minecraft.client.main.Main\\\") || s1.equals(\\\"net.minecraft.client.Minecraft\\\") || s1.equals(\\\"net.minecraft.client.ClientBrandRetriever\\\") || s1.equals(\\\"net.minecraft.server.MinecraftServer\\\")) {\\n public Object call() {\\n try {\\n return this.a();\\n } catch (Exception ex) {\\n return null;\\n }\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/CallableSuspiciousClasses.java\",\n \"implementation\": \"try {\\n return this.a();\",\n \"signature\": \"Object call()\"\n }\n ],\n \"old_code\": \"\\n\\n public String a() throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException { // CanaryMod: Throws Added\\n if (s1 != null && !s1.startsWith(\\\"org.lwjgl.\\\")\\n && !s1.startsWith(\\\"paulscode.\\\")\\n && !s1.startsWith(\\\"org.bouncycastle.\\\")\\n && !s1.startsWith(\\\"argo.\\\")\\n && !s1.startsWith(\\\"com.jcraft.\\\")\\n && !s1.startsWith(\\\"com.fasterxml.\\\")\\n && !s1.startsWith(\\\"com.google.\\\")\\n && !s1.startsWith(\\\"joptsimple.\\\")\\n && !s1.startsWith(\\\"org.apache.\\\")\\n && !s1.equals(\\\"util.GLX\\\")) {\\n if (s1.length() <= 3\\n || s1.equals(\\\"net.minecraft.client.main.Main\\\")\\n || s1.equals(\\\"net.minecraft.client.Minecraft\\\")\\n || s1.equals(\\\"net.minecraft.client.ClientBrandRetriever\\\")\\n || s1.equals(\\\"net.minecraft.server.MinecraftServer\\\")) {\\n public Object call() throws SecurityException, IllegalArgumentException, NoSuchFieldException, IllegalAccessException { // CanaryMod: Throws added\\n return this.a();\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n import java.lang.reflect.Field;\\n import java.util.ArrayList;\\n import java.util.Collections;\\n@@ -9,7 +8,6 @@\\n import java.util.Vector;\\n import java.util.concurrent.Callable;\\n \\n-\\n class CallableSuspiciousClasses implements Callable {\\n \\n final CrashReport a;\\n@@ -18,7 +16,7 @@ class CallableSuspiciousClasses implements Callable {\\n this.a = crashreport;\\n }\\n \\n- public String a() throws SecurityException, NoSuchFieldException, IllegalArgumentException, IllegalAccessException { // CanaryMod: Throws Added\\n+ public String a() throws SecurityException, NoSuchFieldException, IllegalAccessException, IllegalArgumentException {\\n StringBuilder stringbuilder = new StringBuilder();\\n Field field = ClassLoader.class.getDeclaredField(\\\"classes\\\");\\n \\n@@ -38,22 +36,9 @@ public String a() throws SecurityException, NoSuchFieldException, IllegalArgumen\\n if (oclass0 != null) {\\n String s1 = oclass0.getCanonicalName();\\n \\n- if (s1 != null && !s1.startsWith(\\\"org.lwjgl.\\\")\\n- && !s1.startsWith(\\\"paulscode.\\\")\\n- && !s1.startsWith(\\\"org.bouncycastle.\\\")\\n- && !s1.startsWith(\\\"argo.\\\")\\n- && !s1.startsWith(\\\"com.jcraft.\\\")\\n- && !s1.startsWith(\\\"com.fasterxml.\\\")\\n- && !s1.startsWith(\\\"com.google.\\\")\\n- && !s1.startsWith(\\\"joptsimple.\\\")\\n- && !s1.startsWith(\\\"org.apache.\\\")\\n- && !s1.equals(\\\"util.GLX\\\")) {\\n+ if (s1 != null && !s1.startsWith(\\\"org.lwjgl.\\\") && !s1.startsWith(\\\"paulscode.\\\") && !s1.startsWith(\\\"org.bouncycastle.\\\") && !s1.startsWith(\\\"argo.\\\") && !s1.startsWith(\\\"com.jcraft.\\\") && !s1.startsWith(\\\"com.fasterxml.\\\") && !s1.startsWith(\\\"com.google.\\\") && !s1.startsWith(\\\"joptsimple.\\\") && !s1.startsWith(\\\"org.apache.\\\") && !s1.equals(\\\"util.GLX\\\")) {\\n if (flag1) {\\n- if (s1.length() <= 3\\n- || s1.equals(\\\"net.minecraft.client.main.Main\\\")\\n- || s1.equals(\\\"net.minecraft.client.Minecraft\\\")\\n- || s1.equals(\\\"net.minecraft.client.ClientBrandRetriever\\\")\\n- || s1.equals(\\\"net.minecraft.server.MinecraftServer\\\")) {\\n+ if (s1.length() <= 3 || s1.equals(\\\"net.minecraft.client.main.Main\\\") || s1.equals(\\\"net.minecraft.client.Minecraft\\\") || s1.equals(\\\"net.minecraft.client.ClientBrandRetriever\\\") || s1.equals(\\\"net.minecraft.server.MinecraftServer\\\")) {\\n continue;\\n }\\n } else if (s1.startsWith(\\\"net.minecraft\\\")) {\\n@@ -117,7 +102,11 @@ public String a() throws SecurityException, NoSuchFieldException, IllegalArgumen\\n return stringbuilder.toString();\\n }\\n \\n- public Object call() throws SecurityException, IllegalArgumentException, NoSuchFieldException, IllegalAccessException { // CanaryMod: Throws added\\n- return this.a();\\n+ public Object call() {\\n+ try {\\n+ return this.a();\\n+ } catch (Exception ex) {\\n+ return null;\\n+ }\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCallableSuspiciousClasses.java\",\n \"sha\": \"4a6297a1955fb2eee3260fdd81e09a1ee0bd7b8e\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 10,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FChunk.java\",\n \"changes\": 40,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FChunk.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 30,\n \"filename\": \"src/main/java/net/minecraft/server/Chunk.java\",\n \"new_code\": \" entity.Q();\\n if (entity1 != entity && entity1.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {\\n Entity[] aentity = entity1.an();\\n if (entity1 != entity && entity1.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {\\n if (oclass0.isAssignableFrom(entity.getClass()) && entity.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity))) {\\n return new Random(this.e.H() + (long) (this.g * this.g * 4987142) + (long) (this.g * 5947611) + (long) (this.h * this.h) * 4392871L + (long) (this.h * 389711) ^ i0);\\n if (ichunkprovider.a(i0 - 1, i1) && !ichunkprovider.d(i0 - 1, i1).k && ichunkprovider.a(i0 - 1, i1 + 1) && ichunkprovider.a(i0, i1 + 1) && ichunkprovider.a(i0 - 1, i1 + 1)) {\\n if (ichunkprovider.a(i0, i1 - 1) && !ichunkprovider.d(i0, i1 - 1).k && ichunkprovider.a(i0 + 1, i1 - 1) && ichunkprovider.a(i0 + 1, i1 - 1) && ichunkprovider.a(i0 + 1, i1)) {\\n if (ichunkprovider.a(i0 - 1, i1 - 1) && !ichunkprovider.d(i0 - 1, i1 - 1).k && ichunkprovider.a(i0, i1 - 1) && ichunkprovider.a(i0 - 1, i1)) {\\n if (this.r[i1] == null && (i6 == 0 || i6 == 15 || i2 == 0 || i2 == 15 || i3 == 0 || i3 == 15) || this.r[i1] != null && this.r[i1].a(i2, i6, i3) == 0) {\",\n \"new_methods\": [],\n \"old_code\": \" // MERGE: entity.w() is probably not kill() anymore! - Chris\\n entity.P();\\n if (entity1 != entity\\n && entity1.E.b(axisalignedbb)\\n && (ientityselector == null || ientityselector\\n .a(entity1))) {\\n Entity[] aentity = entity1.am();\\n if (entity1 != entity\\n && entity1.E.b(axisalignedbb)\\n && (ientityselector == null || ientityselector.a(entity1))) {\\n if (oclass0.isAssignableFrom(entity.getClass())\\n && entity.E.b(axisalignedbb)\\n && (ientityselector == null || ientityselector.a(entity))) {\\n return new Random(this.e.H() + (long) (this.g * this.g * 4987142)\\n + (long) (this.g * 5947611) + (long) (this.h * this.h)\\n * 4392871L + (long) (this.h * 389711) ^ i0);\\n if (ichunkprovider.a(i0 - 1, i1) && !ichunkprovider.d(i0 - 1, i1).k\\n && ichunkprovider.a(i0 - 1, i1 + 1)\\n && ichunkprovider.a(i0, i1 + 1)\\n && ichunkprovider.a(i0 - 1, i1 + 1)) {\\n if (ichunkprovider.a(i0, i1 - 1) && !ichunkprovider.d(i0, i1 - 1).k\\n && ichunkprovider.a(i0 + 1, i1 - 1)\\n && ichunkprovider.a(i0 + 1, i1 - 1)\\n && ichunkprovider.a(i0 + 1, i1)) {\\n if (ichunkprovider.a(i0 - 1, i1 - 1)\\n && !ichunkprovider.d(i0 - 1, i1 - 1).k\\n && ichunkprovider.a(i0, i1 - 1) && ichunkprovider.a(i0 - 1, i1)) {\\n if (this.r[i1] == null\\n && (i6 == 0 || i6 == 15 || i2 == 0 || i2 == 15 || i3 == 0 || i3 == 15) || this.r[i1] != null\\n && this.r[i1].a(i2, i6, i3) == 0) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -595,7 +595,6 @@ public void a(Entity entity) {\\n if (i0 != this.g || i1 != this.h) {\\n this.e.Y().c(\\\"Wrong location! \\\" + entity);\\n // Thread.dumpStack();\\n- // MERGE: entity.w() is probably not kill() anymore! - Chris\\n entity.w();\\n return;\\n }\\n@@ -714,7 +713,7 @@ public void c() {\\n while (iterator.hasNext()) {\\n Entity entity = (Entity) iterator.next();\\n \\n- entity.P();\\n+ entity.Q();\\n }\\n \\n this.e.a(this.j[i0]);\\n@@ -760,19 +759,14 @@ public void a(Entity entity, AxisAlignedBB axisalignedbb, List list, IEntitySele\\n for (int i3 = 0; i3 < list1.size(); ++i3) {\\n Entity entity1 = (Entity) list1.get(i3);\\n \\n- if (entity1 != entity\\n- && entity1.E.b(axisalignedbb)\\n- && (ientityselector == null || ientityselector\\n- .a(entity1))) {\\n+ if (entity1 != entity && entity1.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {\\n list.add(entity1);\\n- Entity[] aentity = entity1.am();\\n+ Entity[] aentity = entity1.an();\\n \\n if (aentity != null) {\\n for (int i4 = 0; i4 < aentity.length; ++i4) {\\n entity1 = aentity[i4];\\n- if (entity1 != entity\\n- && entity1.E.b(axisalignedbb)\\n- && (ientityselector == null || ientityselector.a(entity1))) {\\n+ if (entity1 != entity && entity1.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity1))) {\\n list.add(entity1);\\n }\\n }\\n@@ -804,9 +798,7 @@ public void a(Class oclass0, AxisAlignedBB axisalignedbb, List list, IEntitySele\\n for (int i3 = 0; i3 < list1.size(); ++i3) {\\n Entity entity = (Entity) list1.get(i3);\\n \\n- if (oclass0.isAssignableFrom(entity.getClass())\\n- && entity.E.b(axisalignedbb)\\n- && (ientityselector == null || ientityselector.a(entity))) {\\n+ if (oclass0.isAssignableFrom(entity.getClass()) && entity.E.b(axisalignedbb) && (ientityselector == null || ientityselector.a(entity))) {\\n list.add(entity);\\n }\\n }\\n@@ -826,9 +818,7 @@ public boolean a(boolean flag0) {\\n }\\n \\n public Random a(long i0) {\\n- return new Random(this.e.H() + (long) (this.g * this.g * 4987142)\\n- + (long) (this.g * 5947611) + (long) (this.h * this.h)\\n- * 4392871L + (long) (this.h * 389711) ^ i0);\\n+ return new Random(this.e.H() + (long) (this.g * this.g * 4987142) + (long) (this.g * 5947611) + (long) (this.h * this.h) * 4392871L + (long) (this.h * 389711) ^ i0);\\n }\\n \\n public boolean g() {\\n@@ -840,23 +830,15 @@ public void a(IChunkProvider ichunkprovider, IChunkProvider ichunkprovider1, int\\n ichunkprovider.a(ichunkprovider1, i0, i1);\\n }\\n \\n- if (ichunkprovider.a(i0 - 1, i1) && !ichunkprovider.d(i0 - 1, i1).k\\n- && ichunkprovider.a(i0 - 1, i1 + 1)\\n- && ichunkprovider.a(i0, i1 + 1)\\n- && ichunkprovider.a(i0 - 1, i1 + 1)) {\\n+ if (ichunkprovider.a(i0 - 1, i1) && !ichunkprovider.d(i0 - 1, i1).k && ichunkprovider.a(i0 - 1, i1 + 1) && ichunkprovider.a(i0, i1 + 1) && ichunkprovider.a(i0 - 1, i1 + 1)) {\\n ichunkprovider.a(ichunkprovider1, i0 - 1, i1);\\n }\\n \\n- if (ichunkprovider.a(i0, i1 - 1) && !ichunkprovider.d(i0, i1 - 1).k\\n- && ichunkprovider.a(i0 + 1, i1 - 1)\\n- && ichunkprovider.a(i0 + 1, i1 - 1)\\n- && ichunkprovider.a(i0 + 1, i1)) {\\n+ if (ichunkprovider.a(i0, i1 - 1) && !ichunkprovider.d(i0, i1 - 1).k && ichunkprovider.a(i0 + 1, i1 - 1) && ichunkprovider.a(i0 + 1, i1 - 1) && ichunkprovider.a(i0 + 1, i1)) {\\n ichunkprovider.a(ichunkprovider1, i0, i1 - 1);\\n }\\n \\n- if (ichunkprovider.a(i0 - 1, i1 - 1)\\n- && !ichunkprovider.d(i0 - 1, i1 - 1).k\\n- && ichunkprovider.a(i0, i1 - 1) && ichunkprovider.a(i0 - 1, i1)) {\\n+ if (ichunkprovider.a(i0 - 1, i1 - 1) && !ichunkprovider.d(i0 - 1, i1 - 1).k && ichunkprovider.a(i0, i1 - 1) && ichunkprovider.a(i0 - 1, i1)) {\\n ichunkprovider.a(ichunkprovider1, i0 - 1, i1 - 1);\\n }\\n }\\n@@ -963,9 +945,7 @@ public void o() {\\n for (int i6 = 0; i6 < 16; ++i6) {\\n int i7 = (i1 << 4) + i6;\\n \\n- if (this.r[i1] == null\\n- && (i6 == 0 || i6 == 15 || i2 == 0 || i2 == 15 || i3 == 0 || i3 == 15) || this.r[i1] != null\\n- && this.r[i1].a(i2, i6, i3) == 0) {\\n+ if (this.r[i1] == null && (i6 == 0 || i6 == 15 || i2 == 0 || i2 == 15 || i3 == 0 || i3 == 15) || this.r[i1] != null && this.r[i1].a(i2, i6, i3) == 0) {\\n if (Block.w[this.e.a(i4, i7 - 1, i5)] > 0) {\\n this.e.A(i4, i7 - 1, i5);\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FChunk.java\",\n \"sha\": \"774c136c03b9e65c9054e0ee83f0d49800dacdf4\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 11,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandBase.java\",\n \"changes\": 40,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandBase.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 29,\n \"filename\": \"src/main/java/net/minecraft/server/CommandBase.java\",\n \"new_code\": \" throw new NumberInvalidException(\\\"commands.generic.double.invalid\\\", new Object[]{ s0 });\\n public static double a(ICommandSender icommandsender, String s0, double d0, double d1) {\\n throw new NumberInvalidException(\\\"commands.generic.double.tooSmall\\\", new Object[]{ Double.valueOf(d2), Double.valueOf(d0) });\\n throw new NumberInvalidException(\\\"commands.generic.double.tooBig\\\", new Object[]{ Double.valueOf(d2), Double.valueOf(d1) });\\n throw new CommandException(\\\"commands.generic.boolean.invalid\\\", new Object[]{ s0 });\\n return entityplayermp.am();\\n public static double a(ICommandSender icommandsender, double d0, String s0, int i0, int i1) {\\n throw new NumberInvalidException(\\\"commands.generic.num.invalid\\\", new Object[]{ Double.valueOf(d0) });\\n throw new NumberInvalidException(\\\"commands.generic.double.tooSmall\\\", new Object[]{ Double.valueOf(d1), Integer.valueOf(i0) });\\n throw new NumberInvalidException(\\\"commands.generic.double.tooBig\\\", new Object[]{ Double.valueOf(d1), Integer.valueOf(i1) });\\n for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i0++] = entitylivingbase.ax()) {\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"ICommandSender icommandsender\",\n \" String s0\",\n \" double d0\",\n \" double d1\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/CommandBase.java\",\n \"implementation\": \"throw new NumberInvalidException(\\\"commands.generic.double.tooSmall\\\", new Object[]{ Double.valueOf(d2), Double.valueOf(d0)\",\n \"signature\": \"double a(ICommandSender icommandsender, String s0, double d0, double d1)\"\n },\n {\n \"arguments\": [\n \"ICommandSender icommandsender\",\n \" double d0\",\n \" String s0\",\n \" int i0\",\n \" int i1\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/CommandBase.java\",\n \"implementation\": \"throw new NumberInvalidException(\\\"commands.generic.num.invalid\\\", new Object[]{ Double.valueOf(d0)\",\n \"signature\": \"double a(ICommandSender icommandsender, double d0, String s0, int i0, int i1)\"\n }\n ],\n \"old_code\": \" // MERGE Is this deprecated now? - Chris\\n // public String a(ICommandSender icommandsender) {\\n // return \\\"/\\\" + this.c();\\n // }\\n\\n throw new NumberInvalidException(\\n \\\"commands.generic.double.invalid\\\", new Object[]{ s0 });\\n public static double a(ICommandSender icommandsender, String s0, double d0,\\n double d1) {\\n throw new NumberInvalidException(\\n \\\"commands.generic.double.tooSmall\\\", new Object[]{\\n Double.valueOf(d2), Double.valueOf(d0) });\\n throw new NumberInvalidException(\\\"commands.generic.double.tooBig\\\",\\n new Object[]{ Double.valueOf(d2), Double.valueOf(d1) });\\n throw new CommandException(\\\"commands.generic.boolean.invalid\\\",\\n new Object[]{ s0 });\\n return entityplayermp.al();\\n public static double a(ICommandSender icommandsender, double d0, String s0,\\n int i0, int i1) {\\n throw new NumberInvalidException(\\\"commands.generic.num.invalid\\\",\\n new Object[]{ Double.valueOf(d0) });\\n throw new NumberInvalidException(\\n \\\"commands.generic.double.tooSmall\\\", new Object[]{\\n Double.valueOf(d1), Integer.valueOf(i0) });\\n throw new NumberInvalidException(\\n \\\"commands.generic.double.tooBig\\\", new Object[]{\\n Double.valueOf(d1), Integer.valueOf(i1) });\\n for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i0++] = entitylivingbase\\n .aw()) {\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"ICommandSender icommandsender\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/CommandBase.java\",\n \"implementation\": \"// return \\\"/\\\" + this.c();\\n //\",\n \"signature\": \"String a(ICommandSender icommandsender)\"\n },\n {\n \"arguments\": [\n \"ICommandSender icommandsender\",\n \" String s0\",\n \" double d0\",\n \"\\n double d1\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/CommandBase.java\",\n \"implementation\": \"throw new NumberInvalidException(\\n \\\"commands.generic.double.tooSmall\\\", new Object[]{\\n Double.valueOf(d2), Double.valueOf(d0)\",\n \"signature\": \"double a(ICommandSender icommandsender, String s0, double d0,\\n double d1)\"\n },\n {\n \"arguments\": [\n \"ICommandSender icommandsender\",\n \" double d0\",\n \" String s0\",\n \"\\n int i0\",\n \" int i1\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/CommandBase.java\",\n \"implementation\": \"throw new NumberInvalidException(\\\"commands.generic.num.invalid\\\",\\n new Object[]{ Double.valueOf(d0)\",\n \"signature\": \"double a(ICommandSender icommandsender, double d0, String s0,\\n int i0, int i1)\"\n }\n ],\n \"patch\": \"@@ -16,11 +16,6 @@ public int a() {\\n return 4;\\n }\\n \\n- // MERGE Is this deprecated now? - Chris\\n- // public String a(ICommandSender icommandsender) {\\n- // return \\\"/\\\" + this.c();\\n- // }\\n-\\n public List b() {\\n return null;\\n }\\n@@ -62,8 +57,7 @@ public static double b(ICommandSender icommandsender, String s0) {\\n double d0 = Double.parseDouble(s0);\\n \\n if (!Doubles.isFinite(d0)) {\\n- throw new NumberInvalidException(\\n- \\\"commands.generic.double.invalid\\\", new Object[]{ s0 });\\n+ throw new NumberInvalidException(\\\"commands.generic.double.invalid\\\", new Object[]{ s0 });\\n } else {\\n return d0;\\n }\\n@@ -76,17 +70,13 @@ public static double a(ICommandSender icommandsender, String s0, double d0) {\\n return a(icommandsender, s0, d0, Double.MAX_VALUE);\\n }\\n \\n- public static double a(ICommandSender icommandsender, String s0, double d0,\\n- double d1) {\\n+ public static double a(ICommandSender icommandsender, String s0, double d0, double d1) {\\n double d2 = b(icommandsender, s0);\\n \\n if (d2 < d0) {\\n- throw new NumberInvalidException(\\n- \\\"commands.generic.double.tooSmall\\\", new Object[]{\\n- Double.valueOf(d2), Double.valueOf(d0) });\\n+ throw new NumberInvalidException(\\\"commands.generic.double.tooSmall\\\", new Object[]{ Double.valueOf(d2), Double.valueOf(d0) });\\n } else if (d2 > d1) {\\n- throw new NumberInvalidException(\\\"commands.generic.double.tooBig\\\",\\n- new Object[]{ Double.valueOf(d2), Double.valueOf(d1) });\\n+ throw new NumberInvalidException(\\\"commands.generic.double.tooBig\\\", new Object[]{ Double.valueOf(d2), Double.valueOf(d1) });\\n } else {\\n return d2;\\n }\\n@@ -95,8 +85,7 @@ public static double a(ICommandSender icommandsender, String s0, double d0,\\n public static boolean c(ICommandSender icommandsender, String s0) {\\n if (!s0.equals(\\\"true\\\") && !s0.equals(\\\"1\\\")) {\\n if (!s0.equals(\\\"false\\\") && !s0.equals(\\\"0\\\")) {\\n- throw new CommandException(\\\"commands.generic.boolean.invalid\\\",\\n- new Object[]{ s0 });\\n+ throw new CommandException(\\\"commands.generic.boolean.invalid\\\", new Object[]{ s0 });\\n } else {\\n return false;\\n }\\n@@ -132,7 +121,7 @@ public static String e(ICommandSender icommandsender, String s0) {\\n EntityPlayerMP entityplayermp = PlayerSelector.a(icommandsender, s0);\\n \\n if (entityplayermp != null) {\\n- return entityplayermp.al();\\n+ return entityplayermp.am();\\n } else if (PlayerSelector.b(s0)) {\\n throw new PlayerNotFoundException();\\n } else {\\n@@ -174,13 +163,11 @@ public static double a(ICommandSender icommandsender, double d0, String s0) {\\n return a(icommandsender, d0, s0, -30000000, 30000000);\\n }\\n \\n- public static double a(ICommandSender icommandsender, double d0, String s0,\\n- int i0, int i1) {\\n+ public static double a(ICommandSender icommandsender, double d0, String s0, int i0, int i1) {\\n boolean flag0 = s0.startsWith(\\\"~\\\");\\n \\n if (flag0 && Double.isNaN(d0)) {\\n- throw new NumberInvalidException(\\\"commands.generic.num.invalid\\\",\\n- new Object[]{ Double.valueOf(d0) });\\n+ throw new NumberInvalidException(\\\"commands.generic.num.invalid\\\", new Object[]{ Double.valueOf(d0) });\\n } else {\\n double d1 = flag0 ? d0 : 0.0D;\\n \\n@@ -199,15 +186,11 @@ public static double a(ICommandSender icommandsender, double d0, String s0,\\n \\n if (i0 != 0 || i1 != 0) {\\n if (d1 < (double) i0) {\\n- throw new NumberInvalidException(\\n- \\\"commands.generic.double.tooSmall\\\", new Object[]{\\n- Double.valueOf(d1), Integer.valueOf(i0) });\\n+ throw new NumberInvalidException(\\\"commands.generic.double.tooSmall\\\", new Object[]{ Double.valueOf(d1), Integer.valueOf(i0) });\\n }\\n \\n if (d1 > (double) i1) {\\n- throw new NumberInvalidException(\\n- \\\"commands.generic.double.tooBig\\\", new Object[]{\\n- Double.valueOf(d1), Integer.valueOf(i1) });\\n+ throw new NumberInvalidException(\\\"commands.generic.double.tooBig\\\", new Object[]{ Double.valueOf(d1), Integer.valueOf(i1) });\\n }\\n }\\n \\n@@ -245,8 +228,7 @@ public static String b(Collection collection) {\\n \\n EntityLivingBase entitylivingbase;\\n \\n- for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i0++] = entitylivingbase\\n- .aw()) {\\n+ for (Iterator iterator = collection.iterator(); iterator.hasNext(); astring[i0++] = entitylivingbase.ax()) {\\n entitylivingbase = (EntityLivingBase) iterator.next();\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandBase.java\",\n \"sha\": \"9f9936d97627194a0408b1409aa337f8a5d28e10\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveAll.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveAll.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/CommandServerSaveAll.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.world.CanaryWorld;\\n \\n-\\n public class CommandServerSaveAll extends CommandBase {\\n \\n public CommandServerSaveAll() {}\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveAll.java\",\n \"sha\": \"8e96a26759fe068ce5acefbefa6dc9e3539c148c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOff.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOff.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/CommandServerSaveOff.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.world.CanaryWorld;\\n \\n-\\n public class CommandServerSaveOff extends CommandBase {\\n \\n public CommandServerSaveOff() {}\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOff.java\",\n \"sha\": \"e57fef4f657e36a3ea4c93acb7237ba828e4fa36\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOn.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOn.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/CommandServerSaveOn.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.world.CanaryWorld;\\n \\n-\\n public class CommandServerSaveOn extends CommandBase {\\n \\n public CommandServerSaveOn() {}\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerSaveOn.java\",\n \"sha\": \"9ffc776da59b74e84ad5607d3c2647c32661f239\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerTp.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerTp.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/CommandServerTp.java\",\n \"new_code\": \" a(icommandsender, \\\"commands.tp.success\\\", new Object[]{ entityplayermp.am(), entityplayermp1.am() });\\n a(icommandsender, \\\"commands.tp.success.coordinates\\\", new Object[]{ entityplayermp.am(), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) });\",\n \"new_methods\": [],\n \"old_code\": \" a(icommandsender, \\\"commands.tp.success\\\", new Object[]{ entityplayermp.al(), entityplayermp1.al() });\\n a(icommandsender, \\\"commands.tp.success.coordinates\\\", new Object[]{ entityplayermp.al(), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) });\",\n \"old_methods\": [],\n \"patch\": \"@@ -50,7 +50,7 @@ public void b(ICommandSender icommandsender, String[] astring) {\\n entityplayermp.a((Entity) null);\\n // CanaryMod: DERP (MultiWorld fix)\\n entityplayermp.a.a(entityplayermp1.u, entityplayermp1.v, entityplayermp1.w, entityplayermp1.A, entityplayermp1.B, entityplayermp1.getCanaryWorld().getType().getId(), entityplayermp1.getCanaryWorld().getName(), TeleportHook.TeleportCause.COMMAND);\\n- a(icommandsender, \\\"commands.tp.success\\\", new Object[]{ entityplayermp.al(), entityplayermp1.al() });\\n+ a(icommandsender, \\\"commands.tp.success\\\", new Object[]{ entityplayermp.am(), entityplayermp1.am() });\\n }\\n } else if (entityplayermp.q != null) {\\n int i0 = astring.length - 3;\\n@@ -60,7 +60,7 @@ public void b(ICommandSender icommandsender, String[] astring) {\\n \\n entityplayermp.a((Entity) null);\\n entityplayermp.a(d0, d1, d2);\\n- a(icommandsender, \\\"commands.tp.success.coordinates\\\", new Object[]{ entityplayermp.al(), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) });\\n+ a(icommandsender, \\\"commands.tp.success.coordinates\\\", new Object[]{ entityplayermp.am(), Double.valueOf(d0), Double.valueOf(d1), Double.valueOf(d2) });\\n }\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandServerTp.java\",\n \"sha\": \"0b344e36078072b60c087464c2137bad43e53607\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandToggleDownfall.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandToggleDownfall.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/CommandToggleDownfall.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,10 +1,8 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.world.CanaryWorld;\\n import net.canarymod.api.world.DimensionType;\\n \\n-\\n public class CommandToggleDownfall extends CommandBase {\\n \\n public CommandToggleDownfall() {}\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandToggleDownfall.java\",\n \"sha\": \"a250aeb65266368410411a3285fbe502415f5744\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandWeather.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandWeather.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/CommandWeather.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,12 +1,10 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.List;\\n import java.util.Random;\\n import net.canarymod.api.world.CanaryWorld;\\n import net.canarymod.api.world.DimensionType;\\n \\n-\\n public class CommandWeather extends CommandBase {\\n \\n public CommandWeather() {}\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCommandWeather.java\",\n \"sha\": \"b4d656a8c84c1c53344837cf985094c8945b2ec3\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FComponentStrongholdRightTurn.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FComponentStrongholdRightTurn.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/ComponentStrongholdRightTurn.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,10 +1,8 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.List;\\n import java.util.Random;\\n \\n-\\n public class ComponentStrongholdRightTurn extends ComponentStrongholdLeftTurn {\\n \\n public ComponentStrongholdRightTurn(int i0, Random random,\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FComponentStrongholdRightTurn.java\",\n \"sha\": \"79a045c93b327870571017d6d72e479327d9ab80\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerChest.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerChest.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/ContainerChest.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -2,7 +2,6 @@\\n \\n import net.canarymod.api.inventory.Inventory;\\n \\n-\\n public class ContainerChest extends Container {\\n \\n private IInventory a;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerChest.java\",\n \"sha\": \"92064b418ec56aba62126f7f0faa2f9cd4cb88e3\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerEnchantment.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerEnchantment.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/ContainerEnchantment.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.ArrayList;\\n import java.util.List;\\n import java.util.Random;\\n@@ -9,7 +8,6 @@\\n import net.canarymod.api.world.blocks.EnchantmentTable;\\n import net.canarymod.hook.player.EnchantHook;\\n \\n-\\n public class ContainerEnchantment extends Container {\\n \\n public IInventory a = new SlotEnchantmentTable(this, \\\"Enchant\\\", true, 1);\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerEnchantment.java\",\n \"sha\": \"071c3e00d24930786d520416bea58178fc105527\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventory.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventory.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/ContainerHorseInventory.java\",\n \"new_code\": \" if (entityhorse.ce()) {\\n return this.a.a(entityplayer) && this.f.S() && this.f.d((Entity) entityplayer) < 8.0F;\\n } else if (this.a(1).a(itemstack1) && !this.a(1).e()) {\",\n \"new_methods\": [],\n \"old_code\": \" if (entityhorse.ca()) {\\n return this.a.a(entityplayer) && this.f.d(entityplayer) < 8.0F;\\n } else if (this.a(1).a(itemstack1)) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -20,7 +20,7 @@ public ContainerHorseInventory(IInventory iinventory, IInventory iinventory1, En\\n int i1;\\n int i2;\\n \\n- if (entityhorse.ca()) {\\n+ if (entityhorse.ce()) {\\n for (i1 = 0; i1 < b0; ++i1) {\\n for (i2 = 0; i2 < 5; ++i2) {\\n this.a(new Slot(iinventory1, 2 + i2 + i1 * 5, 80 + i2 * 18, 18 + i1 * 18));\\n@@ -40,7 +40,7 @@ public ContainerHorseInventory(IInventory iinventory, IInventory iinventory1, En\\n }\\n \\n public boolean a(EntityPlayer entityplayer) {\\n- return this.a.a(entityplayer) && this.f.d(entityplayer) < 8.0F;\\n+ return this.a.a(entityplayer) && this.f.S() && this.f.d((Entity) entityplayer) < 8.0F;\\n }\\n \\n public ItemStack b(EntityPlayer entityplayer, int i0) {\\n@@ -55,7 +55,7 @@ public ItemStack b(EntityPlayer entityplayer, int i0) {\\n if (!this.a(itemstack1, this.a.j_(), this.c.size(), true)) {\\n return null;\\n }\\n- } else if (this.a(1).a(itemstack1)) {\\n+ } else if (this.a(1).a(itemstack1) && !this.a(1).e()) {\\n if (!this.a(itemstack1, 1, 2, false)) {\\n return null;\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventory.java\",\n \"sha\": \"e9ee4a038908ec4316ed7e906d980ca944338ee1\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventorySlotArmor.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventorySlotArmor.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/ContainerHorseInventorySlotArmor.java\",\n \"new_code\": \" return super.a(itemstack) && this.a.cv() && EntityHorse.v(itemstack.d);\",\n \"new_methods\": [],\n \"old_code\": \" return super.a(itemstack) && this.a.cr() && EntityHorse.v(itemstack.d) && !this.e();\",\n \"old_methods\": [],\n \"patch\": \"@@ -13,6 +13,6 @@ public class ContainerHorseInventorySlotArmor extends Slot { // CanaryMod: packa\\n }\\n \\n public boolean a(ItemStack itemstack) {\\n- return super.a(itemstack) && this.a.cr() && EntityHorse.v(itemstack.d) && !this.e();\\n+ return super.a(itemstack) && this.a.cv() && EntityHorse.v(itemstack.d);\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerHorseInventorySlotArmor.java\",\n \"sha\": \"aa33a84977ccb68d0740b6a3d57ff07cecf90e91\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerMerchant.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerMerchant.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/ContainerMerchant.java\",\n \"new_code\": \" entityplayer.b(itemstack);\",\n \"new_methods\": [],\n \"old_code\": \" entityplayer.c(itemstack);\",\n \"old_methods\": [],\n \"patch\": \"@@ -107,7 +107,7 @@ public void b(EntityPlayer entityplayer) {\\n \\n itemstack = this.f.a_(1);\\n if (itemstack != null) {\\n- entityplayer.c(itemstack);\\n+ entityplayer.b(itemstack);\\n }\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerMerchant.java\",\n \"sha\": \"250db67406c90e89a23ade29921663944450ced5\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerPlayer.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerPlayer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/ContainerPlayer.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \" // MERGE: This might contain wrong calls! - Chris\",\n \"old_methods\": [],\n \"patch\": \"@@ -46,7 +46,6 @@ public ContainerPlayer(InventoryPlayer inventoryplayer, boolean flag0, EntityPla\\n }\\n \\n public void a(IInventory iinventory) {\\n- // MERGE: This might contain wrong calls! - Chris\\n ItemStack result = CraftingManager.a().a(this.a, this.h.q);\\n \\n // CanaryMod: Send custom recipe results to client\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerPlayer.java\",\n \"sha\": \"2c66131b115532aa54f8a6356d3399d0edc07ee5\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerRepairINNER2.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerRepairINNER2.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/ContainerRepairINNER2.java\",\n \"new_code\": \" if (!entityplayer.bG.d && !this.a.I && this.a.a(this.b, this.c, this.d) == Block.cm.cF && entityplayer.aC().nextFloat() < 0.12F) {\",\n \"new_methods\": [],\n \"old_code\": \" if (!entityplayer.bG.d && !this.a.I && this.a.a(this.b, this.c, this.d) == Block.cm.cF && entityplayer.aB().nextFloat() < 0.12F) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -49,7 +49,7 @@ public void a(EntityPlayer entityplayer, ItemStack itemstack) {\\n }\\n \\n this.e.a = 0;\\n- if (!entityplayer.bG.d && !this.a.I && this.a.a(this.b, this.c, this.d) == Block.cm.cF && entityplayer.aB().nextFloat() < 0.12F) {\\n+ if (!entityplayer.bG.d && !this.a.I && this.a.a(this.b, this.c, this.d) == Block.cm.cF && entityplayer.aC().nextFloat() < 0.12F) {\\n int i0 = this.a.h(this.b, this.c, this.d);\\n int i1 = i0 & 3;\\n int i2 = i0 >> 2;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerRepairINNER2.java\",\n \"sha\": \"c05fd463053c08fe7dce86f56e2ec65dc06e0971\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerWorkbench.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerWorkbench.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/ContainerWorkbench.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,11 +1,9 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.inventory.CanaryItem;\\n import net.canarymod.api.world.blocks.CanaryWorkbench;\\n import net.canarymod.hook.player.CraftHook;\\n \\n-\\n public class ContainerWorkbench extends Container {\\n \\n public InventoryCrafting a = new InventoryCrafting(this, 3, 3);\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FContainerWorkbench.java\",\n \"sha\": \"c537c5f988dfffb3f5f9ad5517e04ee6e00b6f30\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCraftingManager.java\",\n \"changes\": 3,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCraftingManager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/CraftingManager.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n this.a(new ItemStack(Block.cB, 1), new Object[]{ \\\"###\\\", \\\"###\\\", \\\"###\\\", Character.valueOf('#'), Item.V });\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,12 +1,10 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.ArrayList;\\n import java.util.Collections;\\n import java.util.HashMap;\\n import java.util.List;\\n \\n-\\n public class CraftingManager {\\n \\n private static final CraftingManager a = new CraftingManager();\\n@@ -38,7 +36,6 @@ private CraftingManager() {\\n this.a(new ItemStack(Block.bA, 1), new Object[]{ \\\"#W#\\\", \\\"#W#\\\", Character.valueOf('#'), Item.F, Character.valueOf('W'), Block.C });\\n this.a(new ItemStack(Block.bd, 1), new Object[]{ \\\"###\\\", \\\"#X#\\\", \\\"###\\\", Character.valueOf('#'), Block.C, Character.valueOf('X'), Item.p });\\n this.a(new ItemStack(Item.ch, 2), new Object[]{ \\\"~~ \\\", \\\"~O \\\", \\\" ~\\\", Character.valueOf('~'), Item.M, Character.valueOf('O'), Item.aO });\\n- this.a(new ItemStack(Block.cB, 1), new Object[]{ \\\"###\\\", \\\"###\\\", \\\"###\\\", Character.valueOf('#'), Item.V });\\n this.a(new ItemStack(Block.W, 1), new Object[]{ \\\"###\\\", \\\"#X#\\\", \\\"###\\\", Character.valueOf('#'), Block.C, Character.valueOf('X'), Item.aE });\\n this.a(new ItemStack(Block.as, 1), new Object[]{ \\\"###\\\", \\\"XXX\\\", \\\"###\\\", Character.valueOf('#'), Block.C, Character.valueOf('X'), Item.aN });\\n this.a(new ItemStack(Block.aZ, 1), new Object[]{ \\\"##\\\", \\\"##\\\", Character.valueOf('#'), Item.aF });\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FCraftingManager.java\",\n \"sha\": \"6d870b89c8d00b729befca51f378f7f143a9ef8d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 6,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDamageSource.java\",\n \"changes\": 10,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDamageSource.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 4,\n \"filename\": \"src/main/java/net/minecraft/server/DamageSource.java\",\n \"new_code\": \"\\n EntityLivingBase entitylivingbase1 = entitylivingbase.aR();\\n return entitylivingbase1 != null && StatCollector.b(s1) ? ChatMessageComponent.b(s1, new Object[]{ entitylivingbase.ax(), entitylivingbase1.ax() }) : ChatMessageComponent.b(s0, new Object[]{ entitylivingbase.ax() });\\n * \\n * \\n * \",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n EntityLivingBase entitylivingbase1 = entitylivingbase.aO();\\n return entitylivingbase1 != null && StatCollector.b(s1) ? ChatMessageComponent.b(s1, new Object[]{ entitylivingbase.aw(), entitylivingbase1.aw() }) : ChatMessageComponent.b(s0, new Object[]{ entitylivingbase.aw() });\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.CanaryDamageSource;\\n \\n-\\n public class DamageSource {\\n \\n public static DamageSource a = (new DamageSource(\\\"inFire\\\")).l();\\n@@ -32,6 +30,7 @@ public class DamageSource {\\n \\n // CanaryMod\\n protected CanaryDamageSource damageSource;\\n+\\n public static DamageSource a(EntityLivingBase entitylivingbase) {\\n return new EntityDamageSource(\\\"mob\\\", entitylivingbase);\\n }\\n@@ -124,11 +123,11 @@ protected DamageSource l() {\\n }\\n \\n public ChatMessageComponent b(EntityLivingBase entitylivingbase) {\\n- EntityLivingBase entitylivingbase1 = entitylivingbase.aO();\\n+ EntityLivingBase entitylivingbase1 = entitylivingbase.aR();\\n String s0 = \\\"death.attack.\\\" + this.o;\\n String s1 = s0 + \\\".player\\\";\\n \\n- return entitylivingbase1 != null && StatCollector.b(s1) ? ChatMessageComponent.b(s1, new Object[]{ entitylivingbase.aw(), entitylivingbase1.aw() }) : ChatMessageComponent.b(s0, new Object[]{ entitylivingbase.aw() });\\n+ return entitylivingbase1 != null && StatCollector.b(s1) ? ChatMessageComponent.b(s1, new Object[]{ entitylivingbase.ax(), entitylivingbase1.ax() }) : ChatMessageComponent.b(s0, new Object[]{ entitylivingbase.ax() });\\n }\\n \\n public boolean m() {\\n@@ -159,6 +158,7 @@ public DamageSource r() {\\n \\n /**\\n * Gets the CanaryMod damagesource wrapper\\n+ * \\n * @return\\n */\\n public CanaryDamageSource getCanaryDamageSource() {\\n@@ -167,6 +167,7 @@ public CanaryDamageSource getCanaryDamageSource() {\\n \\n /**\\n * Set hunger damage\\n+ * \\n * @param f\\n */\\n public void setHungerDamage(float f) {\\n@@ -175,6 +176,7 @@ public void setHungerDamage(float f) {\\n \\n /**\\n * Set unblockable\\n+ * \\n * @param b\\n */\\n public void setUnblockable(boolean b) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDamageSource.java\",\n \"sha\": \"f5895ba7f526da9b005699fd4ffa683b146b2f16\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 31,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedPlayerList.java\",\n \"changes\": 62,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedPlayerList.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 31,\n \"filename\": \"src/main/java/net/minecraft/server/DedicatedPlayerList.java\",\n \"new_code\": \" // CanaryMod removed whitelist\\n // CanaryMod re-route to our whitelist\\n // Canary, re-route to our whitelist\\n // Load whitelist\\n // try {\\n // this.h().clear();\\n // BufferedReader bufferedreader = new BufferedReader(new FileReader(this.e));\\n // String s0 = \\\"\\\";\\n //\\n // while ((s0 = bufferedreader.readLine()) != null) {\\n // this.h().add(s0.trim().toLowerCase());\\n // }\\n //\\n // bufferedreader.close();\\n // } catch (Exception exception) {\\n // this.s().an().b(\\\"Failed to load white-list: \\\" + exception);\\n // }\\n // try {\\n // PrintWriter printwriter = new PrintWriter(new FileWriter(this.e, false));\\n // Iterator iterator = this.h().iterator();\\n //\\n // while (iterator.hasNext()) {\\n // String s0 = (String) iterator.next();\\n //\\n // printwriter.println(s0);\\n // }\\n //\\n // printwriter.close();\\n // } catch (Exception exception) {\\n // this.s().an().b(\\\"Failed to save white-list: \\\" + exception);\\n // }\",\n \"new_methods\": [],\n \"old_code\": \" // CanaryMod removed whitelist\\n //CanaryMod re-route to our whitelist\\n //Canary, re-route to our whitelist\\n //Load whitelist\\n// try {\\n// this.h().clear();\\n// BufferedReader bufferedreader = new BufferedReader(new FileReader(this.e));\\n// String s0 = \\\"\\\";\\n//\\n// while ((s0 = bufferedreader.readLine()) != null) {\\n// this.h().add(s0.trim().toLowerCase());\\n// }\\n//\\n// bufferedreader.close();\\n// } catch (Exception exception) {\\n// this.s().an().b(\\\"Failed to load white-list: \\\" + exception);\\n// }\\n// try {\\n// PrintWriter printwriter = new PrintWriter(new FileWriter(this.e, false));\\n// Iterator iterator = this.h().iterator();\\n//\\n// while (iterator.hasNext()) {\\n// String s0 = (String) iterator.next();\\n//\\n// printwriter.println(s0);\\n// }\\n//\\n// printwriter.close();\\n// } catch (Exception exception) {\\n// this.s().an().b(\\\"Failed to save white-list: \\\" + exception);\\n// }\",\n \"old_methods\": [],\n \"patch\": \"@@ -5,7 +5,7 @@\\n \\n public class DedicatedPlayerList extends ServerConfigurationManager {\\n \\n- // CanaryMod removed whitelist\\n+ // CanaryMod removed whitelist\\n // CanaryMod: removed ops\\n \\n public DedicatedPlayerList(DedicatedServer dedicatedserver) {\\n@@ -31,17 +31,17 @@ public void c(String s0) {\\n }\\n \\n public void h(String s0) {\\n- //CanaryMod re-route to our whitelist\\n+ // CanaryMod re-route to our whitelist\\n Canary.whitelist().removePlayer(s0);\\n }\\n \\n public void g(String s0) {\\n- //Canary, re-route to our whitelist\\n+ // Canary, re-route to our whitelist\\n Canary.whitelist().addPlayer(s0);\\n }\\n \\n public void j() {\\n- //Load whitelist\\n+ // Load whitelist\\n throw new UnsupportedOperationException(\\\"Minecraft whitelist is disabled! Cannot load\\\");\\n }\\n \\n@@ -79,36 +79,36 @@ private void u() {\\n }\\n \\n private void v() {\\n-// try {\\n-// this.h().clear();\\n-// BufferedReader bufferedreader = new BufferedReader(new FileReader(this.e));\\n-// String s0 = \\\"\\\";\\n-//\\n-// while ((s0 = bufferedreader.readLine()) != null) {\\n-// this.h().add(s0.trim().toLowerCase());\\n-// }\\n-//\\n-// bufferedreader.close();\\n-// } catch (Exception exception) {\\n-// this.s().an().b(\\\"Failed to load white-list: \\\" + exception);\\n-// }\\n+ // try {\\n+ // this.h().clear();\\n+ // BufferedReader bufferedreader = new BufferedReader(new FileReader(this.e));\\n+ // String s0 = \\\"\\\";\\n+ //\\n+ // while ((s0 = bufferedreader.readLine()) != null) {\\n+ // this.h().add(s0.trim().toLowerCase());\\n+ // }\\n+ //\\n+ // bufferedreader.close();\\n+ // } catch (Exception exception) {\\n+ // this.s().an().b(\\\"Failed to load white-list: \\\" + exception);\\n+ // }\\n }\\n \\n private void w() {\\n-// try {\\n-// PrintWriter printwriter = new PrintWriter(new FileWriter(this.e, false));\\n-// Iterator iterator = this.h().iterator();\\n-//\\n-// while (iterator.hasNext()) {\\n-// String s0 = (String) iterator.next();\\n-//\\n-// printwriter.println(s0);\\n-// }\\n-//\\n-// printwriter.close();\\n-// } catch (Exception exception) {\\n-// this.s().an().b(\\\"Failed to save white-list: \\\" + exception);\\n-// }\\n+ // try {\\n+ // PrintWriter printwriter = new PrintWriter(new FileWriter(this.e, false));\\n+ // Iterator iterator = this.h().iterator();\\n+ //\\n+ // while (iterator.hasNext()) {\\n+ // String s0 = (String) iterator.next();\\n+ //\\n+ // printwriter.println(s0);\\n+ // }\\n+ //\\n+ // printwriter.close();\\n+ // } catch (Exception exception) {\\n+ // this.s().an().b(\\\"Failed to save white-list: \\\" + exception);\\n+ // }\\n }\\n \\n public boolean d(String s0) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedPlayerList.java\",\n \"sha\": \"57ec1cddc128ce776ca4e4563bde1a24bbf15fab\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedServer.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedServer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/DedicatedServer.java\",\n \"new_code\": \" this.an().a(\\\"Starting minecraft server version 1.6.2\\\");\\n // } else if (this.as().i().isEmpty()) { // CanaryMod: Empty Ops list shouldn't break spawn protections...\",\n \"new_methods\": [],\n \"old_code\": \" this.an().a(\\\"Starting minecraft server version 1.6.1\\\");\\n // } else if (this.ao().i().isEmpty()) { // CanaryMod: Empty Ops list shouldn't break spawn protections...\",\n \"old_methods\": [],\n \"patch\": \"@@ -38,7 +38,7 @@ protected boolean d() throws IOException {\\n \\n dedicatedservercommandthread.setDaemon(true);\\n dedicatedservercommandthread.start();\\n- this.an().a(\\\"Starting minecraft server version 1.6.1\\\");\\n+ this.an().a(\\\"Starting minecraft server version 1.6.2\\\");\\n if (Runtime.getRuntime().maxMemory() / 1024L / 1024L < 512L) {\\n this.an().b(\\\"To start the server with more ram, launch it as \\\\\\\"java -Xmx1024M -Xms1024M -jar minecraft_server.jar\\\\\\\"\\\");\\n }\\n@@ -301,7 +301,7 @@ public boolean a(World world, int i0, int i1, int i2, EntityPlayer entityplayer)\\n WorldConfiguration cfg = Configuration.getWorldConfig(world.getCanaryWorld().getFqName());\\n if (world.t.i != 0) {\\n return false;\\n- // } else if (this.ao().i().isEmpty()) { // CanaryMod: Empty Ops list shouldn't break spawn protections...\\n+ // } else if (this.as().i().isEmpty()) { // CanaryMod: Empty Ops list shouldn't break spawn protections...\\n // return false;\\n } else if (this.as().e(entityplayer.c_())) {\\n return false;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FDedicatedServer.java\",\n \"sha\": \"ec559f58ebdff77617b73c77918a4a6002b3bf22\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 59,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntity.java\",\n \"changes\": 108,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntity.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 49,\n \"filename\": \"src/main/java/net/minecraft/server/Entity.java\",\n \"new_code\": \" float f2;\\n\\n f2 = this.O;\\n if (this.O > f2 && !this.e && !this.q.I) {\\n this.d((double) (f2 - this.O), 0.0D, (double) (f2 - this.O));\\n }\\n f2 = f0 % 2.0F;\\n this.ao = this.ab();\\n if (this.ah() && !this.G()) {\\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.b), 1.0F).call();\\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.c), 4.0F).call();\\n boolean flag0 = this.F && this.ag() && this instanceof EntityPlayer;\\n if (this.aq()) {\\n String s0 = this.P();\\n String s0 = this.P();\\n nbttagcompound.a(\\\"Air\\\", (short) this.ak());\\n if (this.O()) {\\n this.b(this.u, this.v, this.w);\\n }\\n protected boolean O() {\\n return true;\\n }\\n\\n protected final String P() {\\n public void Q() {}\\n public boolean S() {\\n public boolean T() {\\n public void U() {\\n this.o.V();\\n public void V() {\\n this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\\n public double W() {\\n public double X() {\\n public float Y() {\\n public Vec3 Z() {\\n public void aa() {\\n this.ao = this.ab();\\n public int ab() {\\n public ItemStack[] ad() {\\n public boolean ae() {\\n public boolean af() {\\n public boolean ag() {\\n public boolean ah() {\\n public boolean ai() {\\n public int ak() {\\n public void al() {\\n public String am() {\\n public Entity[] an() {\\n public float ao() {\\n public boolean ap() {\\n return String.format(\\\"%s[\\\\'%s\\\\'/%d, l=\\\\'%s\\\\', x=%.2f, y=%.2f, z=%.2f]\\\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \\\"~NULL~\\\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w) });\\n public boolean aq() {\\n public int ar() {\\n public int as() {\\n public boolean at() {\\n public UUID av() {\\n public boolean aw() {\\n public String ax() {\\n return this.am();\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/Entity.java\",\n \"implementation\": \"return true;\",\n \"signature\": \"boolean O()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/Entity.java\",\n \"implementation\": \"public void Q() {\",\n \"signature\": \"String P()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/Entity.java\",\n \"implementation\": \"public boolean T() {\\n public void U() {\\n this.o.V();\\n public void V() {\\n this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\\n public double W() {\\n public double X() {\\n public float Y() {\\n public Vec3 Z() {\\n public void aa() {\\n this.ao = this.ab();\\n public int ab() {\\n public ItemStack[] ad() {\\n public boolean ae() {\\n public boolean af() {\\n public boolean ag() {\\n public boolean ah() {\\n public boolean ai() {\\n public int ak() {\\n public void al() {\\n public String am() {\\n public Entity[] an() {\\n public float ao() {\\n public boolean ap() {\\n return String.format(\\\"%s[\\\\'%s\\\\'/%d, l=\\\\'%s\\\\', x=%.2f, y=%.2f, z=%.2f]\\\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \\\"~NULL~\\\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)\",\n \"signature\": \"boolean S()\"\n }\n ],\n \"old_code\": \" float f2 = f0 % 2.0F;\\n\\n this.ao = this.aa();\\n if (this.ag() && !this.G()) {\\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.b), 1).call();\\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.c), 4).call();\\n boolean flag0 = this.F && this.af() && this instanceof EntityPlayer;\\n if (this.ap()) {\\n String s0 = this.O();\\n String s0 = this.O();\\n nbttagcompound.a(\\\"Air\\\", (short) this.aj());\\n protected final String O() {\\n public void P() {}\\n public boolean R() {\\n public boolean S() {\\n public void T() {\\n this.o.U();\\n this.A = (float) ((double) this.A + d0);\\n this.B = (float) ((double) this.B + d1);\\n public void U() {\\n this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\\n public double V() {\\n public double W() {\\n public float X() {\\n public Vec3 Y() {\\n public void Z() {\\n this.ao = this.aa();\\n public int aa() {\\n public ItemStack[] ac() {\\n public boolean ad() {\\n public boolean ae() {\\n public boolean af() {\\n public boolean ag() {\\n public boolean ah() {\\n public int aj() {\\n public void ak() {\\n public String al() {\\n public Entity[] am() {\\n public float an() {\\n public boolean ao() {\\n return String.format(\\\"%s[\\\\'%s\\\\'/%d, l=\\\\'%s\\\\', x=%.2f, y=%.2f, z=%.2f]\\\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \\\"~NULL~\\\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w) });\\n public boolean ap() {\\n public int aq() {\\n public int ar() {\\n public boolean as() {\\n public UUID au() {\\n public boolean av() {\\n public String aw() {\\n return this.al();\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/Entity.java\",\n \"implementation\": \"public void P() {\",\n \"signature\": \"String O()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/Entity.java\",\n \"implementation\": \"public boolean S() {\\n public void T() {\\n this.o.U();\\n this.A = (float) ((double) this.A + d0);\\n this.B = (float) ((double) this.B + d1);\\n public void U() {\\n this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\\n public double V() {\\n public double W() {\\n public float X() {\\n public Vec3 Y() {\\n public void Z() {\\n this.ao = this.aa();\\n public int aa() {\\n public ItemStack[] ac() {\\n public boolean ad() {\\n public boolean ae() {\\n public boolean af() {\\n public boolean ag() {\\n public boolean ah() {\\n public int aj() {\\n public void ak() {\\n public String al() {\\n public Entity[] am() {\\n public float an() {\\n public boolean ao() {\\n return String.format(\\\"%s[\\\\'%s\\\\'/%d, l=\\\\'%s\\\\', x=%.2f, y=%.2f, z=%.2f]\\\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \\\"~NULL~\\\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)\",\n \"signature\": \"boolean R()\"\n }\n ],\n \"patch\": \"@@ -157,16 +157,21 @@ public void w() {\\n }\\n \\n protected void a(float f0, float f1) {\\n+ float f2;\\n+\\n if (f0 != this.O || f1 != this.P) {\\n+ f2 = this.O;\\n this.O = f0;\\n this.P = f1;\\n this.E.d = this.E.a + (double) this.O;\\n this.E.f = this.E.c + (double) this.O;\\n this.E.e = this.E.b + (double) this.P;\\n+ if (this.O > f2 && !this.e && !this.q.I) {\\n+ this.d((double) (f2 - this.O), 0.0D, (double) (f2 - this.O));\\n+ }\\n }\\n \\n- float f2 = f0 % 2.0F;\\n-\\n+ f2 = f0 % 2.0F;\\n if ((double) f2 < 0.375D) {\\n this.at = EnumEntitySize.a;\\n } else if ((double) f2 < 0.75D) {\\n@@ -224,7 +229,7 @@ public void x() {\\n if (Configuration.getWorldConfig(getCanaryWorld().getFqName()).isNetherAllowed()) {\\n if (this.o == null && this.aq++ >= i0) {\\n this.aq = i0;\\n- this.ao = this.aa();\\n+ this.ao = this.ab();\\n byte b0;\\n \\n if (this.q.t.i == -1) {\\n@@ -255,7 +260,7 @@ public void x() {\\n this.q.C.b();\\n }\\n \\n- if (this.ag() && !this.G()) {\\n+ if (this.ah() && !this.G()) {\\n int i1 = MathHelper.c(this.u);\\n \\n i0 = MathHelper.c(this.v - 0.20000000298023224D - (double) this.N);\\n@@ -279,7 +284,7 @@ public void x() {\\n } else {\\n if (this.d % 20 == 0) {\\n // CanaryMod: call DamageHook (FireTick)\\n- DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.b), 1).call();\\n+ DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.b), 1.0F).call();\\n if (!hook.isCanceled()) {\\n this.a((((CanaryDamageSource) hook.getDamageSource()).getHandle()), hook.getDamageDealt());\\n }\\n@@ -314,7 +319,7 @@ public int y() {\\n protected void z() {\\n if (!this.ag) {\\n // CanaryMod: call DamageHook (Lava)\\n- DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.c), 4).call();\\n+ DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.c), 4.0F).call();\\n if (!hook.isCanceled()) {\\n this.a((((CanaryDamageSource) hook.getDamageSource()).getHandle()), hook.getDamageDealt());\\n this.d(15);\\n@@ -374,7 +379,7 @@ public void d(double d0, double d1, double d2) {\\n double d7 = d1;\\n double d8 = d2;\\n AxisAlignedBB axisalignedbb = this.E.c();\\n- boolean flag0 = this.F && this.af() && this instanceof EntityPlayer;\\n+ boolean flag0 = this.F && this.ag() && this instanceof EntityPlayer;\\n \\n if (flag0) {\\n double d9;\\n@@ -928,7 +933,7 @@ protected void J() {\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n this.J();\\n@@ -947,7 +952,7 @@ public boolean L() {\\n public void b(Entity entity, int i0) {}\\n \\n public boolean c(NBTTagCompound nbttagcompound) {\\n- String s0 = this.O();\\n+ String s0 = this.P();\\n \\n if (!this.M && s0 != null) {\\n nbttagcompound.a(\\\"id\\\", s0);\\n@@ -959,7 +964,7 @@ public boolean c(NBTTagCompound nbttagcompound) {\\n }\\n \\n public boolean d(NBTTagCompound nbttagcompound) {\\n- String s0 = this.O();\\n+ String s0 = this.P();\\n \\n if (!this.M && s0 != null && this.n == null) {\\n nbttagcompound.a(\\\"id\\\", s0);\\n@@ -977,7 +982,7 @@ public void e(NBTTagCompound nbttagcompound) {\\n nbttagcompound.a(\\\"Rotation\\\", (NBTBase) this.a(new float[]{ this.A, this.B }));\\n nbttagcompound.a(\\\"FallDistance\\\", this.T);\\n nbttagcompound.a(\\\"Fire\\\", (short) this.d);\\n- nbttagcompound.a(\\\"Air\\\", (short) this.aj());\\n+ nbttagcompound.a(\\\"Air\\\", (short) this.ak());\\n nbttagcompound.a(\\\"OnGround\\\", this.F);\\n nbttagcompound.a(\\\"Dimension\\\", this.ar);\\n nbttagcompound.a(\\\"Invulnerable\\\", this.h);\\n@@ -1050,6 +1055,9 @@ public void f(NBTTagCompound nbttagcompound) {\\n this.metadata = nbttagcompound.b(\\\"Canary\\\") ? new CanaryCompoundTag(nbttagcompound.l(\\\"Canary\\\")) : new CanaryCompoundTag(\\\"Canary\\\");\\n // CanaryMod: END\\n this.a(nbttagcompound);\\n+ if (this.O()) {\\n+ this.b(this.u, this.v, this.w);\\n+ }\\n } catch (Throwable throwable) {\\n CrashReport crashreport = CrashReport.a(throwable, \\\"Loading entity NBT\\\");\\n CrashReportCategory crashreportcategory = crashreport.a(\\\"Entity being loaded\\\");\\n@@ -1059,15 +1067,19 @@ public void f(NBTTagCompound nbttagcompound) {\\n }\\n }\\n \\n- protected final String O() {\\n+ protected boolean O() {\\n+ return true;\\n+ }\\n+\\n+ protected final String P() {\\n return EntityList.b(this);\\n }\\n \\n protected abstract void a(NBTTagCompound nbttagcompound);\\n \\n protected abstract void b(NBTTagCompound nbttagcompound);\\n \\n- public void P() {}\\n+ public void Q() {}\\n \\n protected NBTTagList a(double... adouble) {\\n NBTTagList nbttaglist = new NBTTagList();\\n@@ -1117,11 +1129,11 @@ public EntityItem a(ItemStack itemstack, float f0) {\\n }\\n }\\n \\n- public boolean R() {\\n+ public boolean S() {\\n return !this.M;\\n }\\n \\n- public boolean S() {\\n+ public boolean T() {\\n for (int i0 = 0; i0 < 8; ++i0) {\\n float f0 = ((float) ((i0 >> 0) % 2) - 0.5F) * this.O * 0.8F;\\n float f1 = ((float) ((i0 >> 1) % 2) - 0.5F) * 0.1F;\\n@@ -1146,7 +1158,7 @@ public AxisAlignedBB g(Entity entity) {\\n return null;\\n }\\n \\n- public void T() {\\n+ public void U() {\\n if (this.o.M) {\\n this.o = null;\\n } else {\\n@@ -1155,7 +1167,7 @@ public void T() {\\n this.z = 0.0D;\\n this.l_();\\n if (this.o != null) {\\n- this.o.U();\\n+ this.o.V();\\n this.g += (double) (this.o.A - this.o.C);\\n \\n for (this.f += (double) (this.o.B - this.o.D); this.g >= 180.0D; this.g -= 360.0D) {\\n@@ -1196,23 +1208,21 @@ public void T() {\\n \\n this.g -= d0;\\n this.f -= d1;\\n- this.A = (float) ((double) this.A + d0);\\n- this.B = (float) ((double) this.B + d1);\\n }\\n }\\n }\\n \\n- public void U() {\\n+ public void V() {\\n if (this.n != null) {\\n- this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\\n+ this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\\n }\\n }\\n \\n- public double V() {\\n+ public double W() {\\n return (double) this.N;\\n }\\n \\n- public double W() {\\n+ public double X() {\\n return (double) this.P * 0.75D;\\n }\\n \\n@@ -1244,17 +1254,17 @@ public void a(Entity entity) {\\n }\\n }\\n \\n- public float X() {\\n+ public float Y() {\\n return 0.1F;\\n }\\n \\n- public Vec3 Y() {\\n+ public Vec3 Z() {\\n return null;\\n }\\n \\n- public void Z() {\\n+ public void aa() {\\n if (this.ao > 0) {\\n- this.ao = this.aa();\\n+ this.ao = this.ab();\\n } else {\\n double d0 = this.r - this.u;\\n double d1 = this.t - this.w;\\n@@ -1267,41 +1277,41 @@ public void Z() {\\n }\\n }\\n \\n- public int aa() {\\n+ public int ab() {\\n return 900;\\n }\\n \\n- public ItemStack[] ac() {\\n+ public ItemStack[] ad() {\\n return null;\\n }\\n \\n public void c(int i0, ItemStack itemstack) {}\\n \\n- public boolean ad() {\\n+ public boolean ae() {\\n return !this.ag && (this.d > 0 || this.f(0));\\n }\\n \\n- public boolean ae() {\\n+ public boolean af() {\\n return this.o != null;\\n }\\n \\n- public boolean af() {\\n+ public boolean ag() {\\n return this.f(1);\\n }\\n \\n public void b(boolean flag0) {\\n this.a(1, flag0);\\n }\\n \\n- public boolean ag() {\\n+ public boolean ah() {\\n return this.f(3);\\n }\\n \\n public void c(boolean flag0) {\\n this.a(3, flag0);\\n }\\n \\n- public boolean ah() {\\n+ public boolean ai() {\\n return this.f(5);\\n }\\n \\n@@ -1327,7 +1337,7 @@ protected void a(int i0, boolean flag0) {\\n }\\n }\\n \\n- public int aj() {\\n+ public int ak() {\\n return this.ah.b(1);\\n }\\n \\n@@ -1421,12 +1431,12 @@ protected boolean i(double d0, double d1, double d2) {\\n }\\n }\\n \\n- public void ak() {\\n+ public void al() {\\n this.K = true;\\n this.T = 0.0F;\\n }\\n \\n- public String al() {\\n+ public String am() {\\n String s0 = EntityList.b(this);\\n \\n if (s0 == null) {\\n@@ -1436,19 +1446,19 @@ public String al() {\\n return StatCollector.a(\\\"entity.\\\" + s0 + \\\".name\\\");\\n }\\n \\n- public Entity[] am() {\\n+ public Entity[] an() {\\n return null;\\n }\\n \\n public boolean h(Entity entity) {\\n return this == entity;\\n }\\n \\n- public float an() {\\n+ public float ao() {\\n return 0.0F;\\n }\\n \\n- public boolean ao() {\\n+ public boolean ap() {\\n return true;\\n }\\n \\n@@ -1457,10 +1467,10 @@ public boolean i(Entity entity) {\\n }\\n \\n public String toString() {\\n- return String.format(\\\"%s[\\\\'%s\\\\'/%d, l=\\\\'%s\\\\', x=%.2f, y=%.2f, z=%.2f]\\\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \\\"~NULL~\\\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w) });\\n+ return String.format(\\\"%s[\\\\'%s\\\\'/%d, l=\\\\'%s\\\\', x=%.2f, y=%.2f, z=%.2f]\\\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \\\"~NULL~\\\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w) });\\n }\\n \\n- public boolean ap() {\\n+ public boolean aq() {\\n return this.h;\\n }\\n \\n@@ -1528,15 +1538,15 @@ public boolean a(Explosion explosion, World world, int i0, int i1, int i2, int i\\n return true;\\n }\\n \\n- public int aq() {\\n+ public int ar() {\\n return 3;\\n }\\n \\n- public int ar() {\\n+ public int as() {\\n return this.as;\\n }\\n \\n- public boolean as() {\\n+ public boolean at() {\\n return false;\\n }\\n \\n@@ -1549,16 +1559,16 @@ public void a(CrashReportCategory crashreportcategory) {\\n crashreportcategory.a(\\\"Entity\\\\'s Momentum\\\", String.format(\\\"%.2f, %.2f, %.2f\\\", new Object[]{ Double.valueOf(this.x), Double.valueOf(this.y), Double.valueOf(this.z) }));\\n }\\n \\n- public UUID au() {\\n+ public UUID av() {\\n return this.i;\\n }\\n \\n- public boolean av() {\\n+ public boolean aw() {\\n return true;\\n }\\n \\n- public String aw() {\\n- return this.al();\\n+ public String ax() {\\n+ return this.am();\\n }\\n \\n /**\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntity.java\",\n \"sha\": \"7e8584c1fbdbbc17a378632855cc0c0f9d83309d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityArrow.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityArrow.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/EntityArrow.java\",\n \"new_code\": \" if (this.ae() && !(movingobjectposition.g instanceof EntityEnderman)) {\\n entitylivingbase.m(entitylivingbase.aT() + 1);\\n public boolean ap() {\",\n \"new_methods\": [],\n \"old_code\": \" if (this.ad() && !(movingobjectposition.g instanceof EntityEnderman)) {\\n entitylivingbase.m(entitylivingbase.aQ() + 1);\\n public boolean ao() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -226,7 +226,7 @@ public void l_() {\\n damagesource = DamageSource.a(this, this.c);\\n }\\n \\n- if (this.ad() && !(movingobjectposition.g instanceof EntityEnderman)) {\\n+ if (this.ae() && !(movingobjectposition.g instanceof EntityEnderman)) {\\n movingobjectposition.g.d(5);\\n }\\n \\n@@ -235,7 +235,7 @@ public void l_() {\\n EntityLivingBase entitylivingbase = (EntityLivingBase) movingobjectposition.g;\\n \\n if (!this.q.I) {\\n- entitylivingbase.m(entitylivingbase.aQ() + 1);\\n+ entitylivingbase.m(entitylivingbase.aT() + 1);\\n }\\n \\n if (this.aw > 0) {\\n@@ -404,7 +404,7 @@ public void a(int i0) {\\n this.aw = i0;\\n }\\n \\n- public boolean ao() {\\n+ public boolean ap() {\\n return false;\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityArrow.java\",\n \"sha\": \"d3a81e844d7176417e4082bebe49b73d989abd6a\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 20,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBat.java\",\n \"changes\": 40,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBat.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 20,\n \"filename\": \"src/main/java/net/minecraft/server/EntityBat.java\",\n \"new_code\": \" protected float aZ() {\\n protected float ba() {\\n return super.ba() * 0.95F;\\n return this.bJ() && this.ab.nextInt(4) != 0 ? null : \\\"mob.bat.idle\\\";\\n protected String aN() {\\n protected String aO() {\\n protected void bi() {}\\n protected void ay() {\\n super.ay();\\n public boolean bJ() {\\n protected boolean be() {\\n if (this.bJ()) {\\n protected void bh() {\\n super.bh();\\n if (this.bJ()) {\\n public boolean at() {\\n if (this.aq()) {\\n if (!this.q.I && this.bJ()) {\\n public boolean bs() {\\n return i3 > this.ab.nextInt(b0) ? false : super.bs();\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityBat.java\",\n \"implementation\": \"protected float ba() {\\n return super.ba() * 0.95F;\\n return this.bJ() && this.ab.nextInt(4) != 0 ? null : \\\"mob.bat.idle\\\";\\n protected String aN() {\\n protected String aO() {\\n protected void bi() {\",\n \"signature\": \"float aZ()\"\n }\n ],\n \"old_code\": \" protected float aW() {\\n protected float aX() {\\n return super.aX() * 0.95F;\\n return this.bF() && this.ab.nextInt(4) != 0 ? null : \\\"mob.bat.idle\\\";\\n protected String aK() {\\n protected String aL() {\\n protected void bf() {}\\n protected void ax() {\\n super.ax();\\n public boolean bF() {\\n protected boolean bb() {\\n if (this.bF()) {\\n protected void be() {\\n super.be();\\n if (this.bF()) {\\n public boolean as() {\\n if (this.ap()) {\\n if (!this.q.I && this.bF()) {\\n public boolean bo() {\\n return i3 > this.ab.nextInt(b0) ? false : super.bo();\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityBat.java\",\n \"implementation\": \"protected float aX() {\\n return super.aX() * 0.95F;\\n return this.bF() && this.ab.nextInt(4) != 0 ? null : \\\"mob.bat.idle\\\";\\n protected String aK() {\\n protected String aL() {\\n protected void bf() {\",\n \"signature\": \"float aW()\"\n }\n ],\n \"patch\": \"@@ -19,23 +19,23 @@ protected void a() {\\n this.ah.a(16, new Byte((byte) 0));\\n }\\n \\n- protected float aW() {\\n+ protected float aZ() {\\n return 0.1F;\\n }\\n \\n- protected float aX() {\\n- return super.aX() * 0.95F;\\n+ protected float ba() {\\n+ return super.ba() * 0.95F;\\n }\\n \\n protected String r() {\\n- return this.bF() && this.ab.nextInt(4) != 0 ? null : \\\"mob.bat.idle\\\";\\n+ return this.bJ() && this.ab.nextInt(4) != 0 ? null : \\\"mob.bat.idle\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.bat.hurt\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.bat.death\\\";\\n }\\n \\n@@ -45,14 +45,14 @@ public boolean L() {\\n \\n protected void n(Entity entity) {}\\n \\n- protected void bf() {}\\n+ protected void bi() {}\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(6.0D);\\n }\\n \\n- public boolean bF() {\\n+ public boolean bJ() {\\n return (this.ah.a(16) & 1) != 0;\\n }\\n \\n@@ -66,23 +66,23 @@ public void a(boolean flag0) {\\n }\\n }\\n \\n- protected boolean bb() {\\n+ protected boolean be() {\\n return true;\\n }\\n \\n public void l_() {\\n super.l_();\\n- if (this.bF()) {\\n+ if (this.bJ()) {\\n this.x = this.y = this.z = 0.0D;\\n this.v = (double) MathHelper.c(this.v) + 1.0D - (double) this.P;\\n } else {\\n this.y *= 0.6000000238418579D;\\n }\\n }\\n \\n- protected void be() {\\n- super.be();\\n- if (this.bF()) {\\n+ protected void bh() {\\n+ super.bh();\\n+ if (this.bJ()) {\\n if (!this.q.u(MathHelper.c(this.u), (int) this.v + 1, MathHelper.c(this.w))) {\\n this.a(false);\\n this.q.a((EntityPlayer) null, 1015, (int) this.u, (int) this.v, (int) this.w, 0);\\n@@ -131,15 +131,15 @@ protected void b(float f0) {}\\n \\n protected void a(double d0, boolean flag0) {}\\n \\n- public boolean as() {\\n+ public boolean at() {\\n return true;\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n- if (!this.q.I && this.bF()) {\\n+ if (!this.q.I && this.bJ()) {\\n this.a(false);\\n }\\n \\n@@ -157,7 +157,7 @@ public void b(NBTTagCompound nbttagcompound) {\\n nbttagcompound.a(\\\"BatFlags\\\", this.ah.a(16));\\n }\\n \\n- public boolean bo() {\\n+ public boolean bs() {\\n int i0 = MathHelper.c(this.E.b);\\n \\n if (i0 >= 63) {\\n@@ -177,7 +177,7 @@ public boolean bo() {\\n b0 = 7;\\n }\\n \\n- return i3 > this.ab.nextInt(b0) ? false : super.bo();\\n+ return i3 > this.ab.nextInt(b0) ? false : super.bs();\\n }\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBat.java\",\n \"sha\": \"b6bda0ee223c3b9107ea1d48c9cf993c4858c150\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 8,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBlaze.java\",\n \"changes\": 16,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBlaze.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 8,\n \"filename\": \"src/main/java/net/minecraft/server/EntityBlaze.java\",\n \"new_code\": \" protected void ay() {\\n super.ay();\\n protected String aN() {\\n protected String aO() {\\n if (this.bN() != null && this.bN().v + (double) this.bN().f() > this.v + (double) this.f() + (double) this.bp) {\\n public boolean ae() {\\n return this.bT();\\n public boolean bT() {\",\n \"new_methods\": [],\n \"old_code\": \" protected void ax() {\\n super.ax();\\n protected String aK() {\\n protected String aL() {\\n if (this.bJ() != null && this.bJ().v + (double) this.bJ().f() > this.v + (double) this.f() + (double) this.bp) {\\n public boolean ad() {\\n return this.bP();\\n public boolean bP() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -15,8 +15,8 @@ public EntityBlaze(World world) {\\n this.entity = new CanaryBlaze(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.e).a(6.0D);\\n }\\n \\n@@ -29,11 +29,11 @@ protected String r() {\\n return \\\"mob.blaze.breathe\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.blaze.hit\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.blaze.death\\\";\\n }\\n \\n@@ -53,7 +53,7 @@ public void c() {\\n this.bp = 0.5F + (float) this.ab.nextGaussian() * 3.0F;\\n }\\n \\n- if (this.bJ() != null && this.bJ().v + (double) this.bJ().f() > this.v + (double) this.f() + (double) this.bp) {\\n+ if (this.bN() != null && this.bN().v + (double) this.bN().f() > this.v + (double) this.f() + (double) this.bp) {\\n this.y += (0.30000001192092896D - this.y) * 0.30000001192092896D;\\n }\\n }\\n@@ -120,8 +120,8 @@ protected int s() {\\n return Item.bq.cv;\\n }\\n \\n- public boolean ad() {\\n- return this.bP();\\n+ public boolean ae() {\\n+ return this.bT();\\n }\\n \\n protected void b(boolean flag0, int i0) {\\n@@ -134,7 +134,7 @@ protected void b(boolean flag0, int i0) {\\n }\\n }\\n \\n- public boolean bP() {\\n+ public boolean bT() {\\n return (this.ah.a(16) & 1) != 0;\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBlaze.java\",\n \"sha\": \"b5c04c49945922fda6e8b42192ce97c80a9117e0\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 4,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBoat.java\",\n \"changes\": 8,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBoat.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 4,\n \"filename\": \"src/main/java/net/minecraft/server/EntityBoat.java\",\n \"new_code\": \" public double X() {\\n if (this.aq()) {\\n public void V() {\\n this.n.b(this.u + d0, this.v + this.X() + this.n.W(), this.w + d1);\",\n \"new_methods\": [],\n \"old_code\": \" public double W() {\\n if (this.ap()) {\\n public void U() {\\n this.n.b(this.u + d0, this.v + this.W() + this.n.V(), this.w + d1);\",\n \"old_methods\": [],\n \"patch\": \"@@ -69,12 +69,12 @@ public EntityBoat(World world, double d0, double d1, double d2) {\\n this.entity = new CanaryBoat(this); // CanaryMod: Wrap Entity\\n }\\n \\n- public double W() {\\n+ public double X() {\\n return (double) this.P * 0.0D - 0.30000001192092896D;\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else if (!this.q.I && !this.M) {\\n // CanaryMod: VehicleDamage\\n@@ -340,12 +340,12 @@ public void l_() {\\n }\\n }\\n \\n- public void U() {\\n+ public void V() {\\n if (this.n != null) {\\n double d0 = Math.cos((double) this.A * 3.141592653589793D / 180.0D) * 0.4D;\\n double d1 = Math.sin((double) this.A * 3.141592653589793D / 180.0D) * 0.4D;\\n \\n- this.n.b(this.u + d0, this.v + this.W() + this.n.V(), this.w + d1);\\n+ this.n.b(this.u + d0, this.v + this.X() + this.n.W(), this.w + d1);\\n }\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityBoat.java\",\n \"sha\": \"cdcfa94647c782b1bdc002f5c4c2eda8c7f8b655\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCaveSpider.java\",\n \"changes\": 8,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCaveSpider.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 5,\n \"filename\": \"src/main/java/net/minecraft/server/EntityCaveSpider.java\",\n \"new_code\": \" protected void ay() {\\n super.ay();\\n ((EntityLivingBase) entity).c(new PotionEffect(Potion.u.H, b0 * 20, 0));\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n protected void ax() {\\n super.ax();\\n ((EntityLivingBase) entity).d(new PotionEffect(Potion.u.H, b0 * 20, 0));\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.living.monster.CanaryCaveSpider;\\n \\n-\\n public class EntityCaveSpider extends EntitySpider {\\n \\n public EntityCaveSpider(World world) {\\n@@ -12,8 +10,8 @@ public EntityCaveSpider(World world) {\\n this.entity = new CanaryCaveSpider(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(12.0D);\\n }\\n \\n@@ -31,7 +29,7 @@ public boolean m(Entity entity) {\\n }\\n \\n if (b0 > 0) {\\n- ((EntityLivingBase) entity).d(new PotionEffect(Potion.u.H, b0 * 20, 0));\\n+ ((EntityLivingBase) entity).c(new PotionEffect(Potion.u.H, b0 * 20, 0));\\n }\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCaveSpider.java\",\n \"sha\": \"26ed27b82c39bc770035af57eaf494974f7af1ad\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 6,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityChicken.java\",\n \"changes\": 14,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityChicken.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 8,\n \"filename\": \"src/main/java/net/minecraft/server/EntityChicken.java\",\n \"new_code\": \" public boolean be() {\\n protected void ay() {\\n super.ay();\\n protected String aN() {\\n protected String aO() {\\n if (this.ae()) {\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n public boolean bb() {\\n protected void ax() {\\n super.ax();\\n protected String aK() {\\n protected String aL() {\\n if (this.ad()) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.living.animal.CanaryChicken;\\n \\n-\\n public class EntityChicken extends EntityAnimal {\\n \\n public float bp;\\n@@ -28,12 +26,12 @@ public EntityChicken(World world) {\\n this.entity = new CanaryChicken(this); // CanaryMod: Wrap Entity\\n }\\n \\n- public boolean bb() {\\n+ public boolean be() {\\n return true;\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(4.0D);\\n this.a(SharedMonsterAttributes.d).a(0.25D);\\n }\\n@@ -74,11 +72,11 @@ protected String r() {\\n return \\\"mob.chicken.say\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.chicken.hurt\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.chicken.hurt\\\";\\n }\\n \\n@@ -97,7 +95,7 @@ protected void b(boolean flag0, int i0) {\\n this.b(Item.N.cv, 1);\\n }\\n \\n- if (this.ad()) {\\n+ if (this.ae()) {\\n this.b(Item.bn.cv, 1);\\n } else {\\n this.b(Item.bm.cv, 1);\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityChicken.java\",\n \"sha\": \"07b756e1e9475f5d398aeeb5518f782b21e5b5bc\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 7,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCow.java\",\n \"changes\": 14,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCow.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 7,\n \"filename\": \"src/main/java/net/minecraft/server/EntityCow.java\",\n \"new_code\": \" public boolean be() {\\n protected void ay() {\\n super.ay();\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (this.ae()) {\",\n \"new_methods\": [],\n \"old_code\": \" public boolean bb() {\\n protected void ax() {\\n super.ax();\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (this.ad()) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -19,12 +19,12 @@ public EntityCow(World world) {\\n this.entity = new CanaryCow(this); // CanaryMod: Wrap Entity\\n }\\n \\n- public boolean bb() {\\n+ public boolean be() {\\n return true;\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(10.0D);\\n this.a(SharedMonsterAttributes.d).a(0.20000000298023224D);\\n }\\n@@ -33,19 +33,19 @@ protected String r() {\\n return \\\"mob.cow.say\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.cow.hurt\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.cow.hurt\\\";\\n }\\n \\n protected void a(int i0, int i1, int i2, int i3) {\\n this.a(\\\"mob.cow.step\\\", 0.15F, 1.0F);\\n }\\n \\n- protected float aW() {\\n+ protected float aZ() {\\n return 0.4F;\\n }\\n \\n@@ -65,7 +65,7 @@ protected void b(boolean flag0, int i0) {\\n i1 = this.ab.nextInt(3) + 1 + this.ab.nextInt(1 + i0);\\n \\n for (i2 = 0; i2 < i1; ++i2) {\\n- if (this.ad()) {\\n+ if (this.ae()) {\\n this.b(Item.bl.cv, 1);\\n } else {\\n this.b(Item.bk.cv, 1);\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCow.java\",\n \"sha\": \"1385bc08a35d537c9c780df1a1384775605444ae\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 32,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreature.java\",\n \"changes\": 61,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreature.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 29,\n \"filename\": \"src/main/java/net/minecraft/server/EntityCreature.java\",\n \"new_code\": \" private EntityAIBase bs = new EntityAIMoveTowardsRestriction(this, 1.0D);\\n protected boolean bJ() {\\n protected void bk() {\\n this.bn = this.bJ();\\n Entity entity = this.bL();\\n } else if (this.j.S()) {\\n this.bK();\\n if (this.G && !this.bM()) {\\n super.bk();\\n protected void bK() {\\n protected Entity bL() {\\n public boolean bs() {\\n return super.bs() && this.a(i0, i1, i2) >= 0.0F;\\n public boolean bM() {\\n public Entity bN() {\\n public boolean bO() {\\n public ChunkCoordinates bP() {\\n public float bQ() {\\n public void bR() {\\n public boolean bS() {\\n protected void bF() {\\n super.bF();\\n if (this.bH() && this.bI() != null && this.bI().q == this.q) {\\n Entity entity = this.bI();\\n if (this instanceof EntityTameable && ((EntityTameable) this).bU()) {\\n this.a(true, true);\\n this.o(f0);\\n this.a(true, true);\\n } else if (!this.bH() && this.bt) {\\n this.bR();\\n\\n protected void o(float f0) {}\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityCreature.java\",\n \"implementation\": \"protected void bk() {\\n this.bn = this.bJ();\\n Entity entity = this.bL();\",\n \"signature\": \"boolean bJ()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityCreature.java\",\n \"implementation\": \"protected Entity bL() {\\n public boolean bs() {\\n return super.bs() && this.a(i0, i1, i2) >= 0.0F;\\n public boolean bM() {\\n public Entity bN() {\\n public boolean bO() {\\n public ChunkCoordinates bP() {\\n public float bQ() {\\n public void bR() {\\n public boolean bS() {\\n protected void bF() {\\n super.bF();\\n if (this.bH() && this.bI() != null && this.bI().q == this.q) {\\n Entity entity = this.bI();\\n if (this instanceof EntityTameable && ((EntityTameable) this).bU()) {\\n this.a(true, true);\\n this.o(f0);\\n this.a(true, true);\",\n \"signature\": \"void bK()\"\n },\n {\n \"arguments\": [\n \"float f0\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/EntityCreature.java\",\n \"implementation\": \"\",\n \"signature\": \"void o(float f0)\"\n }\n ],\n \"old_code\": \" private EntityAIBase bs = new EntityAIMoveTwardsRestriction(this, 1.0D);\\n protected boolean bF() {\\n protected void bh() {\\n this.bn = this.bF();\\n Entity entity = this.bH();\\n } else if (this.j.R()) {\\n this.bG();\\n if (this.G && !this.bI()) {\\n super.bh();\\n protected void bG() {\\n protected Entity bH() {\\n public boolean bo() {\\n return super.bo() && this.a(i0, i1, i2) >= 0.0F;\\n public boolean bI() {\\n public Entity bJ() {\\n public boolean bK() {\\n public ChunkCoordinates bL() {\\n public float bM() {\\n public void bN() {\\n public boolean bO() {\\n protected void bB() {\\n super.bB();\\n if (this.bD() && this.bE() != null && this.bE().q == this.q) {\\n Entity entity = this.bE();\\n if (this instanceof EntityTameable && ((EntityTameable) this).bQ()) {\\n this.i(true);\\n this.i(true);\\n } else if (!this.bD() && this.bt) {\\n this.bN();\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityCreature.java\",\n \"implementation\": \"protected void bh() {\\n this.bn = this.bF();\\n Entity entity = this.bH();\",\n \"signature\": \"boolean bF()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityCreature.java\",\n \"implementation\": \"protected Entity bH() {\\n public boolean bo() {\\n return super.bo() && this.a(i0, i1, i2) >= 0.0F;\\n public boolean bI() {\\n public Entity bJ() {\\n public boolean bK() {\\n public ChunkCoordinates bL() {\\n public float bM() {\\n public void bN() {\\n public boolean bO() {\\n protected void bB() {\\n super.bB();\\n if (this.bD() && this.bE() != null && this.bE().q == this.q) {\\n Entity entity = this.bE();\\n if (this instanceof EntityTameable && ((EntityTameable) this).bQ()) {\\n this.i(true);\\n this.i(true);\",\n \"signature\": \"void bG()\"\n }\n ],\n \"patch\": \"@@ -13,31 +13,31 @@ public abstract class EntityCreature extends EntityLiving {\\n protected int bo;\\n private ChunkCoordinates bq = new ChunkCoordinates(0, 0, 0);\\n private float br = -1.0F;\\n- private EntityAIBase bs = new EntityAIMoveTwardsRestriction(this, 1.0D);\\n+ private EntityAIBase bs = new EntityAIMoveTowardsRestriction(this, 1.0D);\\n private boolean bt;\\n \\n public EntityCreature(World world) {\\n super(world);\\n }\\n \\n- protected boolean bF() {\\n+ protected boolean bJ() {\\n return false;\\n }\\n \\n- protected void bh() {\\n+ protected void bk() {\\n this.q.C.a(\\\"ai\\\");\\n if (this.bo > 0 && --this.bo == 0) {\\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\\n \\n attributeinstance.b(i);\\n }\\n \\n- this.bn = this.bF();\\n+ this.bn = this.bJ();\\n float f11 = 16.0F;\\n \\n if (this.j == null) {\\n // CanaryMod: MobTarget\\n- Entity entity = this.bH();\\n+ Entity entity = this.bL();\\n if (entity != null && entity instanceof EntityLivingBase) {\\n MobTargetHook hook = (MobTargetHook) new MobTargetHook((net.canarymod.api.entity.living.LivingBase) this.getCanaryEntity(), (net.canarymod.api.entity.living.LivingBase) entity.getCanaryEntity()).call();\\n if (!hook.isCanceled()) {\\n@@ -49,7 +49,7 @@ protected void bh() {\\n if (this.j != null) {\\n this.bp = this.q.a(this, this.j, f11, true, false, false, true);\\n }\\n- } else if (this.j.R()) {\\n+ } else if (this.j.S()) {\\n float f1 = this.j.d((Entity) this);\\n \\n if (this.o(this.j)) {\\n@@ -63,7 +63,7 @@ protected void bh() {\\n if (!this.bn && this.j != null && (this.bp == null || this.ab.nextInt(20) == 0)) {\\n this.bp = this.q.a(this, this.j, f11, true, false, false, true);\\n } else if (!this.bn && (this.bp == null && this.ab.nextInt(180) == 0 || this.ab.nextInt(120) == 0 || this.bo > 0) && this.aV < 100) {\\n- this.bG();\\n+ this.bK();\\n }\\n \\n int i0 = MathHelper.c(this.E.b + 0.5D);\\n@@ -124,7 +124,7 @@ protected void bh() {\\n this.a(this.j, 30.0F, 30.0F);\\n }\\n \\n- if (this.G && !this.bI()) {\\n+ if (this.G && !this.bM()) {\\n this.bd = true;\\n }\\n \\n@@ -134,12 +134,12 @@ protected void bh() {\\n \\n this.q.C.b();\\n } else {\\n- super.bh();\\n+ super.bk();\\n this.bp = null;\\n }\\n }\\n \\n- protected void bG() {\\n+ protected void bK() {\\n this.q.C.a(\\\"stroll\\\");\\n boolean flag0 = false;\\n int i0 = -1;\\n@@ -175,35 +175,35 @@ public float a(int i0, int i1, int i2) {\\n return 0.0F;\\n }\\n \\n- protected Entity bH() {\\n+ protected Entity bL() {\\n return null;\\n }\\n \\n- public boolean bo() {\\n+ public boolean bs() {\\n int i0 = MathHelper.c(this.u);\\n int i1 = MathHelper.c(this.E.b);\\n int i2 = MathHelper.c(this.w);\\n \\n- return super.bo() && this.a(i0, i1, i2) >= 0.0F;\\n+ return super.bs() && this.a(i0, i1, i2) >= 0.0F;\\n }\\n \\n- public boolean bI() {\\n+ public boolean bM() {\\n return this.bp != null;\\n }\\n \\n public void a(PathEntity pathentity) {\\n this.bp = pathentity;\\n }\\n \\n- public Entity bJ() {\\n+ public Entity bN() {\\n return this.j;\\n }\\n \\n public void b(Entity entity) {\\n this.j = entity;\\n }\\n \\n- public boolean bK() {\\n+ public boolean bO() {\\n return this.b(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w));\\n }\\n \\n@@ -216,33 +216,33 @@ public void b(int i0, int i1, int i2, int i3) {\\n this.br = (float) i3;\\n }\\n \\n- public ChunkCoordinates bL() {\\n+ public ChunkCoordinates bP() {\\n return this.bq;\\n }\\n \\n- public float bM() {\\n+ public float bQ() {\\n return this.br;\\n }\\n \\n- public void bN() {\\n+ public void bR() {\\n this.br = -1.0F;\\n }\\n \\n- public boolean bO() {\\n+ public boolean bS() {\\n return this.br != -1.0F;\\n }\\n \\n- protected void bB() {\\n- super.bB();\\n- if (this.bD() && this.bE() != null && this.bE().q == this.q) {\\n- Entity entity = this.bE();\\n+ protected void bF() {\\n+ super.bF();\\n+ if (this.bH() && this.bI() != null && this.bI().q == this.q) {\\n+ Entity entity = this.bI();\\n \\n this.b((int) entity.u, (int) entity.v, (int) entity.w, 5);\\n float f0 = this.d(entity);\\n \\n- if (this instanceof EntityTameable && ((EntityTameable) this).bQ()) {\\n+ if (this instanceof EntityTameable && ((EntityTameable) this).bU()) {\\n if (f0 > 10.0F) {\\n- this.i(true);\\n+ this.a(true, true);\\n }\\n \\n return;\\n@@ -254,6 +254,7 @@ protected void bB() {\\n this.bt = true;\\n }\\n \\n+ this.o(f0);\\n if (f0 > 4.0F) {\\n this.k().a(entity, 1.0D);\\n }\\n@@ -269,13 +270,15 @@ protected void bB() {\\n }\\n \\n if (f0 > 10.0F) {\\n- this.i(true);\\n+ this.a(true, true);\\n }\\n- } else if (!this.bD() && this.bt) {\\n+ } else if (!this.bH() && this.bt) {\\n this.bt = false;\\n this.c.a(this.bs);\\n this.k().a(true);\\n- this.bN();\\n+ this.bR();\\n }\\n }\\n+\\n+ protected void o(float f0) {}\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreature.java\",\n \"sha\": \"67e482a46d55fde8833cbd96fe0c13d1c077961d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 12,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreeper.java\",\n \"changes\": 24,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreeper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 12,\n \"filename\": \"src/main/java/net/minecraft/server/EntityCreeper.java\",\n \"new_code\": \" protected void ay() {\\n super.ay();\\n public boolean be() {\\n public int ar() {\\n return this.m() == null ? 3 : 3 + (int) (this.aM() - 1.0F);\\n if (this.S()) {\\n int i0 = this.bV();\\n if (this.bT()) {\\n protected String aN() {\\n protected String aO() {\\n public boolean bT() {\\n public int bV() {\",\n \"new_methods\": [],\n \"old_code\": \" protected void ax() {\\n super.ax();\\n public boolean bb() {\\n public int aq() {\\n return this.m() == null ? 3 : 3 + (int) (this.aJ() - 1.0F);\\n if (this.R()) {\\n int i0 = this.bR();\\n if (this.bP()) {\\n protected String aK() {\\n protected String aL() {\\n public boolean bP() {\\n public int bR() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -23,17 +23,17 @@ public EntityCreeper(World world) {\\n this.entity = new CanaryCreeper(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.d).a(0.25D);\\n }\\n \\n- public boolean bb() {\\n+ public boolean be() {\\n return true;\\n }\\n \\n- public int aq() {\\n- return this.m() == null ? 3 : 3 + (int) (this.aJ() - 1.0F);\\n+ public int ar() {\\n+ return this.m() == null ? 3 : 3 + (int) (this.aM() - 1.0F);\\n }\\n \\n protected void b(float f0) {\\n@@ -73,9 +73,9 @@ public void a(NBTTagCompound nbttagcompound) {\\n }\\n \\n public void l_() {\\n- if (this.R()) {\\n+ if (this.S()) {\\n this.bp = this.bq;\\n- int i0 = this.bR();\\n+ int i0 = this.bV();\\n \\n if (i0 > 0 && this.bq == 0) {\\n this.a(\\\"random.fuse\\\", 1.0F, 0.5F);\\n@@ -91,7 +91,7 @@ public void l_() {\\n if (!this.q.I) {\\n boolean flag0 = this.q.O().b(\\\"mobGriefing\\\");\\n \\n- if (this.bP()) {\\n+ if (this.bT()) {\\n this.q.a(this, this.u, this.v, this.w, (float) (this.bs * 2), flag0);\\n } else {\\n this.q.a(this, this.u, this.v, this.w, (float) this.bs, flag0);\\n@@ -105,11 +105,11 @@ public void l_() {\\n super.l_();\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.creeper.say\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.creeper.death\\\";\\n }\\n \\n@@ -126,15 +126,15 @@ public boolean m(Entity entity) {\\n return true;\\n }\\n \\n- public boolean bP() {\\n+ public boolean bT() {\\n return this.ah.a(17) == 1;\\n }\\n \\n protected int s() {\\n return Item.O.cv;\\n }\\n \\n- public int bR() {\\n+ public int bV() {\\n return this.ah.a(16);\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityCreeper.java\",\n \"sha\": \"f031de7d46e9ab20484cae8ce47a4dc2be5ded7e\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 16,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityDragon.java\",\n \"changes\": 32,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityDragon.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 16,\n \"filename\": \"src/main/java/net/minecraft/server/EntityDragon.java\",\n \"new_code\": \" this.g(this.aS());\\n protected void ay() {\\n super.ay();\\n if (this.aM() <= 0.0F) {\\n if (this.aM() <= 0.0F) {\\n this.bJ();\\n this.bK();\\n private void bJ() {\\n } else if (this.ac % 10 == 0 && this.aM() < this.aS()) {\\n this.g(this.aM() + 1.0F);\\n private void bK() {\\n protected void aA() {\\n protected void bo() {}\\n public Entity[] an() {\\n protected String aN() {\\n protected float aZ() {\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityDragon.java\",\n \"implementation\": \"super.ay();\\n if (this.aM() <= 0.0F) {\\n if (this.aM() <= 0.0F) {\\n this.bJ();\\n this.bK();\\n private void bJ() {\",\n \"signature\": \"void ay()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityDragon.java\",\n \"implementation\": \"protected void aA() {\\n protected void bo() {\",\n \"signature\": \"void bK()\"\n }\n ],\n \"old_code\": \" this.g(this.aP());\\n protected void ax() {\\n super.ax();\\n if (this.aJ() <= 0.0F) {\\n if (this.aJ() <= 0.0F) {\\n this.bF();\\n this.bG();\\n private void bF() {\\n } else if (this.ac % 10 == 0 && this.aJ() < this.aP()) {\\n this.g(this.aJ() + 1.0F);\\n private void bG() {\\n protected void az() {\\n protected void bk() {}\\n public Entity[] am() {\\n protected String aK() {\\n protected float aW() {\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityDragon.java\",\n \"implementation\": \"super.ax();\\n if (this.aJ() <= 0.0F) {\\n if (this.aJ() <= 0.0F) {\\n this.bF();\\n this.bG();\\n private void bF() {\",\n \"signature\": \"void ax()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityDragon.java\",\n \"implementation\": \"protected void az() {\\n protected void bk() {\",\n \"signature\": \"void bG()\"\n }\n ],\n \"patch\": \"@@ -31,7 +31,7 @@ public EntityDragon(World world) {\\n super(world);\\n this.bp = new EntityDragonPart[]{ this.bq = new EntityDragonPart(this, \\\"head\\\", 6.0F, 6.0F), this.br = new EntityDragonPart(this, \\\"body\\\", 8.0F, 8.0F), this.bs = new EntityDragonPart(this, \\\"tail\\\", 4.0F, 4.0F), this.bt = new EntityDragonPart(this, \\\"tail\\\", 4.0F, 4.0F), this.bu = new EntityDragonPart(this, \\\"tail\\\", 4.0F, 4.0F),\\n this.bv = new EntityDragonPart(this, \\\"wing\\\", 4.0F, 4.0F), this.bw = new EntityDragonPart(this, \\\"wing\\\", 4.0F, 4.0F) };\\n- this.g(this.aP());\\n+ this.g(this.aS());\\n this.a(16.0F, 8.0F);\\n this.Z = true;\\n this.ag = true;\\n@@ -40,8 +40,8 @@ public EntityDragon(World world) {\\n this.entity = new CanaryEnderDragon(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(200.0D);\\n }\\n \\n@@ -50,7 +50,7 @@ protected void a() {\\n }\\n \\n public double[] b(int i0, float f0) {\\n- if (this.aJ() <= 0.0F) {\\n+ if (this.aM() <= 0.0F) {\\n f0 = 0.0F;\\n }\\n \\n@@ -84,13 +84,13 @@ public void c() {\\n this.bx = this.by;\\n float f2;\\n \\n- if (this.aJ() <= 0.0F) {\\n+ if (this.aM() <= 0.0F) {\\n f0 = (this.ab.nextFloat() - 0.5F) * 8.0F;\\n f1 = (this.ab.nextFloat() - 0.5F) * 4.0F;\\n f2 = (this.ab.nextFloat() - 0.5F) * 8.0F;\\n this.q.a(\\\"largeexplode\\\", this.u + (double) f0, this.v + 2.0D + (double) f1, this.w + (double) f2, 0.0D, 0.0D, 0.0D);\\n } else {\\n- this.bF();\\n+ this.bJ();\\n f0 = 0.2F / (MathHelper.a(this.x * this.x + this.z * this.z) * 10.0F + 1.0F);\\n f0 *= (float) Math.pow(2.0D, this.y);\\n if (this.bA) {\\n@@ -155,7 +155,7 @@ public void c() {\\n }\\n \\n if (this.bz || d3 < 100.0D || d3 > 22500.0D || this.G || this.H) {\\n- this.bG();\\n+ this.bK();\\n }\\n \\n d1 /= (double) MathHelper.a(d0 * d0 + d2 * d2);\\n@@ -289,16 +289,16 @@ public void c() {\\n }\\n }\\n \\n- private void bF() {\\n+ private void bJ() {\\n if (this.bC != null) {\\n if (this.bC.M) {\\n if (!this.q.I) {\\n this.a(this.bq, DamageSource.a((Explosion) null), 10.0F);\\n }\\n \\n this.bC = null;\\n- } else if (this.ac % 10 == 0 && this.aJ() < this.aP()) {\\n- this.g(this.aJ() + 1.0F);\\n+ } else if (this.ac % 10 == 0 && this.aM() < this.aS()) {\\n+ this.g(this.aM() + 1.0F);\\n }\\n }\\n \\n@@ -351,7 +351,7 @@ private void b(List list) {\\n }\\n }\\n \\n- private void bG() {\\n+ private void bK() {\\n this.bz = false;\\n if (this.ab.nextInt(2) == 0 && !this.q.h.isEmpty()) {\\n this.bD = (Entity) this.q.h.get(this.ab.nextInt(this.q.h.size()));\\n@@ -445,7 +445,7 @@ protected boolean e(DamageSource damagesource, float f0) {\\n return super.a(damagesource, f0);\\n }\\n \\n- protected void az() {\\n+ protected void aA() {\\n ++this.bB;\\n if (this.bB >= 180 && this.bB <= 200) {\\n float f0 = (this.ab.nextFloat() - 0.5F) * 8.0F;\\n@@ -532,9 +532,9 @@ private void c(int i0, int i1) {\\n BlockEndPortal.a = false;\\n }\\n \\n- protected void bk() {}\\n+ protected void bo() {}\\n \\n- public Entity[] am() {\\n+ public Entity[] an() {\\n return this.bp;\\n }\\n \\n@@ -550,11 +550,11 @@ protected String r() {\\n return \\\"mob.enderdragon.growl\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.enderdragon.hit\\\";\\n }\\n \\n- protected float aW() {\\n+ protected float aZ() {\\n return 5.0F;\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityDragon.java\",\n \"sha\": \"a1cb601944b6465e80b07592b07f945598dfa7fa\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEgg.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEgg.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/EntityEgg.java\",\n \"new_code\": \" movingobjectposition.g.a(DamageSource.a((Entity) this, this.h()), 0.0F);\",\n \"new_methods\": [],\n \"old_code\": \" movingobjectposition.g.a(DamageSource.a((Entity) this, this.h()), 0);\",\n \"old_methods\": [],\n \"patch\": \"@@ -25,7 +25,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\\n ProjectileHitHook hook = (ProjectileHitHook) new ProjectileHitHook(this.getCanaryEntity(), movingobjectposition == null || movingobjectposition.g == null ? null : movingobjectposition.g.getCanaryEntity()).call();\\n if (!hook.isCanceled()) { //\\n if (movingobjectposition.g != null) {\\n- movingobjectposition.g.a(DamageSource.a((Entity) this, this.h()), 0);\\n+ movingobjectposition.g.a(DamageSource.a((Entity) this, this.h()), 0.0F);\\n }\\n \\n if (!this.q.I && this.ab.nextInt(8) == 0) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEgg.java\",\n \"sha\": \"66b53dcb9d208db98879910b1c027e13891f38fc\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderCrystal.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderCrystal.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/EntityEnderCrystal.java\",\n \"new_code\": \" if (this.aq()) {\",\n \"new_methods\": [],\n \"old_code\": \" if (this.ap()) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -49,7 +49,7 @@ public boolean K() {\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n if (!this.M && !this.q.I) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderCrystal.java\",\n \"sha\": \"a52ffbaf4c9de4734ba4ec9028d8bdadf683c595\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderEye.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderEye.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/EntityEnderEye.java\",\n \"new_code\": \" public boolean ap() {\",\n \"new_methods\": [],\n \"old_code\": \" public boolean ao() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -129,7 +129,7 @@ public float d(float f0) {\\n return 1.0F;\\n }\\n \\n- public boolean ao() {\\n+ public boolean ap() {\\n return false;\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderEye.java\",\n \"sha\": \"ece94c136959733906d79ede93ce9615b00bba68\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderPearl.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderPearl.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/EntityEnderPearl.java\",\n \"new_code\": \" if (this.h().af()) {\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n if (this.h().ae()) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.throwable.CanaryEnderPearl;\\n \\n-\\n public class EntityEnderPearl extends EntityThrowable {\\n \\n public EntityEnderPearl(World world) {\\n@@ -30,7 +28,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\\n EntityPlayerMP entityplayermp = (EntityPlayerMP) this.h();\\n \\n if (!entityplayermp.a.b && entityplayermp.q == this.q) {\\n- if (this.h().ae()) {\\n+ if (this.h().af()) {\\n this.h().a((Entity) null);\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderPearl.java\",\n \"sha\": \"35a896a334755ff7f2ebbd4ee97cd20f6a743963\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 40,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderman.java\",\n \"changes\": 80,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderman.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 40,\n \"filename\": \"src/main/java/net/minecraft/server/EntityEnderman.java\",\n \"new_code\": \" // private static boolean[] br = new boolean[256]; //CanaryMod: disabled\\n protected void ay() {\\n super.ay();\\n nbttagcompound.a(\\\"carried\\\", (short) this.bV());\\n nbttagcompound.a(\\\"carriedData\\\", (short) this.bW());\\n protected Entity bL() {\\n if (this.bV() == 0) {\\n this.q.f(i0, i1, i2, this.bV(), this.bW(), 3);\\n this.bT();\\n if (this.F() || this.ae()) {\\n this.bT();\\n if (this.bX() && !this.bv && this.ab.nextInt(100) == 0) {\\n if (!this.q.I && this.S()) {\\n this.bT();\\n public boolean bT() { // CanaryMod: protected -> public\\n return this.bX() ? \\\"mob.endermen.scream\\\" : \\\"mob.endermen.idle\\\";\\n protected String aN() {\\n protected String aO() {\\n public int bV() {\\n public int bW() {\\n if (this.aq()) {\\n if (this.bT()) {\\n public boolean bX() {\\n /* CanaryMod: Disable all default allowed pick ups\\n static {\\n // br[Block.z.cF] = true;\\n // br[Block.A.cF] = true;\\n // br[Block.J.cF] = true;\\n // br[Block.K.cF] = true;\\n // br[Block.ai.cF] = true;\\n // br[Block.aj.cF] = true;\\n // br[Block.ak.cF] = true;\\n // br[Block.al.cF] = true;\\n // br[Block.ar.cF] = true;\\n // br[Block.ba.cF] = true;\\n // br[Block.bb.cF] = true;\\n // br[Block.bf.cF] = true;\\n // br[Block.bw.cF] = true;\\n // br[Block.bD.cF] = true;\\n } */\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityEnderman.java\",\n \"implementation\": \"super.ay();\\n nbttagcompound.a(\\\"carried\\\", (short) this.bV());\\n nbttagcompound.a(\\\"carriedData\\\", (short) this.bW());\\n protected Entity bL() {\\n if (this.bV() == 0) {\\n this.q.f(i0, i1, i2, this.bV(), this.bW(), 3);\\n this.bT();\\n if (this.F() || this.ae()) {\\n this.bT();\\n if (this.bX() && !this.bv && this.ab.nextInt(100) == 0) {\\n if (!this.q.I && this.S()) {\\n this.bT();\\n public boolean bT() { // CanaryMod: protected -> public\\n return this.bX() ? \\\"mob.endermen.scream\\\" : \\\"mob.endermen.idle\\\";\\n protected String aN() {\\n protected String aO() {\\n public int bV() {\\n public int bW() {\\n if (this.aq()) {\\n if (this.bT()) {\\n public boolean bX() {\\n /* CanaryMod: Disable all default allowed pick ups\\n static {\\n // br[Block.z.cF] = true;\\n // br[Block.A.cF] = true;\\n // br[Block.J.cF] = true;\\n // br[Block.K.cF] = true;\\n // br[Block.ai.cF] = true;\\n // br[Block.aj.cF] = true;\\n // br[Block.ak.cF] = true;\\n // br[Block.al.cF] = true;\\n // br[Block.ar.cF] = true;\\n // br[Block.ba.cF] = true;\\n // br[Block.bb.cF] = true;\\n // br[Block.bf.cF] = true;\\n // br[Block.bw.cF] = true;\\n // br[Block.bD.cF] = true;\",\n \"signature\": \"void ay()\"\n }\n ],\n \"old_code\": \" private static boolean[] br = new boolean[256];\\n protected void ax() {\\n super.ax();\\n nbttagcompound.a(\\\"carried\\\", (short) this.bR());\\n nbttagcompound.a(\\\"carriedData\\\", (short) this.bS());\\n protected Entity bH() {\\n if (this.bR() == 0) {\\n this.q.f(i0, i1, i2, this.bR(), this.bS(), 3);\\n this.bP();\\n if (this.F() || this.ad()) {\\n this.bP();\\n if (this.bT() && !this.bv && this.ab.nextInt(100) == 0) {\\n if (!this.q.I && this.R()) {\\n this.bP();\\n public boolean bP() { // CanaryMod: protected -> public\\n return this.bT() ? \\\"mob.endermen.scream\\\" : \\\"mob.endermen.idle\\\";\\n protected String aK() {\\n protected String aL() {\\n public int bR() {\\n public int bS() {\\n if (this.ap()) {\\n if (this.bP()) {\\n public boolean bT() {\\n static {\\n // CanaryMod: Disable all default allowed pick ups\\n // br[Block.z.cF] = true;\\n // br[Block.A.cF] = true;\\n // br[Block.J.cF] = true;\\n // br[Block.K.cF] = true;\\n // br[Block.ai.cF] = true;\\n // br[Block.aj.cF] = true;\\n // br[Block.ak.cF] = true;\\n // br[Block.al.cF] = true;\\n // br[Block.ar.cF] = true;\\n // br[Block.ba.cF] = true;\\n // br[Block.bb.cF] = true;\\n // br[Block.bf.cF] = true;\\n // br[Block.bw.cF] = true;\\n // br[Block.bD.cF] = true;\\n }\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityEnderman.java\",\n \"implementation\": \"super.ax();\\n nbttagcompound.a(\\\"carried\\\", (short) this.bR());\\n nbttagcompound.a(\\\"carriedData\\\", (short) this.bS());\\n protected Entity bH() {\\n if (this.bR() == 0) {\\n this.q.f(i0, i1, i2, this.bR(), this.bS(), 3);\\n this.bP();\\n if (this.F() || this.ad()) {\\n this.bP();\\n if (this.bT() && !this.bv && this.ab.nextInt(100) == 0) {\\n if (!this.q.I && this.R()) {\\n this.bP();\\n public boolean bP() { // CanaryMod: protected -> public\\n return this.bT() ? \\\"mob.endermen.scream\\\" : \\\"mob.endermen.idle\\\";\\n protected String aK() {\\n protected String aL() {\\n public int bR() {\\n public int bS() {\\n if (this.ap()) {\\n if (this.bP()) {\\n public boolean bT() {\\n static {\\n // CanaryMod: Disable all default allowed pick ups\\n // br[Block.z.cF] = true;\\n // br[Block.A.cF] = true;\\n // br[Block.J.cF] = true;\\n // br[Block.K.cF] = true;\\n // br[Block.ai.cF] = true;\\n // br[Block.aj.cF] = true;\\n // br[Block.ak.cF] = true;\\n // br[Block.al.cF] = true;\\n // br[Block.ar.cF] = true;\\n // br[Block.ba.cF] = true;\\n // br[Block.bb.cF] = true;\\n // br[Block.bf.cF] = true;\\n // br[Block.bw.cF] = true;\\n // br[Block.bD.cF] = true;\",\n \"signature\": \"void ax()\"\n }\n ],\n \"patch\": \"@@ -12,7 +12,7 @@ public class EntityEnderman extends EntityMob {\\n \\n private static final UUID bp = UUID.fromString(\\\"020E0DFB-87AE-4653-9556-831010E291A0\\\");\\n private static final AttributeModifier bq = (new AttributeModifier(bp, \\\"Attacking speed boost\\\", 6.199999809265137D, 0)).a(false);\\n- private static boolean[] br = new boolean[256];\\n+ // private static boolean[] br = new boolean[256]; //CanaryMod: disabled\\n private int bs;\\n private int bt;\\n private Entity bu;\\n@@ -25,8 +25,8 @@ public EntityEnderman(World world) {\\n this.entity = new CanaryEnderman(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(40.0D);\\n this.a(SharedMonsterAttributes.d).a(0.30000001192092896D);\\n this.a(SharedMonsterAttributes.e).a(7.0D);\\n@@ -41,8 +41,8 @@ protected void a() {\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n super.b(nbttagcompound);\\n- nbttagcompound.a(\\\"carried\\\", (short) this.bR());\\n- nbttagcompound.a(\\\"carriedData\\\", (short) this.bS());\\n+ nbttagcompound.a(\\\"carried\\\", (short) this.bV());\\n+ nbttagcompound.a(\\\"carriedData\\\", (short) this.bW());\\n }\\n \\n public void a(NBTTagCompound nbttagcompound) {\\n@@ -51,7 +51,7 @@ public void a(NBTTagCompound nbttagcompound) {\\n this.c(nbttagcompound.d(\\\"carriedData\\\"));\\n }\\n \\n- protected Entity bH() {\\n+ protected Entity bL() {\\n EntityPlayer entityplayer = this.q.b(this, 64.0D);\\n \\n if (entityplayer != null) {\\n@@ -113,7 +113,7 @@ public void c() {\\n int i2;\\n int i3;\\n \\n- if (this.bR() == 0) {\\n+ if (this.bV() == 0) {\\n if (this.ab.nextInt(20) == 0) {\\n i0 = MathHelper.c(this.u - 2.0D + this.ab.nextDouble() * 4.0D);\\n i1 = MathHelper.c(this.v + this.ab.nextDouble() * 3.0D);\\n@@ -144,7 +144,7 @@ public void c() {\\n \\n Canary.hooks().callHook(hook);\\n if (!hook.isCanceled()) {\\n- this.q.f(i0, i1, i2, this.bR(), this.bS(), 3);\\n+ this.q.f(i0, i1, i2, this.bV(), this.bW(), 3);\\n this.a(0);\\n }\\n //\\n@@ -163,18 +163,18 @@ public void c() {\\n this.j = null;\\n this.a(false);\\n this.bv = false;\\n- this.bP();\\n+ this.bT();\\n }\\n }\\n \\n- if (this.F() || this.ad()) {\\n+ if (this.F() || this.ae()) {\\n this.j = null;\\n this.a(false);\\n this.bv = false;\\n- this.bP();\\n+ this.bT();\\n }\\n \\n- if (this.bT() && !this.bv && this.ab.nextInt(100) == 0) {\\n+ if (this.bX() && !this.bv && this.ab.nextInt(100) == 0) {\\n this.a(false);\\n }\\n \\n@@ -183,11 +183,11 @@ public void c() {\\n this.a(this.j, 100.0F, 100.0F);\\n }\\n \\n- if (!this.q.I && this.R()) {\\n+ if (!this.q.I && this.S()) {\\n if (this.j != null) {\\n if (this.j instanceof EntityPlayer && this.f((EntityPlayer) this.j)) {\\n if (this.j.e((Entity) this) < 16.0D) {\\n- this.bP();\\n+ this.bT();\\n }\\n \\n this.bs = 0;\\n@@ -203,7 +203,7 @@ public void c() {\\n super.c();\\n }\\n \\n- public boolean bP() { // CanaryMod: protected -> public\\n+ public boolean bT() { // CanaryMod: protected -> public\\n double d0 = this.u + (this.ab.nextDouble() - 0.5D) * 64.0D;\\n double d1 = this.v + (double) (this.ab.nextInt(64) - 32);\\n double d2 = this.w + (this.ab.nextDouble() - 0.5D) * 64.0D;\\n@@ -283,14 +283,14 @@ protected boolean j(double d0, double d1, double d2) {\\n }\\n \\n protected String r() {\\n- return this.bT() ? \\\"mob.endermen.scream\\\" : \\\"mob.endermen.idle\\\";\\n+ return this.bX() ? \\\"mob.endermen.scream\\\" : \\\"mob.endermen.idle\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.endermen.hit\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.endermen.death\\\";\\n }\\n \\n@@ -314,20 +314,20 @@ public void a(int i0) {\\n this.ah.b(16, Byte.valueOf((byte) (i0 & 255)));\\n }\\n \\n- public int bR() {\\n+ public int bV() {\\n return this.ah.a(16);\\n }\\n \\n public void c(int i0) {\\n this.ah.b(17, Byte.valueOf((byte) (i0 & 255)));\\n }\\n \\n- public int bS() {\\n+ public int bW() {\\n return this.ah.a(17);\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n this.a(true);\\n@@ -339,7 +339,7 @@ public boolean a(DamageSource damagesource, float f0) {\\n this.bv = false;\\n \\n for (int i0 = 0; i0 < 64; ++i0) {\\n- if (this.bP()) {\\n+ if (this.bT()) {\\n return true;\\n }\\n }\\n@@ -351,29 +351,29 @@ public boolean a(DamageSource damagesource, float f0) {\\n }\\n }\\n \\n- public boolean bT() {\\n+ public boolean bX() {\\n return this.ah.a(18) > 0;\\n }\\n \\n public void a(boolean flag0) {\\n this.ah.b(18, Byte.valueOf((byte) (flag0 ? 1 : 0)));\\n }\\n \\n- static {\\n- // CanaryMod: Disable all default allowed pick ups\\n- // br[Block.z.cF] = true;\\n- // br[Block.A.cF] = true;\\n- // br[Block.J.cF] = true;\\n- // br[Block.K.cF] = true;\\n- // br[Block.ai.cF] = true;\\n- // br[Block.aj.cF] = true;\\n- // br[Block.ak.cF] = true;\\n- // br[Block.al.cF] = true;\\n- // br[Block.ar.cF] = true;\\n- // br[Block.ba.cF] = true;\\n- // br[Block.bb.cF] = true;\\n- // br[Block.bf.cF] = true;\\n- // br[Block.bw.cF] = true;\\n- // br[Block.bD.cF] = true;\\n- }\\n+ /* CanaryMod: Disable all default allowed pick ups\\n+ static {\\n+ // br[Block.z.cF] = true;\\n+ // br[Block.A.cF] = true;\\n+ // br[Block.J.cF] = true;\\n+ // br[Block.K.cF] = true;\\n+ // br[Block.ai.cF] = true;\\n+ // br[Block.aj.cF] = true;\\n+ // br[Block.ak.cF] = true;\\n+ // br[Block.al.cF] = true;\\n+ // br[Block.ar.cF] = true;\\n+ // br[Block.ba.cF] = true;\\n+ // br[Block.bb.cF] = true;\\n+ // br[Block.bf.cF] = true;\\n+ // br[Block.bw.cF] = true;\\n+ // br[Block.bD.cF] = true;\\n+ } */\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityEnderman.java\",\n \"sha\": \"f23e1b4e2a8c0278008a1d2afe8f65ad4be8cde3\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityExpBottle.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityExpBottle.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/EntityExpBottle.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.throwable.CanaryXPBottle;\\n \\n-\\n public class EntityExpBottle extends EntityThrowable {\\n \\n public EntityExpBottle(World world) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityExpBottle.java\",\n \"sha\": \"688219fa05d9e6cd39cafb310786abe2a20591ad\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireball.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireball.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/EntityFireball.java\",\n \"new_code\": \" public float Y() {\\n if (this.aq()) {\\n Vec3 vec3 = damagesource.i().Z();\",\n \"new_methods\": [],\n \"old_code\": \" public float X() {\\n if (this.ap()) {\\n Vec3 vec3 = damagesource.i().Y();\",\n \"old_methods\": [],\n \"patch\": \"@@ -212,17 +212,17 @@ public boolean K() {\\n return true;\\n }\\n \\n- public float X() {\\n+ public float Y() {\\n return 1.0F;\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n this.J();\\n if (damagesource.i() != null) {\\n- Vec3 vec3 = damagesource.i().Y();\\n+ Vec3 vec3 = damagesource.i().Z();\\n \\n if (vec3 != null) {\\n this.x = vec3.c;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireball.java\",\n \"sha\": \"3c08a0298fb65892713dcd09aeee6f3954223c2b\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireworkRocket.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireworkRocket.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/EntityFireworkRocket.java\",\n \"new_code\": \" public boolean ap() {\",\n \"new_methods\": [],\n \"old_code\": \" public boolean ao() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -126,7 +126,7 @@ public float d(float f0) {\\n return super.d(f0);\\n }\\n \\n- public boolean ao() {\\n+ public boolean ap() {\\n return false;\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityFireworkRocket.java\",\n \"sha\": \"2a3a160997b896343f748d3876a992a02d1ad862\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 11,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGhast.java\",\n \"changes\": 22,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGhast.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 11,\n \"filename\": \"src/main/java/net/minecraft/server/EntityGhast.java\",\n \"new_code\": \" if (this.aq()) {\\n protected void ay() {\\n super.ay();\\n protected void bk() {\\n this.bo();\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n public boolean bs() {\\n return this.ab.nextInt(20) == 0 && super.bs() && this.q.r > 0;\\n public int bv() {\",\n \"new_methods\": [],\n \"old_code\": \" if (this.ap()) {\\n protected void ax() {\\n super.ax();\\n protected void bh() {\\n this.bk();\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n public boolean bo() {\\n return this.ab.nextInt(20) == 0 && super.bo() && this.q.r > 0;\\n public int br() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -24,7 +24,7 @@ public EntityGhast(World world) {\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else if (\\\"fireball\\\".equals(damagesource.n()) && damagesource.i() instanceof EntityPlayer) {\\n super.a(damagesource, 1000.0F);\\n@@ -40,17 +40,17 @@ protected void a() {\\n this.ah.a(16, Byte.valueOf((byte) 0));\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(10.0D);\\n }\\n \\n- protected void bh() {\\n+ protected void bk() {\\n if (!this.q.I && this.q.r == 0) {\\n this.w();\\n }\\n \\n- this.bk();\\n+ this.bo();\\n this.bo = this.bp;\\n double d0 = this.i - this.u;\\n double d1 = this.j - this.v;\\n@@ -165,11 +165,11 @@ protected String r() {\\n return \\\"mob.ghast.moan\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.ghast.scream\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.ghast.death\\\";\\n }\\n \\n@@ -193,15 +193,15 @@ protected void b(boolean flag0, int i0) {\\n }\\n }\\n \\n- protected float aW() {\\n+ protected float aZ() {\\n return 10.0F;\\n }\\n \\n- public boolean bo() {\\n- return this.ab.nextInt(20) == 0 && super.bo() && this.q.r > 0;\\n+ public boolean bs() {\\n+ return this.ab.nextInt(20) == 0 && super.bs() && this.q.r > 0;\\n }\\n \\n- public int br() {\\n+ public int bv() {\\n return 1;\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGhast.java\",\n \"sha\": \"8e3002036d4dc6890decc1f85721722f91e99a12\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGiantZombie.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGiantZombie.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/EntityGiantZombie.java\",\n \"new_code\": \" protected void ay() {\\n super.ay();\",\n \"new_methods\": [],\n \"old_code\": \" protected void ax() {\\n super.ax();\",\n \"old_methods\": [],\n \"patch\": \"@@ -11,8 +11,8 @@ public EntityGiantZombie(World world) {\\n this.entity = new CanaryGiantZombie(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(100.0D);\\n this.a(SharedMonsterAttributes.d).a(0.5D);\\n this.a(SharedMonsterAttributes.e).a(50.0D);\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityGiantZombie.java\",\n \"sha\": \"b275cd88e27f1179a1a3134e516587ad1d1b68b1\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 5,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHanging.java\",\n \"changes\": 8,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHanging.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/EntityHanging.java\",\n \"new_code\": \" if (this.aq()) {\\n protected boolean O() {\\n return false;\\n }\\n\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityHanging.java\",\n \"implementation\": \"return false;\",\n \"signature\": \"boolean O()\"\n }\n ],\n \"old_code\": \" this.e = 0;\\n this.a = 0;\\n if (this.ap()) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -15,8 +15,6 @@ public abstract class EntityHanging extends Entity {\\n \\n public EntityHanging(World world) {\\n super(world);\\n- this.e = 0;\\n- this.a = 0;\\n this.N = 0.0F;\\n this.a(0.5F, 0.5F);\\n }\\n@@ -179,7 +177,7 @@ public boolean i(Entity entity) {\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n if (!this.M && !this.q.I) {\\n@@ -278,6 +276,10 @@ public void a(NBTTagCompound nbttagcompound) {\\n \\n public abstract void b(Entity entity);\\n \\n+ protected boolean O() {\\n+ return false;\\n+ }\\n+\\n // CanaryMod\\n public int getTickCounter() {\\n return this.e;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHanging.java\",\n \"sha\": \"0eea27efda191c4a0705307645326c9c58517b25\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 224,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHorse.java\",\n \"changes\": 444,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHorse.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 220,\n \"filename\": \"src/main/java/net/minecraft/server/EntityHorse.java\",\n \"new_code\": \" this.l(false);\\n this.cH();\\n this.cJ();\\n public int bT() {\\n this.cJ();\\n public int bU() {\\n public String am() {\\n if (this.bB()) {\\n return this.bA();\\n int i0 = this.bT();\\n public boolean bV() {\\n public boolean bW() {\\n public boolean ca() {\\n return this.bV();\\n }\\n\\n public String cb() {\\n return this.ah.e(21);\\n public float cc() {\\n this.a(this.cc());\\n public boolean cd() {\\n public void i(boolean flag0) {\\n public void j(boolean flag0) {\\n public boolean bG() {\\n return !this.cy() && super.bG();\\n protected void o(float f0) {\\n if (f0 > 6.0F && this.cg()) {\\n this.o(false);\\n }\\n }\\n\\n public boolean ce() {\\n public int cf() {\\n public boolean cg() {\\n public boolean ch() {\\n public boolean ci() {\\n public boolean cj() {\\n this.cJ();\\n public void k(boolean flag0) {\\n public void l(boolean flag0) {\\n public void m(boolean flag0) {\\n public void n(boolean flag0) {\\n public int ck() {\\n int i1 = MathHelper.a(this.ck() + i0, 0, this.cq());\\n return this.n != null && this.n.equals(entity) ? false : super.a(damagesource, f0);\\n public int aP() {\\n return by[this.cf()];\\n public boolean cl() {\\n public void cm() {\\n if (!this.q.I && this.ce()) {\\n this.l(false);\\n private void cF() {\\n this.cM();\\n private int cG() {\\n int i0 = this.bT();\\n return this.ce() && (i0 == 1 || i0 == 2) ? 17 : 2;\\n private void cH() {\\n this.bG = new AnimalChest(\\\"HorseChest\\\", this.cG());\\n this.bG.a(this.am());\\n this.cI();\\n private void cI() {\\n this.n(this.bG.a(0) != null);\\n if (this.cv()) {\\n int i0 = this.cf();\\n boolean flag0 = this.co();\\n this.cI();\\n if (i0 == 0 && i0 != this.cf()) {\\n if (!flag0 && this.co()) {\\n public boolean bs() {\\n this.cl();\\n return super.bs();\\n public double cn() {\\n protected String aO() {\\n this.cM();\\n int i0 = this.bT();\\n int i0 = this.bT();\\n protected String aN() {\\n this.cM();\\n this.cO();\\n int i0 = this.bT();\\n public boolean co() {\\n this.cM();\\n if (this.ab.nextInt(10) == 0 && !this.bb()) {\\n this.cO();\\n int i0 = this.bT();\\n protected String cp() {\\n this.cM();\\n this.cO();\\n int i0 = this.bT();\\n int i4 = this.bT();\\n protected void ay() {\\n super.ay();\\n this.aW().b(bv);\\n public int bv() {\\n public int cq() {\\n protected float aZ() {\\n private void cJ() {\\n if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bW()) {\\n this.bG.a(this.am());\\n } else if (!this.bW() && this.cy()) {\\n } else if (this.bW() && this.bV() && entityplayer.ag()) {\\n } else if (this.ca() && this.n != null) {\\n if (this.cv()) {\\n if (!this.bW()) {\\n this.cD();\\n if (!flag0 && !this.cy()) {\\n if (this.bW() && this.b() == 0) {\\n this.bX();\\n if (this.bW() && this.b() == 0) {\\n this.bX();\\n if (this.aM() < this.aS() && f0 > 0.0F) {\\n if (!this.bV() && short1 > 0) {\\n if (b1 > 0 && (flag0 || !this.bW()) && b1 < this.cq()) {\\n this.cF();\\n if (!this.bW() && !flag0) {\\n this.cD();\\n if (!flag0 && this.cw() && !this.ce() && itemstack.d == Block.az.cF) {\\n this.l(true);\\n this.cH();\\n if (!flag0 && this.ca() && !this.co() && itemstack.d == Item.aC.cv) {\\n if (this.ca() && this.n == null) {\\n this.o(false);\\n public boolean cv() {\\n return this.bT() == 0;\\n public boolean cw() {\\n int i0 = this.bT();\\n protected boolean bb() {\\n return this.n != null && this.co() ? true : this.cg() || this.ch();\\n public boolean cy() {\\n int i0 = this.bT();\\n public boolean cz() {\\n return this.cy() || this.bT() == 2;\\n private void cL() {\\n this.cE();\\n this.cL();\\n if (!this.cg() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\\n this.o(true);\\n if (this.cg() && ++this.bD > 50) {\\n this.o(false);\\n if (this.ci() && !this.bV() && !this.cg()) {\\n this.cJ();\\n this.p(false);\\n if (this.cg()) {\\n if (this.ch()) {\\n private void cM() {\\n private boolean cN() {\\n return this.n == null && this.o == null && this.bW() && this.bV() && !this.cz() && this.aM() >= this.aS();\\n public void o(boolean flag0) {\\n public void p(boolean flag0) {\\n this.o(false);\\n private void cO() {\\n this.p(true);\\n public void cD() {\\n this.cO();\\n String s0 = this.cp();\\n this.a(s0, this.aZ(), this.ba());\\n public void cE() {\\n this.cm();\\n this.i(true);\\n if (this.n != null && this.co()) {\\n if (this.F && this.bt == 0.0F && this.ch() && !this.bI) {\\n if (this.bt > 0.0F && !this.cd() && this.F) {\\n this.y = this.cn() * (double) this.bt;\\n this.j(true);\\n this.aR = this.bf() * 0.1F;\\n this.j(false);\\n nbttagcompound.a(\\\"EatingHaystack\\\", this.cg());\\n nbttagcompound.a(\\\"ChestedHorse\\\", this.ce());\\n nbttagcompound.a(\\\"HasReproduced\\\", this.cj());\\n nbttagcompound.a(\\\"Bred\\\", this.ci());\\n nbttagcompound.a(\\\"Type\\\", this.bT());\\n nbttagcompound.a(\\\"Variant\\\", this.bU());\\n nbttagcompound.a(\\\"Temper\\\", this.ck());\\n nbttagcompound.a(\\\"Tame\\\", this.bW());\\n nbttagcompound.a(\\\"OwnerName\\\", this.cb());\\n if (this.ce()) {\\n this.o(nbttagcompound.n(\\\"EatingHaystack\\\"));\\n this.k(nbttagcompound.n(\\\"Bred\\\"));\\n this.l(nbttagcompound.n(\\\"ChestedHorse\\\"));\\n this.m(nbttagcompound.n(\\\"HasReproduced\\\"));\\n this.i(nbttagcompound.n(\\\"Tame\\\"));\\n if (nbttagcompound.b(\\\"OwnerName\\\")) {\\n this.b(nbttagcompound.i(\\\"OwnerName\\\"));\\n }\\n\\n AttributeInstance attributeinstance = this.aW().a(\\\"Speed\\\");\\n if (this.ce()) {\\n this.cH();\\n this.cI();\\n if (this.cN() && entityhorse.cN()) {\\n int i0 = this.bT();\\n int i1 = entityhorse.bT();\\n int i0 = this.bT();\\n int i1 = entityhorse.bT();\\n i4 = this.bU() & 255;\\n i4 = entityhorse.bU() & 255;\\n i4 |= this.bU() & '\\\\uff00';\\n i4 |= entityhorse.bU() & '\\\\uff00';\\n double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cP();\\n double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cQ();\\n double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cR();\\n this.a(SharedMonsterAttributes.a).a((double) this.cP());\\n this.a(SharedMonsterAttributes.d).a(this.cR());\\n this.a(bv).a(this.cQ());\\n this.g(this.aS());\\n protected boolean be() {\\n if (this.co()) {\\n if (i0 < 0) {\\n i0 = 0;\\n } else {\\n this.bI = true;\\n this.cO();\\n }\\n if (i0 >= 90) {\\n this.bt = 1.0F;\\n } else {\\n this.bt = 0.4F + 0.4F * (float) i0 / 90.0F;\\n }\\n public void V() {\\n super.V();\\n this.n.b(this.u + (double) (f2 * f0), this.v + this.X() + this.n.W() + (double) f3, this.w - (double) (f2 * f1));\\n private float cP() {\\n private double cQ() {\\n private double cR() {\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityHorse.java\",\n \"implementation\": \"this.cJ();\\n public int bU() {\\n public String am() {\\n if (this.bB()) {\\n return this.bA();\\n int i0 = this.bT();\\n public boolean bV() {\\n public boolean bW() {\\n public boolean ca() {\\n return this.bV();\",\n \"signature\": \"int bT()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityHorse.java\",\n \"implementation\": \"return this.ah.e(21);\\n public float cc() {\\n this.a(this.cc());\\n public boolean cd() {\\n public void i(boolean flag0) {\\n public void j(boolean flag0) {\\n public boolean bG() {\\n return !this.cy() && super.bG();\\n protected void o(float f0) {\\n if (f0 > 6.0F && this.cg()) {\\n this.o(false);\",\n \"signature\": \"String cb()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityHorse.java\",\n \"implementation\": \"public int cf() {\\n public boolean cg() {\\n public boolean ch() {\\n public boolean ci() {\\n public boolean cj() {\\n this.cJ();\\n public void k(boolean flag0) {\\n public void l(boolean flag0) {\\n public void m(boolean flag0) {\\n public void n(boolean flag0) {\\n public int ck() {\\n int i1 = MathHelper.a(this.ck() + i0, 0, this.cq());\\n return this.n != null && this.n.equals(entity) ? false : super.a(damagesource, f0);\\n public int aP() {\\n return by[this.cf()];\\n public boolean cl() {\\n public void cm() {\\n if (!this.q.I && this.ce()) {\\n this.l(false);\\n private void cF() {\\n this.cM();\\n private int cG() {\\n int i0 = this.bT();\\n return this.ce() && (i0 == 1 || i0 == 2) ? 17 : 2;\\n private void cH() {\\n this.bG = new AnimalChest(\\\"HorseChest\\\", this.cG());\\n this.bG.a(this.am());\\n this.cI();\\n private void cI() {\\n this.n(this.bG.a(0) != null);\\n if (this.cv()) {\\n int i0 = this.cf();\\n boolean flag0 = this.co();\\n this.cI();\\n if (i0 == 0 && i0 != this.cf()) {\\n if (!flag0 && this.co()) {\\n public boolean bs() {\\n this.cl();\\n return super.bs();\\n public double cn() {\\n protected String aO() {\\n this.cM();\\n int i0 = this.bT();\\n int i0 = this.bT();\\n protected String aN() {\\n this.cM();\\n this.cO();\\n int i0 = this.bT();\\n public boolean co() {\\n this.cM();\\n if (this.ab.nextInt(10) == 0 && !this.bb()) {\\n this.cO();\\n int i0 = this.bT();\\n protected String cp() {\\n this.cM();\\n this.cO();\\n int i0 = this.bT();\\n int i4 = this.bT();\\n protected void ay() {\\n super.ay();\\n this.aW().b(bv);\\n public int bv() {\\n public int cq() {\\n protected float aZ() {\\n private void cJ() {\\n if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bW()) {\\n this.bG.a(this.am());\",\n \"signature\": \"boolean ce()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityHorse.java\",\n \"implementation\": \"return this.bT() == 0;\\n public boolean cw() {\\n int i0 = this.bT();\\n protected boolean bb() {\\n return this.n != null && this.co() ? true : this.cg() || this.ch();\\n public boolean cy() {\\n int i0 = this.bT();\\n public boolean cz() {\\n return this.cy() || this.bT() == 2;\\n private void cL() {\\n this.cE();\\n this.cL();\\n if (!this.cg() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\\n this.o(true);\\n if (this.cg() && ++this.bD > 50) {\\n this.o(false);\\n if (this.ci() && !this.bV() && !this.cg()) {\\n this.cJ();\\n this.p(false);\\n if (this.cg()) {\\n if (this.ch()) {\\n private void cM() {\\n private boolean cN() {\\n return this.n == null && this.o == null && this.bW() && this.bV() && !this.cz() && this.aM() >= this.aS();\\n public void o(boolean flag0) {\\n public void p(boolean flag0) {\\n this.o(false);\\n private void cO() {\\n this.p(true);\\n public void cD() {\\n this.cO();\\n String s0 = this.cp();\\n this.a(s0, this.aZ(), this.ba());\\n public void cE() {\\n this.cm();\\n this.i(true);\\n if (this.n != null && this.co()) {\\n if (this.F && this.bt == 0.0F && this.ch() && !this.bI) {\\n if (this.bt > 0.0F && !this.cd() && this.F) {\\n this.y = this.cn() * (double) this.bt;\\n this.j(true);\\n this.aR = this.bf() * 0.1F;\\n this.j(false);\\n nbttagcompound.a(\\\"EatingHaystack\\\", this.cg());\\n nbttagcompound.a(\\\"ChestedHorse\\\", this.ce());\\n nbttagcompound.a(\\\"HasReproduced\\\", this.cj());\\n nbttagcompound.a(\\\"Bred\\\", this.ci());\\n nbttagcompound.a(\\\"Type\\\", this.bT());\\n nbttagcompound.a(\\\"Variant\\\", this.bU());\\n nbttagcompound.a(\\\"Temper\\\", this.ck());\\n nbttagcompound.a(\\\"Tame\\\", this.bW());\\n nbttagcompound.a(\\\"OwnerName\\\", this.cb());\\n if (this.ce()) {\\n this.o(nbttagcompound.n(\\\"EatingHaystack\\\"));\\n this.k(nbttagcompound.n(\\\"Bred\\\"));\\n this.l(nbttagcompound.n(\\\"ChestedHorse\\\"));\\n this.m(nbttagcompound.n(\\\"HasReproduced\\\"));\\n this.i(nbttagcompound.n(\\\"Tame\\\"));\\n if (nbttagcompound.b(\\\"OwnerName\\\")) {\\n this.b(nbttagcompound.i(\\\"OwnerName\\\"));\",\n \"signature\": \"boolean cv()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityHorse.java\",\n \"implementation\": \"if (this.co()) {\\n if (i0 < 0) {\\n i0 = 0;\",\n \"signature\": \"boolean be()\"\n }\n ],\n \"old_code\": \" this.m(false);\\n this.cD();\\n this.cF();\\n public int bP() {\\n this.cF();\\n public int bQ() {\\n public String al() {\\n if (this.bx()) {\\n return this.bw();\\n int i0 = this.bP();\\n public boolean bR() {\\n public boolean bS() {\\n public boolean bW() {\\n return this.bR();\\n public float bY() {\\n this.a(this.bY());\\n public boolean bZ() {\\n public void j(boolean flag0) {\\n public void k(boolean flag0) {\\n public boolean bC() {\\n return !this.cu() && super.bC();\\n public boolean ca() {\\n public int cb() {\\n public boolean cc() {\\n public boolean cd() {\\n public boolean ce() {\\n public boolean cf() {\\n this.cF();\\n public void l(boolean flag0) {\\n public void m(boolean flag0) {\\n public void n(boolean flag0) {\\n public void o(boolean flag0) {\\n public int cg() {\\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\\n if (this.n != null && this.n.equals(entity)) {\\n return false;\\n } else if (entity instanceof EntityWolf) {\\n ((EntityWolf) entity).b((Entity) null);\\n return false;\\n } else {\\n return super.a(damagesource, f0);\\n }\\n public int aM() {\\n return by[this.cb()];\\n public boolean ch() {\\n public void ci() {\\n if (!this.q.I && this.ca()) {\\n this.m(false);\\n private void cB() {\\n this.cI();\\n private int cC() {\\n int i0 = this.bP();\\n return this.ca() && (i0 == 1 || i0 == 2) ? 17 : 2;\\n private void cD() {\\n this.bG = new AnimalChest(\\\"HorseChest\\\", this.cC());\\n this.bG.a(this.al());\\n this.cE();\\n private void cE() {\\n this.o(this.bG.a(0) != null);\\n if (this.cr()) {\\n int i0 = this.cb();\\n boolean flag0 = this.ck();\\n this.cE();\\n if (i0 == 0 && i0 != this.cb()) {\\n if (!flag0 && this.ck()) {\\n public boolean bo() {\\n this.ch();\\n return super.bo();\\n public double cj() {\\n protected String aL() {\\n this.cI();\\n int i0 = this.bP();\\n int i0 = this.bP();\\n protected String aK() {\\n this.cI();\\n this.cK();\\n int i0 = this.bP();\\n public boolean ck() {\\n this.cI();\\n if (this.ab.nextInt(10) == 0 && !this.aY()) {\\n this.cK();\\n int i0 = this.bP();\\n protected String cl() {\\n this.cI();\\n this.cK();\\n int i0 = this.bP();\\n int i4 = this.bP();\\n protected void ax() {\\n super.ax();\\n this.aT().b(bv);\\n public int br() {\\n public int cm() {\\n protected float aW() {\\n private void cF() {\\n if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bS()) {\\n this.bG.a(this.al());\\n } else if (!this.bS() && this.cu()) {\\n } else if (this.bS() && this.bR() && entityplayer.af()) {\\n } else if (this.bW() && this.n != null) {\\n if (this.cr()) {\\n if (!this.bS()) {\\n this.cz();\\n if (!flag0 && !this.cu()) {\\n if (this.bS() && this.b() == 0) {\\n this.bT();\\n if (this.bS() && this.b() == 0) {\\n this.bT();\\n if (this.aJ() < this.aP() && f0 > 0.0F) {\\n if (!this.bR() && short1 > 0) {\\n if (b1 > 0 && (flag0 || !this.bS()) && b1 < this.cm()) {\\n this.cB();\\n if (!this.bS() && !flag0) {\\n this.cz();\\n if (!flag0 && this.cs() && !this.ca() && itemstack.d == Block.az.cF) {\\n this.m(true);\\n this.cD();\\n if (!flag0 && this.bW() && !this.ck() && itemstack.d == Item.aC.cv) {\\n if (this.bW() && this.n == null) {\\n this.q(false);\\n public boolean cr() {\\n return this.bP() == 0;\\n public boolean cs() {\\n int i0 = this.bP();\\n protected boolean aY() {\\n return this.n != null && this.ck() ? true : this.cc() || this.cd();\\n public boolean cu() {\\n int i0 = this.bP();\\n public boolean cv() {\\n return this.cu() || this.bP() == 2;\\n private void cH() {\\n this.cA();\\n this.cH();\\n if (!this.cc() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\\n this.p(true);\\n if (this.cc() && ++this.bD > 50) {\\n this.p(false);\\n if (this.ce() && !this.bR() && !this.cc()) {\\n this.cF();\\n this.q(false);\\n if (this.cc()) {\\n if (this.cd()) {\\n private void cI() {\\n private boolean cJ() {\\n return this.n == null && this.o == null && this.bS() && this.bR() && !this.cv() && this.aJ() >= this.aP();\\n }\\n\\n public void w() {\\n if (this.q.I || !this.bS() && !this.ce() || this.aJ() <= 0.0F) {\\n super.w();\\n }\\n public void p(boolean flag0) {\\n public void q(boolean flag0) {\\n this.p(false);\\n private void cK() {\\n this.q(true);\\n public void cz() {\\n this.cK();\\n String s0 = this.cl();\\n this.a(s0, this.aW(), this.aX());\\n public void cA() {\\n this.ci();\\n this.j(true);\\n if (this.n != null && this.ck()) {\\n if (this.F && this.bt == 0.0F && this.cd() && !this.bI) {\\n if (this.bt > 0.0F && !this.bZ() && this.F) {\\n this.y = this.cj() * (double) this.bt;\\n this.k(true);\\n this.aR = this.bc() * 0.1F;\\n this.k(false);\\n nbttagcompound.a(\\\"EatingHaystack\\\", this.cc());\\n nbttagcompound.a(\\\"ChestedHorse\\\", this.ca());\\n nbttagcompound.a(\\\"HasReproduced\\\", this.cf());\\n nbttagcompound.a(\\\"Bred\\\", this.ce());\\n nbttagcompound.a(\\\"Type\\\", this.bP());\\n nbttagcompound.a(\\\"Variant\\\", this.bQ());\\n nbttagcompound.a(\\\"Temper\\\", this.cg());\\n nbttagcompound.a(\\\"Tame\\\", this.bS());\\n if (this.ca()) {\\n this.p(nbttagcompound.n(\\\"EatingHaystack\\\"));\\n this.l(nbttagcompound.n(\\\"Bred\\\"));\\n this.m(nbttagcompound.n(\\\"ChestedHorse\\\"));\\n this.n(nbttagcompound.n(\\\"HasReproduced\\\"));\\n this.j(nbttagcompound.n(\\\"Tame\\\"));\\n AttributeInstance attributeinstance = this.aT().a(\\\"Speed\\\");\\n if (this.ca()) {\\n this.cD();\\n this.cE();\\n if (this.cJ() && entityhorse.cJ()) {\\n int i0 = this.bP();\\n int i1 = entityhorse.bP();\\n int i0 = this.bP();\\n int i1 = entityhorse.bP();\\n i4 = this.bQ() & 255;\\n i4 = entityhorse.bQ() & 255;\\n i4 |= this.bQ() & '\\\\uff00';\\n i4 |= entityhorse.bQ() & '\\\\uff00';\\n double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cL();\\n double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cM();\\n double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cN();\\n this.a(SharedMonsterAttributes.a).a((double) this.cL());\\n this.a(SharedMonsterAttributes.d).a(this.cN());\\n this.a(bv).a(this.cM());\\n this.g(this.aP());\\n protected boolean bb() {\\n if (i0 < 0) {\\n i0 = 0;\\n } else {\\n this.bI = true;\\n this.cK();\\n }\\n if (i0 >= 90) {\\n this.bt = 1.0F;\\n } else {\\n this.bt = 0.4F + 0.4F * (float) i0 / 90.0F;\\n public void U() {\\n super.U();\\n this.n.b(this.u + (double) (f2 * f0), this.v + this.W() + this.n.V() + (double) f3, this.w - (double) (f2 * f1));\\n private float cL() {\\n private double cM() {\\n private double cN() {\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityHorse.java\",\n \"implementation\": \"this.cF();\\n public int bQ() {\\n public String al() {\\n if (this.bx()) {\\n return this.bw();\\n int i0 = this.bP();\\n public boolean bR() {\\n public boolean bS() {\\n public boolean bW() {\\n return this.bR();\\n public float bY() {\\n this.a(this.bY());\\n public boolean bZ() {\\n public void j(boolean flag0) {\\n public void k(boolean flag0) {\\n public boolean bC() {\\n return !this.cu() && super.bC();\\n public boolean ca() {\\n public int cb() {\\n public boolean cc() {\\n public boolean cd() {\\n public boolean ce() {\\n public boolean cf() {\\n this.cF();\\n public void l(boolean flag0) {\\n public void m(boolean flag0) {\\n public void n(boolean flag0) {\\n public void o(boolean flag0) {\\n public int cg() {\\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\\n if (this.n != null && this.n.equals(entity)) {\\n return false;\",\n \"signature\": \"int bP()\"\n },\n {\n \"arguments\": [\n \"entity instanceof EntityWolf\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/EntityHorse.java\",\n \"implementation\": \"((EntityWolf) entity).b((Entity) null);\\n return false;\",\n \"signature\": \"else if (entity instanceof EntityWolf)\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityHorse.java\",\n \"implementation\": \"return by[this.cb()];\\n public boolean ch() {\\n public void ci() {\\n if (!this.q.I && this.ca()) {\\n this.m(false);\\n private void cB() {\\n this.cI();\\n private int cC() {\\n int i0 = this.bP();\\n return this.ca() && (i0 == 1 || i0 == 2) ? 17 : 2;\\n private void cD() {\\n this.bG = new AnimalChest(\\\"HorseChest\\\", this.cC());\\n this.bG.a(this.al());\\n this.cE();\\n private void cE() {\\n this.o(this.bG.a(0) != null);\\n if (this.cr()) {\\n int i0 = this.cb();\\n boolean flag0 = this.ck();\\n this.cE();\\n if (i0 == 0 && i0 != this.cb()) {\\n if (!flag0 && this.ck()) {\\n public boolean bo() {\\n this.ch();\\n return super.bo();\\n public double cj() {\\n protected String aL() {\\n this.cI();\\n int i0 = this.bP();\\n int i0 = this.bP();\\n protected String aK() {\\n this.cI();\\n this.cK();\\n int i0 = this.bP();\\n public boolean ck() {\\n this.cI();\\n if (this.ab.nextInt(10) == 0 && !this.aY()) {\\n this.cK();\\n int i0 = this.bP();\\n protected String cl() {\\n this.cI();\\n this.cK();\\n int i0 = this.bP();\\n int i4 = this.bP();\\n protected void ax() {\\n super.ax();\\n this.aT().b(bv);\\n public int br() {\\n public int cm() {\\n protected float aW() {\\n private void cF() {\\n if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bS()) {\\n this.bG.a(this.al());\",\n \"signature\": \"int aM()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityHorse.java\",\n \"implementation\": \"return this.bP() == 0;\\n public boolean cs() {\\n int i0 = this.bP();\\n protected boolean aY() {\\n return this.n != null && this.ck() ? true : this.cc() || this.cd();\\n public boolean cu() {\\n int i0 = this.bP();\\n public boolean cv() {\\n return this.cu() || this.bP() == 2;\\n private void cH() {\\n this.cA();\\n this.cH();\\n if (!this.cc() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\\n this.p(true);\\n if (this.cc() && ++this.bD > 50) {\\n this.p(false);\\n if (this.ce() && !this.bR() && !this.cc()) {\\n this.cF();\\n this.q(false);\\n if (this.cc()) {\\n if (this.cd()) {\\n private void cI() {\\n private boolean cJ() {\\n return this.n == null && this.o == null && this.bS() && this.bR() && !this.cv() && this.aJ() >= this.aP();\",\n \"signature\": \"boolean cr()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityHorse.java\",\n \"implementation\": \"if (this.q.I || !this.bS() && !this.ce() || this.aJ() <= 0.0F) {\\n super.w();\",\n \"signature\": \"void w()\"\n },\n {\n \"arguments\": [\n \"boolean flag0\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/EntityHorse.java\",\n \"implementation\": \"public void q(boolean flag0) {\\n this.p(false);\\n private void cK() {\\n this.q(true);\\n public void cz() {\\n this.cK();\\n String s0 = this.cl();\\n this.a(s0, this.aW(), this.aX());\\n public void cA() {\\n this.ci();\\n this.j(true);\\n if (this.n != null && this.ck()) {\\n if (this.F && this.bt == 0.0F && this.cd() && !this.bI) {\\n if (this.bt > 0.0F && !this.bZ() && this.F) {\\n this.y = this.cj() * (double) this.bt;\\n this.k(true);\\n this.aR = this.bc() * 0.1F;\\n this.k(false);\\n nbttagcompound.a(\\\"EatingHaystack\\\", this.cc());\\n nbttagcompound.a(\\\"ChestedHorse\\\", this.ca());\\n nbttagcompound.a(\\\"HasReproduced\\\", this.cf());\\n nbttagcompound.a(\\\"Bred\\\", this.ce());\\n nbttagcompound.a(\\\"Type\\\", this.bP());\\n nbttagcompound.a(\\\"Variant\\\", this.bQ());\\n nbttagcompound.a(\\\"Temper\\\", this.cg());\\n nbttagcompound.a(\\\"Tame\\\", this.bS());\\n if (this.ca()) {\\n this.p(nbttagcompound.n(\\\"EatingHaystack\\\"));\\n this.l(nbttagcompound.n(\\\"Bred\\\"));\\n this.m(nbttagcompound.n(\\\"ChestedHorse\\\"));\\n this.n(nbttagcompound.n(\\\"HasReproduced\\\"));\\n this.j(nbttagcompound.n(\\\"Tame\\\"));\\n AttributeInstance attributeinstance = this.aT().a(\\\"Speed\\\");\\n if (this.ca()) {\\n this.cD();\\n this.cE();\\n if (this.cJ() && entityhorse.cJ()) {\\n int i0 = this.bP();\\n int i1 = entityhorse.bP();\\n int i0 = this.bP();\\n int i1 = entityhorse.bP();\\n i4 = this.bQ() & 255;\\n i4 = entityhorse.bQ() & 255;\\n i4 |= this.bQ() & '\\\\uff00';\\n i4 |= entityhorse.bQ() & '\\\\uff00';\\n double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cL();\\n double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cM();\\n double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cN();\\n this.a(SharedMonsterAttributes.a).a((double) this.cL());\\n this.a(SharedMonsterAttributes.d).a(this.cN());\\n this.a(bv).a(this.cM());\\n this.g(this.aP());\\n protected boolean bb() {\\n if (i0 < 0) {\\n i0 = 0;\",\n \"signature\": \"void p(boolean flag0)\"\n }\n ],\n \"patch\": \"@@ -40,7 +40,7 @@ public EntityHorse(World world) {\\n super(world);\\n this.a(1.4F, 1.6F);\\n this.ag = false;\\n- this.m(false);\\n+ this.l(false);\\n this.k().a(true);\\n this.c.a(0, new EntityAISwimming(this));\\n this.c.a(1, new EntityAIPanic(this, 1.2D));\\n@@ -50,7 +50,7 @@ public EntityHorse(World world) {\\n this.c.a(6, new EntityAIWander(this, 0.7D));\\n this.c.a(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));\\n this.c.a(8, new EntityAILookIdle(this));\\n- this.cD();\\n+ this.cH();\\n this.entity = new CanaryHorse(this); // CanaryMod: wrap entity\\n }\\n \\n@@ -65,27 +65,27 @@ protected void a() {\\n \\n public void p(int i0) {\\n this.ah.b(19, Byte.valueOf((byte) i0));\\n- this.cF();\\n+ this.cJ();\\n }\\n \\n- public int bP() {\\n+ public int bT() {\\n return this.ah.a(19);\\n }\\n \\n public void q(int i0) {\\n this.ah.b(20, Integer.valueOf(i0));\\n- this.cF();\\n+ this.cJ();\\n }\\n \\n- public int bQ() {\\n+ public int bU() {\\n return this.ah.c(20);\\n }\\n \\n- public String al() {\\n- if (this.bx()) {\\n- return this.bw();\\n+ public String am() {\\n+ if (this.bB()) {\\n+ return this.bA();\\n } else {\\n- int i0 = this.bP();\\n+ int i0 = this.bT();\\n \\n switch (i0) {\\n case 0:\\n@@ -121,102 +121,112 @@ private void b(int i0, boolean flag0) {\\n }\\n }\\n \\n- public boolean bR() {\\n+ public boolean bV() {\\n return !this.g_();\\n }\\n \\n- public boolean bS() {\\n+ public boolean bW() {\\n return this.w(2);\\n }\\n \\n- public boolean bW() {\\n- return this.bR();\\n+ public boolean ca() {\\n+ return this.bV();\\n+ }\\n+\\n+ public String cb() {\\n+ return this.ah.e(21);\\n }\\n \\n public void b(String s0) {\\n this.ah.b(21, s0);\\n }\\n \\n- public float bY() {\\n+ public float cc() {\\n int i0 = this.b();\\n \\n return i0 >= 0 ? 1.0F : 0.5F + (float) (-24000 - i0) / -24000.0F * 0.5F;\\n }\\n \\n public void a(boolean flag0) {\\n if (flag0) {\\n- this.a(this.bY());\\n+ this.a(this.cc());\\n } else {\\n this.a(1.0F);\\n }\\n }\\n \\n- public boolean bZ() {\\n+ public boolean cd() {\\n return this.br;\\n }\\n \\n- public void j(boolean flag0) {\\n+ public void i(boolean flag0) {\\n this.b(2, flag0);\\n }\\n \\n- public void k(boolean flag0) {\\n+ public void j(boolean flag0) {\\n this.br = flag0;\\n }\\n \\n- public boolean bC() {\\n- return !this.cu() && super.bC();\\n+ public boolean bG() {\\n+ return !this.cy() && super.bG();\\n }\\n \\n- public boolean ca() {\\n+ protected void o(float f0) {\\n+ if (f0 > 6.0F && this.cg()) {\\n+ this.o(false);\\n+ }\\n+ }\\n+\\n+ public boolean ce() {\\n return this.w(8);\\n }\\n \\n- public int cb() {\\n+ public int cf() {\\n return this.ah.c(22);\\n }\\n \\n public int d(ItemStack itemstack) {\\n return itemstack == null ? 0 : (itemstack.d == Item.ce.cv ? 1 : (itemstack.d == Item.cf.cv ? 2 : (itemstack.d == Item.cg.cv ? 3 : 0)));\\n }\\n \\n- public boolean cc() {\\n+ public boolean cg() {\\n return this.w(32);\\n }\\n \\n- public boolean cd() {\\n+ public boolean ch() {\\n return this.w(64);\\n }\\n \\n- public boolean ce() {\\n+ public boolean ci() {\\n return this.w(16);\\n }\\n \\n- public boolean cf() {\\n+ public boolean cj() {\\n return this.bH;\\n }\\n \\n public void r(int i0) {\\n this.ah.b(22, Integer.valueOf(i0));\\n- this.cF();\\n+ this.cJ();\\n }\\n \\n- public void l(boolean flag0) {\\n+ public void k(boolean flag0) {\\n this.b(16, flag0);\\n }\\n \\n- public void m(boolean flag0) {\\n+ public void l(boolean flag0) {\\n this.b(8, flag0);\\n }\\n \\n- public void n(boolean flag0) {\\n+ public void m(boolean flag0) {\\n this.bH = flag0;\\n }\\n \\n- public void o(boolean flag0) {\\n+ public void n(boolean flag0) {\\n this.b(4, flag0);\\n }\\n \\n- public int cg() {\\n+ public int ck() {\\n return this.bs;\\n }\\n \\n@@ -225,7 +235,7 @@ public void s(int i0) {\\n }\\n \\n public int t(int i0) {\\n- int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\\n+ int i1 = MathHelper.a(this.ck() + i0, 0, this.cq());\\n \\n this.s(i1);\\n return i1;\\n@@ -234,41 +244,34 @@ public int t(int i0) {\\n public boolean a(DamageSource damagesource, float f0) {\\n Entity entity = damagesource.i();\\n \\n- if (this.n != null && this.n.equals(entity)) {\\n- return false;\\n- } else if (entity instanceof EntityWolf) {\\n- ((EntityWolf) entity).b((Entity) null);\\n- return false;\\n- } else {\\n- return super.a(damagesource, f0);\\n- }\\n+ return this.n != null && this.n.equals(entity) ? false : super.a(damagesource, f0);\\n }\\n \\n- public int aM() {\\n- return by[this.cb()];\\n+ public int aP() {\\n+ return by[this.cf()];\\n }\\n \\n public boolean L() {\\n return this.n == null;\\n }\\n \\n- public boolean ch() {\\n+ public boolean cl() {\\n int i0 = MathHelper.c(this.u);\\n int i1 = MathHelper.c(this.w);\\n \\n this.q.a(i0, i1);\\n return true;\\n }\\n \\n- public void ci() {\\n- if (!this.q.I && this.ca()) {\\n+ public void cm() {\\n+ if (!this.q.I && this.ce()) {\\n this.b(Block.az.cF, 1);\\n- this.m(false);\\n+ this.l(false);\\n }\\n }\\n \\n- private void cB() {\\n- this.cI();\\n+ private void cF() {\\n+ this.cM();\\n this.q.a((Entity) this, \\\"eating\\\", 1.0F, 1.0F + (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F);\\n }\\n \\n@@ -295,17 +298,17 @@ protected void b(float f0) {\\n }\\n }\\n \\n- private int cC() {\\n- int i0 = this.bP();\\n+ private int cG() {\\n+ int i0 = this.bT();\\n \\n- return this.ca() && (i0 == 1 || i0 == 2) ? 17 : 2;\\n+ return this.ce() && (i0 == 1 || i0 == 2) ? 17 : 2;\\n }\\n \\n- private void cD() {\\n+ private void cH() {\\n AnimalChest animalchest = this.bG;\\n \\n- this.bG = new AnimalChest(\\\"HorseChest\\\", this.cC());\\n- this.bG.a(this.al());\\n+ this.bG = new AnimalChest(\\\"HorseChest\\\", this.cG());\\n+ this.bG.a(this.am());\\n if (animalchest != null) {\\n animalchest.b(this);\\n int i0 = Math.min(animalchest.j_(), this.bG.j_());\\n@@ -322,37 +325,37 @@ private void cD() {\\n }\\n \\n this.bG.a(this);\\n- this.cE();\\n+ this.cI();\\n }\\n \\n- private void cE() {\\n+ private void cI() {\\n if (!this.q.I) {\\n- this.o(this.bG.a(0) != null);\\n- if (this.cr()) {\\n+ this.n(this.bG.a(0) != null);\\n+ if (this.cv()) {\\n this.r(this.d(this.bG.a(1)));\\n }\\n }\\n }\\n \\n public void a(InventoryBasic inventorybasic) {\\n- int i0 = this.cb();\\n- boolean flag0 = this.ck();\\n+ int i0 = this.cf();\\n+ boolean flag0 = this.co();\\n \\n- this.cE();\\n+ this.cI();\\n if (this.ac > 20) {\\n- if (i0 == 0 && i0 != this.cb()) {\\n+ if (i0 == 0 && i0 != this.cf()) {\\n this.a(\\\"mob.horse.armor\\\", 0.5F, 1.0F);\\n }\\n \\n- if (!flag0 && this.ck()) {\\n+ if (!flag0 && this.co()) {\\n this.a(\\\"mob.horse.leather\\\", 0.5F, 1.0F);\\n }\\n }\\n }\\n \\n- public boolean bo() {\\n- this.ch();\\n- return super.bo();\\n+ public boolean bs() {\\n+ this.cl();\\n+ return super.bs();\\n }\\n \\n protected EntityHorse a(Entity entity, double d0) {\\n@@ -374,54 +377,54 @@ protected EntityHorse a(Entity entity, double d0) {\\n return (EntityHorse) entity1;\\n }\\n \\n- public double cj() {\\n+ public double cn() {\\n return this.a(bv).e();\\n }\\n \\n- protected String aL() {\\n- this.cI();\\n- int i0 = this.bP();\\n+ protected String aO() {\\n+ this.cM();\\n+ int i0 = this.bT();\\n \\n return i0 == 3 ? \\\"mob.horse.zombie.death\\\" : (i0 == 4 ? \\\"mob.horse.skeleton.death\\\" : (i0 != 1 && i0 != 2 ? \\\"mob.horse.death\\\" : \\\"mob.horse.donkey.death\\\"));\\n }\\n \\n protected int s() {\\n boolean flag0 = this.ab.nextInt(4) == 0;\\n- int i0 = this.bP();\\n+ int i0 = this.bT();\\n \\n return i0 == 4 ? Item.aZ.cv : (i0 == 3 ? (flag0 ? 0 : Item.bo.cv) : Item.aH.cv);\\n }\\n \\n- protected String aK() {\\n- this.cI();\\n+ protected String aN() {\\n+ this.cM();\\n if (this.ab.nextInt(3) == 0) {\\n- this.cK();\\n+ this.cO();\\n }\\n \\n- int i0 = this.bP();\\n+ int i0 = this.bT();\\n \\n return i0 == 3 ? \\\"mob.horse.zombie.hit\\\" : (i0 == 4 ? \\\"mob.horse.skeleton.hit\\\" : (i0 != 1 && i0 != 2 ? \\\"mob.horse.hit\\\" : \\\"mob.horse.donkey.hit\\\"));\\n }\\n \\n- public boolean ck() {\\n+ public boolean co() {\\n return this.w(4);\\n }\\n \\n protected String r() {\\n- this.cI();\\n- if (this.ab.nextInt(10) == 0 && !this.aY()) {\\n- this.cK();\\n+ this.cM();\\n+ if (this.ab.nextInt(10) == 0 && !this.bb()) {\\n+ this.cO();\\n }\\n \\n- int i0 = this.bP();\\n+ int i0 = this.bT();\\n \\n return i0 == 3 ? \\\"mob.horse.zombie.idle\\\" : (i0 == 4 ? \\\"mob.horse.skeleton.idle\\\" : (i0 != 1 && i0 != 2 ? \\\"mob.horse.idle\\\" : \\\"mob.horse.donkey.idle\\\"));\\n }\\n \\n- protected String cl() {\\n- this.cI();\\n- this.cK();\\n- int i0 = this.bP();\\n+ protected String cp() {\\n+ this.cM();\\n+ this.cO();\\n+ int i0 = this.bT();\\n \\n return i0 != 3 && i0 != 4 ? (i0 != 1 && i0 != 2 ? \\\"mob.horse.angry\\\" : \\\"mob.horse.donkey.angry\\\") : null;\\n }\\n@@ -434,7 +437,7 @@ protected void a(int i0, int i1, int i2, int i3) {\\n }\\n \\n if (!Block.s[i3].cU.d()) {\\n- int i4 = this.bP();\\n+ int i4 = this.bT();\\n \\n if (this.n != null && i4 != 1 && i4 != 2) {\\n ++this.bP;\\n@@ -454,36 +457,36 @@ protected void a(int i0, int i1, int i2, int i3) {\\n }\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n- this.aT().b(bv);\\n+ protected void ay() {\\n+ super.ay();\\n+ this.aW().b(bv);\\n this.a(SharedMonsterAttributes.a).a(53.0D);\\n this.a(SharedMonsterAttributes.d).a(0.22499999403953552D);\\n }\\n \\n- public int br() {\\n+ public int bv() {\\n return 6;\\n }\\n \\n- public int cm() {\\n+ public int cq() {\\n return 100;\\n }\\n \\n- protected float aW() {\\n+ protected float aZ() {\\n return 0.8F;\\n }\\n \\n public int o() {\\n return 400;\\n }\\n \\n- private void cF() {\\n+ private void cJ() {\\n this.bQ = null;\\n }\\n \\n public void f(EntityPlayer entityplayer) {\\n- if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bS()) {\\n- this.bG.a(this.al());\\n+ if (!this.q.I && (this.n == null || this.n == entityplayer) && this.bW()) {\\n+ this.bG.a(this.am());\\n entityplayer.a(this, (IInventory) this.bG);\\n }\\n }\\n@@ -493,18 +496,18 @@ public boolean a(EntityPlayer entityplayer) {\\n \\n if (itemstack != null && itemstack.d == Item.bE.cv) {\\n return super.a(entityplayer);\\n- } else if (!this.bS() && this.cu()) {\\n+ } else if (!this.bW() && this.cy()) {\\n return false;\\n- } else if (this.bS() && this.bR() && entityplayer.af()) {\\n+ } else if (this.bW() && this.bV() && entityplayer.ag()) {\\n this.f(entityplayer);\\n return true;\\n- } else if (this.bW() && this.n != null) {\\n+ } else if (this.ca() && this.n != null) {\\n return super.a(entityplayer);\\n } else {\\n if (itemstack != null) {\\n boolean flag0 = false;\\n \\n- if (this.cr()) {\\n+ if (this.cv()) {\\n byte b0 = -1;\\n \\n if (itemstack.d == Item.ce.cv) {\\n@@ -516,8 +519,8 @@ public boolean a(EntityPlayer entityplayer) {\\n }\\n \\n if (b0 >= 0) {\\n- if (!this.bS()) {\\n- this.cz();\\n+ if (!this.bW()) {\\n+ this.cD();\\n return true;\\n }\\n \\n@@ -526,7 +529,7 @@ public boolean a(EntityPlayer entityplayer) {\\n }\\n }\\n \\n- if (!flag0 && !this.cu()) {\\n+ if (!flag0 && !this.cy()) {\\n float f0 = 0.0F;\\n short short1 = 0;\\n byte b1 = 0;\\n@@ -554,57 +557,57 @@ public boolean a(EntityPlayer entityplayer) {\\n f0 = 4.0F;\\n short1 = 60;\\n b1 = 5;\\n- if (this.bS() && this.b() == 0) {\\n+ if (this.bW() && this.b() == 0) {\\n flag0 = true;\\n- this.bT();\\n+ this.bX();\\n }\\n } else if (itemstack.d == Item.av.cv) {\\n f0 = 10.0F;\\n short1 = 240;\\n b1 = 10;\\n- if (this.bS() && this.b() == 0) {\\n+ if (this.bW() && this.b() == 0) {\\n flag0 = true;\\n- this.bT();\\n+ this.bX();\\n }\\n }\\n \\n- if (this.aJ() < this.aP() && f0 > 0.0F) {\\n+ if (this.aM() < this.aS() && f0 > 0.0F) {\\n this.f(f0);\\n flag0 = true;\\n }\\n \\n- if (!this.bR() && short1 > 0) {\\n+ if (!this.bV() && short1 > 0) {\\n this.a(short1);\\n flag0 = true;\\n }\\n \\n- if (b1 > 0 && (flag0 || !this.bS()) && b1 < this.cm()) {\\n+ if (b1 > 0 && (flag0 || !this.bW()) && b1 < this.cq()) {\\n flag0 = true;\\n this.t(b1);\\n }\\n \\n if (flag0) {\\n- this.cB();\\n+ this.cF();\\n }\\n }\\n \\n- if (!this.bS() && !flag0) {\\n+ if (!this.bW() && !flag0) {\\n if (itemstack != null && itemstack.a(entityplayer, (EntityLivingBase) this)) {\\n return true;\\n }\\n \\n- this.cz();\\n+ this.cD();\\n return true;\\n }\\n \\n- if (!flag0 && this.cs() && !this.ca() && itemstack.d == Block.az.cF) {\\n- this.m(true);\\n+ if (!flag0 && this.cw() && !this.ce() && itemstack.d == Block.az.cF) {\\n+ this.l(true);\\n this.a(\\\"mob.chickenplop\\\", 1.0F, (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n flag0 = true;\\n- this.cD();\\n+ this.cH();\\n }\\n \\n- if (!flag0 && this.bW() && !this.ck() && itemstack.d == Item.aC.cv) {\\n+ if (!flag0 && this.ca() && !this.co() && itemstack.d == Item.aC.cv) {\\n this.f(entityplayer);\\n return true;\\n }\\n@@ -618,7 +621,7 @@ public boolean a(EntityPlayer entityplayer) {\\n }\\n }\\n \\n- if (this.bW() && this.n == null) {\\n+ if (this.ca() && this.n == null) {\\n if (itemstack != null && itemstack.a(entityplayer, (EntityLivingBase) this)) {\\n return true;\\n } else {\\n@@ -634,55 +637,55 @@ public boolean a(EntityPlayer entityplayer) {\\n private void h(EntityPlayer entityplayer) {\\n entityplayer.A = this.A;\\n entityplayer.B = this.B;\\n+ this.o(false);\\n this.p(false);\\n- this.q(false);\\n if (!this.q.I) {\\n entityplayer.a((Entity) this);\\n }\\n }\\n \\n- public boolean cr() {\\n- return this.bP() == 0;\\n+ public boolean cv() {\\n+ return this.bT() == 0;\\n }\\n \\n- public boolean cs() {\\n- int i0 = this.bP();\\n+ public boolean cw() {\\n+ int i0 = this.bT();\\n \\n return i0 == 2 || i0 == 1;\\n }\\n \\n- protected boolean aY() {\\n- return this.n != null && this.ck() ? true : this.cc() || this.cd();\\n+ protected boolean bb() {\\n+ return this.n != null && this.co() ? true : this.cg() || this.ch();\\n }\\n \\n- public boolean cu() {\\n- int i0 = this.bP();\\n+ public boolean cy() {\\n+ int i0 = this.bT();\\n \\n return i0 == 3 || i0 == 4;\\n }\\n \\n- public boolean cv() {\\n- return this.cu() || this.bP() == 2;\\n+ public boolean cz() {\\n+ return this.cy() || this.bT() == 2;\\n }\\n \\n public boolean c(ItemStack itemstack) {\\n return false;\\n }\\n \\n- private void cH() {\\n+ private void cL() {\\n this.bp = 1;\\n }\\n \\n public void a(DamageSource damagesource) {\\n super.a(damagesource);\\n if (!this.q.I) {\\n- this.cA();\\n+ this.cE();\\n }\\n }\\n \\n public void c() {\\n if (this.ab.nextInt(200) == 0) {\\n- this.cH();\\n+ this.cL();\\n }\\n \\n super.c();\\n@@ -691,16 +694,16 @@ public void c() {\\n this.f(1.0F);\\n }\\n \\n- if (!this.cc() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\\n- this.p(true);\\n+ if (!this.cg() && this.n == null && this.ab.nextInt(300) == 0 && this.q.a(MathHelper.c(this.u), MathHelper.c(this.v) - 1, MathHelper.c(this.w)) == Block.z.cF) {\\n+ this.o(true);\\n }\\n \\n- if (this.cc() && ++this.bD > 50) {\\n+ if (this.cg() && ++this.bD > 50) {\\n this.bD = 0;\\n- this.p(false);\\n+ this.o(false);\\n }\\n \\n- if (this.ce() && !this.bR() && !this.cc()) {\\n+ if (this.ci() && !this.bV() && !this.cg()) {\\n EntityHorse entityhorse = this.a(this, 16.0D);\\n \\n if (entityhorse != null && this.e(entityhorse) > 4.0D) {\\n@@ -716,7 +719,7 @@ public void l_() {\\n super.l_();\\n if (this.q.I && this.ah.a()) {\\n this.ah.e();\\n- this.cF();\\n+ this.cJ();\\n }\\n \\n if (this.bE > 0 && ++this.bE > 30) {\\n@@ -726,7 +729,7 @@ public void l_() {\\n \\n if (!this.q.I && this.bF > 0 && ++this.bF > 20) {\\n this.bF = 0;\\n- this.q(false);\\n+ this.p(false);\\n }\\n \\n if (this.bp > 0 && ++this.bp > 8) {\\n@@ -741,7 +744,7 @@ public void l_() {\\n }\\n \\n this.bK = this.bJ;\\n- if (this.cc()) {\\n+ if (this.cg()) {\\n this.bJ += (1.0F - this.bJ) * 0.4F + 0.05F;\\n if (this.bJ > 1.0F) {\\n this.bJ = 1.0F;\\n@@ -754,7 +757,7 @@ public void l_() {\\n }\\n \\n this.bM = this.bL;\\n- if (this.cd()) {\\n+ if (this.ch()) {\\n this.bK = this.bJ = 0.0F;\\n this.bL += (1.0F - this.bL) * 0.4F + 0.05F;\\n if (this.bL > 1.0F) {\\n@@ -782,58 +785,52 @@ public void l_() {\\n }\\n }\\n \\n- private void cI() {\\n+ private void cM() {\\n if (!this.q.I) {\\n this.bE = 1;\\n this.b(128, true);\\n }\\n }\\n \\n- private boolean cJ() {\\n- return this.n == null && this.o == null && this.bS() && this.bR() && !this.cv() && this.aJ() >= this.aP();\\n- }\\n-\\n- public void w() {\\n- if (this.q.I || !this.bS() && !this.ce() || this.aJ() <= 0.0F) {\\n- super.w();\\n- }\\n+ private boolean cN() {\\n+ return this.n == null && this.o == null && this.bW() && this.bV() && !this.cz() && this.aM() >= this.aS();\\n }\\n \\n public void e(boolean flag0) {\\n this.b(32, flag0);\\n }\\n \\n- public void p(boolean flag0) {\\n+ public void o(boolean flag0) {\\n this.e(flag0);\\n }\\n \\n- public void q(boolean flag0) {\\n+ public void p(boolean flag0) {\\n if (flag0) {\\n- this.p(false);\\n+ this.o(false);\\n }\\n \\n this.b(64, flag0);\\n }\\n \\n- private void cK() {\\n+ private void cO() {\\n if (!this.q.I) {\\n this.bF = 1;\\n- this.q(true);\\n+ this.p(true);\\n }\\n }\\n \\n- public void cz() {\\n- this.cK();\\n- String s0 = this.cl();\\n+ public void cD() {\\n+ this.cO();\\n+ String s0 = this.cp();\\n \\n if (s0 != null) {\\n- this.a(s0, this.aW(), this.aX());\\n+ this.a(s0, this.aZ(), this.ba());\\n }\\n }\\n \\n- public void cA() {\\n+ public void cE() {\\n this.a(this, this.bG);\\n- this.ci();\\n+ this.cm();\\n }\\n \\n private void a(Entity entity, AnimalChest animalchest) {\\n@@ -850,12 +847,12 @@ private void a(Entity entity, AnimalChest animalchest) {\\n \\n public boolean g(EntityPlayer entityplayer) {\\n this.b(entityplayer.c_());\\n- this.j(true);\\n+ this.i(true);\\n return true;\\n }\\n \\n public void e(float f0, float f1) {\\n- if (this.n != null && this.ck()) {\\n+ if (this.n != null && this.co()) {\\n this.C = this.A = this.n.A;\\n this.B = this.n.B * 0.5F;\\n this.b(this.A, this.B);\\n@@ -867,18 +864,18 @@ public void e(float f0, float f1) {\\n this.bP = 0;\\n }\\n \\n- if (this.F && this.bt == 0.0F && this.cd() && !this.bI) {\\n+ if (this.F && this.bt == 0.0F && this.ch() && !this.bI) {\\n f0 = 0.0F;\\n f1 = 0.0F;\\n }\\n \\n- if (this.bt > 0.0F && !this.bZ() && this.F) {\\n- this.y = this.cj() * (double) this.bt;\\n+ if (this.bt > 0.0F && !this.cd() && this.F) {\\n+ this.y = this.cn() * (double) this.bt;\\n if (this.a(Potion.j)) {\\n this.y += (double) ((float) (this.b(Potion.j).c() + 1) * 0.1F);\\n }\\n \\n- this.k(true);\\n+ this.j(true);\\n this.an = true;\\n if (f1 > 0.0F) {\\n float f2 = MathHelper.a(this.A * 3.1415927F / 180.0F);\\n@@ -893,15 +890,15 @@ public void e(float f0, float f1) {\\n }\\n \\n this.Y = 1.0F;\\n- this.aR = this.bc() * 0.1F;\\n+ this.aR = this.bf() * 0.1F;\\n if (!this.q.I) {\\n this.i((float) this.a(SharedMonsterAttributes.d).e());\\n super.e(f0, f1);\\n }\\n \\n if (this.F) {\\n this.bt = 0.0F;\\n- this.k(false);\\n+ this.j(false);\\n }\\n \\n this.aF = this.aG;\\n@@ -924,15 +921,16 @@ public void e(float f0, float f1) {\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n super.b(nbttagcompound);\\n- nbttagcompound.a(\\\"EatingHaystack\\\", this.cc());\\n- nbttagcompound.a(\\\"ChestedHorse\\\", this.ca());\\n- nbttagcompound.a(\\\"HasReproduced\\\", this.cf());\\n- nbttagcompound.a(\\\"Bred\\\", this.ce());\\n- nbttagcompound.a(\\\"Type\\\", this.bP());\\n- nbttagcompound.a(\\\"Variant\\\", this.bQ());\\n- nbttagcompound.a(\\\"Temper\\\", this.cg());\\n- nbttagcompound.a(\\\"Tame\\\", this.bS());\\n- if (this.ca()) {\\n+ nbttagcompound.a(\\\"EatingHaystack\\\", this.cg());\\n+ nbttagcompound.a(\\\"ChestedHorse\\\", this.ce());\\n+ nbttagcompound.a(\\\"HasReproduced\\\", this.cj());\\n+ nbttagcompound.a(\\\"Bred\\\", this.ci());\\n+ nbttagcompound.a(\\\"Type\\\", this.bT());\\n+ nbttagcompound.a(\\\"Variant\\\", this.bU());\\n+ nbttagcompound.a(\\\"Temper\\\", this.ck());\\n+ nbttagcompound.a(\\\"Tame\\\", this.bW());\\n+ nbttagcompound.a(\\\"OwnerName\\\", this.cb());\\n+ if (this.ce()) {\\n NBTTagList nbttaglist = new NBTTagList();\\n \\n for (int i0 = 2; i0 < this.bG.j_(); ++i0) {\\n@@ -961,24 +959,28 @@ public void b(NBTTagCompound nbttagcompound) {\\n \\n public void a(NBTTagCompound nbttagcompound) {\\n super.a(nbttagcompound);\\n- this.p(nbttagcompound.n(\\\"EatingHaystack\\\"));\\n- this.l(nbttagcompound.n(\\\"Bred\\\"));\\n- this.m(nbttagcompound.n(\\\"ChestedHorse\\\"));\\n- this.n(nbttagcompound.n(\\\"HasReproduced\\\"));\\n+ this.o(nbttagcompound.n(\\\"EatingHaystack\\\"));\\n+ this.k(nbttagcompound.n(\\\"Bred\\\"));\\n+ this.l(nbttagcompound.n(\\\"ChestedHorse\\\"));\\n+ this.m(nbttagcompound.n(\\\"HasReproduced\\\"));\\n this.p(nbttagcompound.e(\\\"Type\\\"));\\n this.q(nbttagcompound.e(\\\"Variant\\\"));\\n this.s(nbttagcompound.e(\\\"Temper\\\"));\\n- this.j(nbttagcompound.n(\\\"Tame\\\"));\\n- AttributeInstance attributeinstance = this.aT().a(\\\"Speed\\\");\\n+ this.i(nbttagcompound.n(\\\"Tame\\\"));\\n+ if (nbttagcompound.b(\\\"OwnerName\\\")) {\\n+ this.b(nbttagcompound.i(\\\"OwnerName\\\"));\\n+ }\\n+\\n+ AttributeInstance attributeinstance = this.aW().a(\\\"Speed\\\");\\n \\n if (attributeinstance != null) {\\n this.a(SharedMonsterAttributes.d).a(attributeinstance.b() * 0.25D);\\n }\\n \\n- if (this.ca()) {\\n+ if (this.ce()) {\\n NBTTagList nbttaglist = nbttagcompound.m(\\\"Items\\\");\\n \\n- this.cD();\\n+ this.cH();\\n \\n for (int i0 = 0; i0 < nbttaglist.c(); ++i0) {\\n NBTTagCompound nbttagcompound1 = (NBTTagCompound) nbttaglist.b(i0);\\n@@ -1008,7 +1010,7 @@ public void a(NBTTagCompound nbttagcompound) {\\n this.bG.a(0, new ItemStack(Item.aC));\\n }\\n \\n- this.cE();\\n+ this.cI();\\n }\\n \\n public boolean a(EntityAnimal entityanimal) {\\n@@ -1019,9 +1021,9 @@ public boolean a(EntityAnimal entityanimal) {\\n } else {\\n EntityHorse entityhorse = (EntityHorse) entityanimal;\\n \\n- if (this.cJ() && entityhorse.cJ()) {\\n- int i0 = this.bP();\\n- int i1 = entityhorse.bP();\\n+ if (this.cN() && entityhorse.cN()) {\\n+ int i0 = this.bT();\\n+ int i1 = entityhorse.bT();\\n \\n return i0 == i1 || i0 == 0 && i1 == 1 || i0 == 1 && i1 == 0;\\n } else {\\n@@ -1033,8 +1035,8 @@ public boolean a(EntityAnimal entityanimal) {\\n public EntityAgeable a(EntityAgeable entityageable) {\\n EntityHorse entityhorse = (EntityHorse) entityageable;\\n EntityHorse entityhorse1 = new EntityHorse(this.q);\\n- int i0 = this.bP();\\n- int i1 = entityhorse.bP();\\n+ int i0 = this.bT();\\n+ int i1 = entityhorse.bT();\\n int i2 = 0;\\n \\n if (i0 == i1) {\\n@@ -1048,19 +1050,19 @@ public EntityAgeable a(EntityAgeable entityageable) {\\n int i4;\\n \\n if (i3 < 4) {\\n- i4 = this.bQ() & 255;\\n+ i4 = this.bU() & 255;\\n } else if (i3 < 8) {\\n- i4 = entityhorse.bQ() & 255;\\n+ i4 = entityhorse.bU() & 255;\\n } else {\\n i4 = this.ab.nextInt(7);\\n }\\n \\n int i5 = this.ab.nextInt(5);\\n \\n if (i5 < 4) {\\n- i4 |= this.bQ() & '\\\\uff00';\\n+ i4 |= this.bU() & '\\\\uff00';\\n } else if (i5 < 8) {\\n- i4 |= entityhorse.bQ() & '\\\\uff00';\\n+ i4 |= entityhorse.bU() & '\\\\uff00';\\n } else {\\n i4 |= this.ab.nextInt(5) << 8 & '\\\\uff00';\\n }\\n@@ -1069,13 +1071,13 @@ public EntityAgeable a(EntityAgeable entityageable) {\\n }\\n \\n entityhorse1.p(i2);\\n- double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cL();\\n+ double d0 = this.a(SharedMonsterAttributes.a).b() + entityageable.a(SharedMonsterAttributes.a).b() + (double) this.cP();\\n \\n entityhorse1.a(SharedMonsterAttributes.a).a(d0 / 3.0D);\\n- double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cM();\\n+ double d1 = this.a(bv).b() + entityageable.a(bv).b() + this.cQ();\\n \\n entityhorse1.a(bv).a(d1 / 3.0D);\\n- double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cN();\\n+ double d2 = this.a(SharedMonsterAttributes.d).b() + entityageable.a(SharedMonsterAttributes.d).b() + this.cR();\\n \\n entityhorse1.a(SharedMonsterAttributes.d).a(d2 / 3.0D);\\n return entityhorse1;\\n@@ -1111,9 +1113,9 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\\n }\\n \\n if (i1 != 4 && i1 != 3) {\\n- this.a(SharedMonsterAttributes.a).a((double) this.cL());\\n+ this.a(SharedMonsterAttributes.a).a((double) this.cP());\\n if (i1 == 0) {\\n- this.a(SharedMonsterAttributes.d).a(this.cN());\\n+ this.a(SharedMonsterAttributes.d).a(this.cR());\\n } else {\\n this.a(SharedMonsterAttributes.d).a(0.17499999701976776D);\\n }\\n@@ -1123,58 +1125,60 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\\n }\\n \\n if (i1 != 2 && i1 != 1) {\\n- this.a(bv).a(this.cM());\\n+ this.a(bv).a(this.cQ());\\n } else {\\n this.a(bv).a(0.5D);\\n }\\n \\n- this.g(this.aP());\\n+ this.g(this.aS());\\n return (EntityLivingData) object;\\n }\\n \\n- protected boolean bb() {\\n+ protected boolean be() {\\n return true;\\n }\\n \\n public void u(int i0) {\\n- if (i0 < 0) {\\n- i0 = 0;\\n- } else {\\n- this.bI = true;\\n- this.cK();\\n- }\\n+ if (this.co()) {\\n+ if (i0 < 0) {\\n+ i0 = 0;\\n+ } else {\\n+ this.bI = true;\\n+ this.cO();\\n+ }\\n \\n- if (i0 >= 90) {\\n- this.bt = 1.0F;\\n- } else {\\n- this.bt = 0.4F + 0.4F * (float) i0 / 90.0F;\\n+ if (i0 >= 90) {\\n+ this.bt = 1.0F;\\n+ } else {\\n+ this.bt = 0.4F + 0.4F * (float) i0 / 90.0F;\\n+ }\\n }\\n }\\n \\n- public void U() {\\n- super.U();\\n+ public void V() {\\n+ super.V();\\n if (this.bM > 0.0F) {\\n float f0 = MathHelper.a(this.aN * 3.1415927F / 180.0F);\\n float f1 = MathHelper.b(this.aN * 3.1415927F / 180.0F);\\n float f2 = 0.7F * this.bM;\\n float f3 = 0.15F * this.bM;\\n \\n- this.n.b(this.u + (double) (f2 * f0), this.v + this.W() + this.n.V() + (double) f3, this.w - (double) (f2 * f1));\\n+ this.n.b(this.u + (double) (f2 * f0), this.v + this.X() + this.n.W() + (double) f3, this.w - (double) (f2 * f1));\\n if (this.n instanceof EntityLivingBase) {\\n ((EntityLivingBase) this.n).aN = this.aN;\\n }\\n }\\n }\\n \\n- private float cL() {\\n+ private float cP() {\\n return 15.0F + (float) this.ab.nextInt(8) + (float) this.ab.nextInt(9);\\n }\\n \\n- private double cM() {\\n+ private double cQ() {\\n return 0.4000000059604645D + this.ab.nextDouble() * 0.2D + this.ab.nextDouble() * 0.2D + this.ab.nextDouble() * 0.2D;\\n }\\n \\n- private double cN() {\\n+ private double cR() {\\n return (0.44999998807907104D + this.ab.nextDouble() * 0.3D + this.ab.nextDouble() * 0.3D + this.ab.nextDouble() * 0.3D) * 0.25D;\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityHorse.java\",\n \"sha\": \"5572985b3444cac19e10bb5af9f1abd00ef77c89\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 19,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityIronGolem.java\",\n \"changes\": 38,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityIronGolem.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 19,\n \"filename\": \"src/main/java/net/minecraft/server/EntityIronGolem.java\",\n \"new_code\": \" this.c.a(4, new EntityAIMoveTowardsRestriction(this, 1.0D));\\n public boolean be() {\\n protected void bj() {\\n this.bR();\\n super.bj();\\n protected void ay() {\\n super.ay();\\n if (entity instanceof IMob && this.aC().nextInt(20) == 0) {\\n this.d((EntityLivingBase) entity);\\n return this.bW() && EntityPlayer.class.isAssignableFrom(oclass0) ? false : super.a(oclass0);\\n nbttagcompound.a(\\\"PlayerCreated\\\", this.bW());\\n this.i(nbttagcompound.n(\\\"PlayerCreated\\\"));\\n public Village bT() {\\n protected String aN() {\\n protected String aO() {\\n public int bV() {\\n public boolean bW() {\\n public void i(boolean flag0) {\\n if (!this.bW() && this.aS != null && this.bp != null) {\",\n \"new_methods\": [],\n \"old_code\": \" this.c.a(4, new EntityAIMoveTwardsRestriction(this, 1.0D));\\n public boolean bb() {\\n protected void bg() {\\n this.bN();\\n super.bg();\\n protected void ax() {\\n super.ax();\\n if (entity instanceof IMob && this.aB().nextInt(20) == 0) {\\n this.c((EntityLivingBase) entity);\\n return this.bS() && EntityPlayer.class.isAssignableFrom(oclass0) ? false : super.a(oclass0);\\n nbttagcompound.a(\\\"PlayerCreated\\\", this.bS());\\n this.j(nbttagcompound.n(\\\"PlayerCreated\\\"));\\n public Village bP() {\\n protected String aK() {\\n protected String aL() {\\n public int bR() {\\n public boolean bS() {\\n public void j(boolean flag0) {\\n if (!this.bS() && this.aS != null && this.bp != null) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -16,7 +16,7 @@ public EntityIronGolem(World world) {\\n this.c.a(1, new EntityAIAttackOnCollide(this, 1.0D, true));\\n this.c.a(2, new EntityAIMoveTowardsTarget(this, 0.9D, 32.0F));\\n this.c.a(3, new EntityAIMoveThroughVillage(this, 0.6D, true));\\n- this.c.a(4, new EntityAIMoveTwardsRestriction(this, 1.0D));\\n+ this.c.a(4, new EntityAIMoveTowardsRestriction(this, 1.0D));\\n this.c.a(5, new EntityAILookAtVillager(this));\\n this.c.a(6, new EntityAIWander(this, 0.6D));\\n this.c.a(7, new EntityAIWatchClosest(this, EntityPlayer.class, 6.0F));\\n@@ -32,28 +32,28 @@ protected void a() {\\n this.ah.a(16, Byte.valueOf((byte) 0));\\n }\\n \\n- public boolean bb() {\\n+ public boolean be() {\\n return true;\\n }\\n \\n- protected void bg() {\\n+ protected void bj() {\\n if (--this.bq <= 0) {\\n this.bq = 70 + this.ab.nextInt(50);\\n this.bp = this.q.A.a(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w), 32);\\n if (this.bp == null) {\\n- this.bN();\\n+ this.bR();\\n } else {\\n ChunkCoordinates chunkcoordinates = this.bp.a();\\n \\n this.b(chunkcoordinates.a, chunkcoordinates.b, chunkcoordinates.c, (int) ((float) this.bp.b() * 0.6F));\\n }\\n }\\n \\n- super.bg();\\n+ super.bj();\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(100.0D);\\n this.a(SharedMonsterAttributes.d).a(0.25D);\\n }\\n@@ -63,8 +63,8 @@ protected int h(int i0) {\\n }\\n \\n protected void n(Entity entity) {\\n- if (entity instanceof IMob && this.aB().nextInt(20) == 0) {\\n- this.c((EntityLivingBase) entity);\\n+ if (entity instanceof IMob && this.aC().nextInt(20) == 0) {\\n+ this.d((EntityLivingBase) entity);\\n }\\n \\n super.n(entity);\\n@@ -93,17 +93,17 @@ public void c() {\\n }\\n \\n public boolean a(Class oclass0) {\\n- return this.bS() && EntityPlayer.class.isAssignableFrom(oclass0) ? false : super.a(oclass0);\\n+ return this.bW() && EntityPlayer.class.isAssignableFrom(oclass0) ? false : super.a(oclass0);\\n }\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n super.b(nbttagcompound);\\n- nbttagcompound.a(\\\"PlayerCreated\\\", this.bS());\\n+ nbttagcompound.a(\\\"PlayerCreated\\\", this.bW());\\n }\\n \\n public void a(NBTTagCompound nbttagcompound) {\\n super.a(nbttagcompound);\\n- this.j(nbttagcompound.n(\\\"PlayerCreated\\\"));\\n+ this.i(nbttagcompound.n(\\\"PlayerCreated\\\"));\\n }\\n \\n public boolean m(Entity entity) {\\n@@ -119,7 +119,7 @@ public boolean m(Entity entity) {\\n return flag0;\\n }\\n \\n- public Village bP() {\\n+ public Village bT() {\\n return this.bp;\\n }\\n \\n@@ -132,11 +132,11 @@ protected String r() {\\n return \\\"none\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.irongolem.hit\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.irongolem.death\\\";\\n }\\n \\n@@ -160,15 +160,15 @@ protected void b(boolean flag0, int i0) {\\n }\\n }\\n \\n- public int bR() {\\n+ public int bV() {\\n return this.bs;\\n }\\n \\n- public boolean bS() {\\n+ public boolean bW() {\\n return (this.ah.a(16) & 1) != 0;\\n }\\n \\n- public void j(boolean flag0) {\\n+ public void i(boolean flag0) {\\n byte b0 = this.ah.a(16);\\n \\n if (flag0) {\\n@@ -179,7 +179,7 @@ public void j(boolean flag0) {\\n }\\n \\n public void a(DamageSource damagesource) {\\n- if (!this.bS() && this.aS != null && this.bp != null) {\\n+ if (!this.bW() && this.aS != null && this.bp != null) {\\n this.bp.a(this.aS.c_(), -5);\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityIronGolem.java\",\n \"sha\": \"ef4b9719f9283a625d95180a3e5deacb190edd4f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 4,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItem.java\",\n \"changes\": 8,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItem.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 4,\n \"filename\": \"src/main/java/net/minecraft/server/EntityItem.java\",\n \"new_code\": \" } else if (entityitem.S() && this.S()) {\\n if (this.aq()) {\\n public String am() {\\n public boolean ap() {\",\n \"new_methods\": [],\n \"old_code\": \" } else if (entityitem.R() && this.R()) {\\n if (this.ap()) {\\n public String al() {\\n public boolean ao() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -131,7 +131,7 @@ private void e() {\\n public boolean a(EntityItem entityitem) {\\n if (entityitem == this) {\\n return false;\\n- } else if (entityitem.R() && this.R()) {\\n+ } else if (entityitem.S() && this.S()) {\\n ItemStack itemstack = this.d();\\n ItemStack itemstack1 = entityitem.d();\\n \\n@@ -173,7 +173,7 @@ protected void e(int i0) {\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else if (this.d() != null && this.d().d == Item.bU.cv && damagesource.c()) {\\n return false;\\n@@ -240,11 +240,11 @@ public void b_(EntityPlayer entityplayer) {\\n }\\n }\\n \\n- public String al() {\\n+ public String am() {\\n return StatCollector.a(\\\"item.\\\" + this.d().a());\\n }\\n \\n- public boolean ao() {\\n+ public boolean ap() {\\n return false;\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItem.java\",\n \"sha\": \"0f4afee85fbfd5b698b071d75e69d9f3eb4e2fff\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItemFrame.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItemFrame.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/EntityItemFrame.java\",\n \"new_code\": \" ItemStack itemstack = entityplayer.aY();\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n ItemStack itemstack = entityplayer.aV();\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.hanging.CanaryItemFrame;\\n \\n-\\n public class EntityItemFrame extends EntityHanging {\\n \\n public float e = 1.0F; // CanaryMod: private -> public\\n@@ -110,7 +108,7 @@ public void a(NBTTagCompound nbttagcompound) {\\n \\n public boolean c(EntityPlayer entityplayer) {\\n if (this.h() == null) {\\n- ItemStack itemstack = entityplayer.aV();\\n+ ItemStack itemstack = entityplayer.aY();\\n \\n if (itemstack != null && !this.q.I) {\\n this.a(itemstack);\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityItemFrame.java\",\n \"sha\": \"5b91f99631886ab5c2a2210d9ef2526f49488f31\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 24,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLeashKnot.java\",\n \"changes\": 32,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLeashKnot.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 8,\n \"filename\": \"src/main/java/net/minecraft/server/EntityLeashKnot.java\",\n \"new_code\": \" ItemStack itemstack = entityplayer.aY();\\n double d0;\\n List list;\\n Iterator iterator;\\n EntityLiving entityliving;\\n d0 = 7.0D;\\n list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\\n iterator = list.iterator();\\n entityliving = (EntityLiving) iterator.next();\\n if (entityliving.bH() && entityliving.bI() == entityplayer) {\\n if (entityplayer.bG.d) {\\n d0 = 7.0D;\\n list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\\n if (list != null) {\\n iterator = list.iterator();\\n\\n while (iterator.hasNext()) {\\n entityliving = (EntityLiving) iterator.next();\\n if (entityliving.bH() && entityliving.bI() == this) {\\n entityliving.a(true, false);\\n }\\n }\\n }\\n }\",\n \"new_methods\": [],\n \"old_code\": \" ItemStack itemstack = entityplayer.aV();\\n double d0 = 7.0D;\\n List list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\\n\\n Iterator iterator = list.iterator();\\n EntityLiving entityliving = (EntityLiving) iterator.next();\\n\\n if (entityliving.bD() && entityliving.bE() == entityplayer) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -42,20 +42,22 @@ public void b(NBTTagCompound nbttagcompound) {}\\n public void a(NBTTagCompound nbttagcompound) {}\\n \\n public boolean c(EntityPlayer entityplayer) {\\n- ItemStack itemstack = entityplayer.aV();\\n+ ItemStack itemstack = entityplayer.aY();\\n boolean flag0 = false;\\n+ double d0;\\n+ List list;\\n+ Iterator iterator;\\n+ EntityLiving entityliving;\\n \\n if (itemstack != null && itemstack.d == Item.ch.cv && !this.q.I) {\\n- double d0 = 7.0D;\\n- List list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\\n-\\n+ d0 = 7.0D;\\n+ list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\\n if (list != null) {\\n- Iterator iterator = list.iterator();\\n+ iterator = list.iterator();\\n \\n while (iterator.hasNext()) {\\n- EntityLiving entityliving = (EntityLiving) iterator.next();\\n-\\n- if (entityliving.bD() && entityliving.bE() == entityplayer) {\\n+ entityliving = (EntityLiving) iterator.next();\\n+ if (entityliving.bH() && entityliving.bI() == entityplayer) {\\n entityliving.b(this, true);\\n flag0 = true;\\n }\\n@@ -65,6 +67,20 @@ public boolean c(EntityPlayer entityplayer) {\\n \\n if (!this.q.I && !flag0) {\\n this.w();\\n+ if (entityplayer.bG.d) {\\n+ d0 = 7.0D;\\n+ list = this.q.a(EntityLiving.class, AxisAlignedBB.a().a(this.u - d0, this.v - d0, this.w - d0, this.u + d0, this.v + d0, this.w + d0));\\n+ if (list != null) {\\n+ iterator = list.iterator();\\n+\\n+ while (iterator.hasNext()) {\\n+ entityliving = (EntityLiving) iterator.next();\\n+ if (entityliving.bH() && entityliving.bI() == this) {\\n+ entityliving.a(true, false);\\n+ }\\n+ }\\n+ }\\n+ }\\n }\\n \\n return true;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLeashKnot.java\",\n \"sha\": \"5bbd664c045c40e792d703da696a4a3e2ece3726\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 61,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLiving.java\",\n \"changes\": 122,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLiving.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 61,\n \"filename\": \"src/main/java/net/minecraft/server/EntityLiving.java\",\n \"new_code\": \" protected void ay() {\\n super.ay();\\n this.aW().b(SharedMonsterAttributes.b).a(16.0D);\\n public void d(EntityLivingBase entitylivingbase) {\\n this.a(s0, this.aZ(), this.ba());\\n if (this.S() && this.ab.nextInt(1000) < this.a_++) {\\n ItemStack[] aitemstack = this.ad();\\n this.bF();\\n if (this.be()) {\\n nbttagcompound.a(\\\"CanPickUpLoot\\\", this.bD());\\n nbttagcompound.a(\\\"CustomName\\\", this.bA());\\n nbttagcompound.a(\\\"CustomNameVisible\\\", this.bC());\\n nbttagcompound1.a(\\\"UUIDMost\\\", this.bw.av().getMostSignificantBits());\\n nbttagcompound1.a(\\\"UUIDLeast\\\", this.bw.av().getLeastSignificantBits());\\n if (!this.q.I && this.bD() && !this.aU && this.q.O().b(\\\"mobGriefing\\\")) {\\n protected boolean be() {\\n protected void bo() {\\n protected void bh() {\\n this.bo();\\n this.bj();\\n protected void bk() {\\n super.bk();\\n this.bo();\\n this.a(this.bu, 10.0F, (float) this.bp());\\n public int bp() {\\n public boolean bs() {\\n public int bv() {\\n public int ar() {\\n int i0 = (int) (this.aM() - this.aS() * 0.33F);\\n public ItemStack aY() {\\n public ItemStack[] ad() {\\n for (int i1 = 0; i1 < this.ad().length; ++i1) {\\n protected void bw() {\\n protected void bx() {\\n if (this.aY() != null && this.ab.nextFloat() < 0.25F * f0) {\\n EnchantmentHelper.a(this.ab, this.aY(), (int) (5.0F + f0 * (float) this.ab.nextInt(18)));\\n public boolean by() {\\n public String am() {\\n return this.bB() ? this.bA() : super.am();\\n public void bz() {\\n public String bA() {\\n public boolean bB() {\\n public boolean bC() {\\n public boolean bD() {\\n public boolean bE() {\\n if (this.bH() && this.bI() == entityplayer) {\\n this.a(true, !entityplayer.bG.d);\\n if (itemstack != null && itemstack.d == Item.ch.cv && this.bG()) {\\n if (!(this instanceof EntityTameable) || !((EntityTameable) this).bT()) {\\n protected void bF() {\\n this.bJ();\\n this.a(true, true);\\n public void a(boolean flag0, boolean flag1) {\\n if (!this.q.I && flag1) {\\n public boolean bG() {\\n return !this.bH() && !(this instanceof IMob);\\n public boolean bH() {\\n public Entity bI() {\\n private void bJ() {\\n if (entitylivingbase.av().equals(uuid)) {\\n this.a(false, true);\",\n \"new_methods\": [],\n \"old_code\": \" protected void ax() {\\n super.ax();\\n this.aT().b(SharedMonsterAttributes.b).a(16.0D);\\n public void c(EntityLivingBase entitylivingbase) {\\n this.a(s0, this.aW(), this.aX());\\n if (this.R() && this.ab.nextInt(1000) < this.a_++) {\\n ItemStack[] aitemstack = this.ac();\\n this.bB();\\n if (this.bb()) {\\n nbttagcompound.a(\\\"CanPickUpLoot\\\", this.bz());\\n nbttagcompound.a(\\\"CustomName\\\", this.bw());\\n nbttagcompound.a(\\\"CustomNameVisible\\\", this.by());\\n nbttagcompound1.a(\\\"UUIDMost\\\", this.bw.au().getMostSignificantBits());\\n nbttagcompound1.a(\\\"UUIDLeast\\\", this.bw.au().getLeastSignificantBits());\\n if (!this.q.I && this.bz() && !this.aU && this.q.O().b(\\\"mobGriefing\\\")) {\\n protected boolean bb() {\\n protected void bk() {\\n protected void be() {\\n this.bk();\\n this.bg();\\n protected void bh() {\\n super.bh();\\n this.bk();\\n this.a(this.bu, 10.0F, (float) this.bl());\\n public int bl() {\\n public boolean bo() {\\n public int br() {\\n public int aq() {\\n int i0 = (int) (this.aJ() - this.aP() * 0.33F);\\n public ItemStack aV() {\\n public ItemStack[] ac() {\\n for (int i1 = 0; i1 < this.ac().length; ++i1) {\\n protected void bs() {\\n protected void bt() {\\n if (this.aV() != null && this.ab.nextFloat() < 0.25F * f0) {\\n EnchantmentHelper.a(this.ab, this.aV(), (int) (5.0F + f0 * (float) this.ab.nextInt(18)));\\n public boolean bu() {\\n public String al() {\\n return this.bx() ? this.bw() : super.al();\\n public void bv() {\\n public String bw() {\\n public boolean bx() {\\n public boolean by() {\\n public boolean bz() {\\n public boolean bA() {\\n if (this.bD() && this.bE() == entityplayer) {\\n this.i(true);\\n if (itemstack != null && itemstack.d == Item.ch.cv && this.bC()) {\\n if (!(this instanceof EntityTameable) || !((EntityTameable) this).bP()) {\\n protected void bB() {\\n this.bF();\\n this.i(true);\\n public void i(boolean flag0) {\\n if (!this.q.I) {\\n public boolean bC() {\\n return !this.bD() && !(this instanceof IMob);\\n public boolean bD() {\\n public Entity bE() {\\n private void bF() {\\n if (entitylivingbase.au().equals(uuid)) {\\n this.i(false);\",\n \"old_methods\": [],\n \"patch\": \"@@ -44,9 +44,9 @@ public EntityLiving(World world) {\\n }\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n- this.aT().b(SharedMonsterAttributes.b).a(16.0D);\\n+ protected void ay() {\\n+ super.ay();\\n+ this.aW().b(SharedMonsterAttributes.b).a(16.0D);\\n }\\n \\n public EntityLookHelper h() {\\n@@ -73,7 +73,7 @@ public EntityLivingBase m() {\\n return this.bp;\\n }\\n \\n- public void c(EntityLivingBase entitylivingbase) {\\n+ public void d(EntityLivingBase entitylivingbase) {\\n this.bp = entitylivingbase;\\n }\\n \\n@@ -97,14 +97,14 @@ public void p() {\\n String s0 = this.r();\\n \\n if (s0 != null) {\\n- this.a(s0, this.aW(), this.aX());\\n+ this.a(s0, this.aZ(), this.ba());\\n }\\n }\\n \\n public void x() {\\n super.x();\\n this.q.C.a(\\\"mobBaseTick\\\");\\n- if (this.R() && this.ab.nextInt(1000) < this.a_++) {\\n+ if (this.S() && this.ab.nextInt(1000) < this.a_++) {\\n this.a_ = -this.o();\\n this.p();\\n }\\n@@ -115,7 +115,7 @@ public void x() {\\n protected int e(EntityPlayer entityplayer) {\\n if (this.b > 0) {\\n int i0 = this.b;\\n- ItemStack[] aitemstack = this.ac();\\n+ ItemStack[] aitemstack = this.ad();\\n \\n for (int i1 = 0; i1 < aitemstack.length; ++i1) {\\n if (aitemstack[i1] != null && this.e[i1] <= 1.0F) {\\n@@ -143,12 +143,12 @@ public void q() {\\n public void l_() {\\n super.l_();\\n if (!this.q.I) {\\n- this.bB();\\n+ this.bF();\\n }\\n }\\n \\n protected float f(float f0, float f1) {\\n- if (this.bb()) {\\n+ if (this.be()) {\\n this.bn.a();\\n return f1;\\n } else {\\n@@ -182,7 +182,7 @@ protected void b(boolean flag0, int i0) {\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n super.b(nbttagcompound);\\n- nbttagcompound.a(\\\"CanPickUpLoot\\\", this.bz());\\n+ nbttagcompound.a(\\\"CanPickUpLoot\\\", this.bD());\\n nbttagcompound.a(\\\"PersistenceRequired\\\", this.bt);\\n NBTTagList nbttaglist = new NBTTagList();\\n \\n@@ -205,14 +205,14 @@ public void b(NBTTagCompound nbttagcompound) {\\n }\\n \\n nbttagcompound.a(\\\"DropChances\\\", (NBTBase) nbttaglist1);\\n- nbttagcompound.a(\\\"CustomName\\\", this.bw());\\n- nbttagcompound.a(\\\"CustomNameVisible\\\", this.by());\\n+ nbttagcompound.a(\\\"CustomName\\\", this.bA());\\n+ nbttagcompound.a(\\\"CustomNameVisible\\\", this.bC());\\n nbttagcompound.a(\\\"Leashed\\\", this.bv);\\n if (this.bw != null) {\\n nbttagcompound1 = new NBTTagCompound(\\\"Leash\\\");\\n if (this.bw instanceof EntityLivingBase) {\\n- nbttagcompound1.a(\\\"UUIDMost\\\", this.bw.au().getMostSignificantBits());\\n- nbttagcompound1.a(\\\"UUIDLeast\\\", this.bw.au().getLeastSignificantBits());\\n+ nbttagcompound1.a(\\\"UUIDMost\\\", this.bw.av().getMostSignificantBits());\\n+ nbttagcompound1.a(\\\"UUIDLeast\\\", this.bw.av().getLeastSignificantBits());\\n } else if (this.bw instanceof EntityHanging) {\\n EntityHanging entityhanging = (EntityHanging) this.bw;\\n \\n@@ -271,7 +271,7 @@ public void i(float f0) {\\n public void c() {\\n super.c();\\n this.q.C.a(\\\"looting\\\");\\n- if (!this.q.I && this.bz() && !this.aU && this.q.O().b(\\\"mobGriefing\\\")) {\\n+ if (!this.q.I && this.bD() && !this.aU && this.q.O().b(\\\"mobGriefing\\\")) {\\n List list = this.q.a(EntityItem.class, this.E.b(1.0D, 0.0D, 1.0D));\\n Iterator iterator = list.iterator();\\n \\n@@ -337,15 +337,15 @@ public void c() {\\n this.q.C.b();\\n }\\n \\n- protected boolean bb() {\\n+ protected boolean be() {\\n return false;\\n }\\n \\n protected boolean t() {\\n return true;\\n }\\n \\n- protected void bk() {\\n+ protected void bo() {\\n if (this.bt) {\\n this.aV = 0;\\n } else {\\n@@ -370,10 +370,10 @@ protected void bk() {\\n }\\n }\\n \\n- protected void be() {\\n+ protected void bh() {\\n ++this.aV;\\n this.q.C.a(\\\"checkDespawn\\\");\\n- this.bk();\\n+ this.bo();\\n this.q.C.b();\\n this.q.C.a(\\\"sensing\\\");\\n this.bq.a();\\n@@ -388,7 +388,7 @@ protected void be() {\\n this.bo.f();\\n this.q.C.b();\\n this.q.C.a(\\\"mob tick\\\");\\n- this.bg();\\n+ this.bj();\\n this.q.C.b();\\n this.q.C.a(\\\"controls\\\");\\n this.q.C.a(\\\"move\\\");\\n@@ -401,11 +401,11 @@ protected void be() {\\n this.q.C.b();\\n }\\n \\n- protected void bh() {\\n- super.bh();\\n+ protected void bk() {\\n+ super.bk();\\n this.be = 0.0F;\\n this.bf = 0.0F;\\n- this.bk();\\n+ this.bo();\\n float f0 = 8.0F;\\n \\n if (this.ab.nextFloat() < 0.02F) {\\n@@ -420,7 +420,7 @@ protected void bh() {\\n }\\n \\n if (this.bu != null) {\\n- this.a(this.bu, 10.0F, (float) this.bl());\\n+ this.a(this.bu, 10.0F, (float) this.bp());\\n if (this.g-- <= 0 || this.bu.M || this.bu.e((Entity) this) > (double) (f0 * f0)) {\\n this.bu = null;\\n }\\n@@ -441,7 +441,7 @@ protected void bh() {\\n }\\n }\\n \\n- public int bl() {\\n+ public int bp() {\\n return 40;\\n }\\n \\n@@ -480,19 +480,19 @@ private float b(float f0, float f1, float f2) {\\n return f0 + f3;\\n }\\n \\n- public boolean bo() {\\n+ public boolean bs() {\\n return this.q.b(this.E) && this.q.a((Entity) this, this.E).isEmpty() && !this.q.d(this.E);\\n }\\n \\n- public int br() {\\n+ public int bv() {\\n return 4;\\n }\\n \\n- public int aq() {\\n+ public int ar() {\\n if (this.m() == null) {\\n return 3;\\n } else {\\n- int i0 = (int) (this.aJ() - this.aP() * 0.33F);\\n+ int i0 = (int) (this.aM() - this.aS() * 0.33F);\\n \\n i0 -= (3 - this.q.r) * 4;\\n if (i0 < 0) {\\n@@ -503,7 +503,7 @@ public int aq() {\\n }\\n }\\n \\n- public ItemStack aV() {\\n+ public ItemStack aY() {\\n return this.br[0];\\n }\\n \\n@@ -519,12 +519,12 @@ public void c(int i0, ItemStack itemstack) {\\n this.br[i0] = itemstack;\\n }\\n \\n- public ItemStack[] ac() {\\n+ public ItemStack[] ad() {\\n return this.br;\\n }\\n \\n protected void a(boolean flag0, int i0) {\\n- for (int i1 = 0; i1 < this.ac().length; ++i1) {\\n+ for (int i1 = 0; i1 < this.ad().length; ++i1) {\\n ItemStack itemstack = this.n(i1);\\n boolean flag1 = this.e[i1] > 1.0F;\\n \\n@@ -549,7 +549,7 @@ protected void a(boolean flag0, int i0) {\\n }\\n }\\n \\n- protected void bs() {\\n+ protected void bw() {\\n if (this.ab.nextFloat() < 0.15F * this.q.b(this.u, this.v, this.w)) {\\n int i0 = this.ab.nextInt(2);\\n float f0 = this.q.r == 3 ? 0.1F : 0.25F;\\n@@ -667,11 +667,11 @@ public static Item a(int i0, int i1) {\\n }\\n }\\n \\n- protected void bt() {\\n+ protected void bx() {\\n float f0 = this.q.b(this.u, this.v, this.w);\\n \\n- if (this.aV() != null && this.ab.nextFloat() < 0.25F * f0) {\\n- EnchantmentHelper.a(this.ab, this.aV(), (int) (5.0F + f0 * (float) this.ab.nextInt(18)));\\n+ if (this.aY() != null && this.ab.nextFloat() < 0.25F * f0) {\\n+ EnchantmentHelper.a(this.ab, this.aY(), (int) (5.0F + f0 * (float) this.ab.nextInt(18)));\\n }\\n \\n for (int i0 = 0; i0 < 4; ++i0) {\\n@@ -688,63 +688,63 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\\n return entitylivingdata;\\n }\\n \\n- public boolean bu() {\\n+ public boolean by() {\\n return false;\\n }\\n \\n- public String al() {\\n- return this.bx() ? this.bw() : super.al();\\n+ public String am() {\\n+ return this.bB() ? this.bA() : super.am();\\n }\\n \\n- public void bv() {\\n+ public void bz() {\\n this.bt = true;\\n }\\n \\n public void a(String s0) {\\n this.ah.b(10, s0);\\n }\\n \\n- public String bw() {\\n+ public String bA() {\\n return this.ah.e(10);\\n }\\n \\n- public boolean bx() {\\n+ public boolean bB() {\\n return this.ah.e(10).length() > 0;\\n }\\n \\n public void g(boolean flag0) {\\n this.ah.b(11, Byte.valueOf((byte) (flag0 ? 1 : 0)));\\n }\\n \\n- public boolean by() {\\n+ public boolean bC() {\\n return this.ah.a(11) == 1;\\n }\\n \\n public void a(int i0, float f0) {\\n this.e[i0] = f0;\\n }\\n \\n- public boolean bz() {\\n+ public boolean bD() {\\n return this.bs;\\n }\\n \\n public void h(boolean flag0) {\\n this.bs = flag0;\\n }\\n \\n- public boolean bA() {\\n+ public boolean bE() {\\n return this.bt;\\n }\\n \\n public final boolean c(EntityPlayer entityplayer) {\\n- if (this.bD() && this.bE() == entityplayer) {\\n- this.i(true);\\n+ if (this.bH() && this.bI() == entityplayer) {\\n+ this.a(true, !entityplayer.bG.d);\\n return true;\\n } else {\\n ItemStack itemstack = entityplayer.bn.h();\\n \\n- if (itemstack != null && itemstack.d == Item.ch.cv && this.bC()) {\\n- if (!(this instanceof EntityTameable) || !((EntityTameable) this).bP()) {\\n+ if (itemstack != null && itemstack.d == Item.ch.cv && this.bG()) {\\n+ if (!(this instanceof EntityTameable) || !((EntityTameable) this).bT()) {\\n this.b(entityplayer, true);\\n --itemstack.b;\\n return true;\\n@@ -765,23 +765,23 @@ protected boolean a(EntityPlayer entityplayer) {\\n return false;\\n }\\n \\n- protected void bB() {\\n+ protected void bF() {\\n if (this.bx != null) {\\n- this.bF();\\n+ this.bJ();\\n }\\n \\n if (this.bv) {\\n if (this.bw == null || this.bw.M) {\\n- this.i(true);\\n+ this.a(true, true);\\n }\\n }\\n }\\n \\n- public void i(boolean flag0) {\\n+ public void a(boolean flag0, boolean flag1) {\\n if (this.bv) {\\n this.bv = false;\\n this.bw = null;\\n- if (!this.q.I) {\\n+ if (!this.q.I && flag1) {\\n this.b(Item.ch.cv, 1);\\n }\\n \\n@@ -791,15 +791,15 @@ public void i(boolean flag0) {\\n }\\n }\\n \\n- public boolean bC() {\\n- return !this.bD() && !(this instanceof IMob);\\n+ public boolean bG() {\\n+ return !this.bH() && !(this instanceof IMob);\\n }\\n \\n- public boolean bD() {\\n+ public boolean bH() {\\n return this.bv;\\n }\\n \\n- public Entity bE() {\\n+ public Entity bI() {\\n return this.bw;\\n }\\n \\n@@ -811,7 +811,7 @@ public void b(Entity entity, boolean flag0) {\\n }\\n }\\n \\n- private void bF() {\\n+ private void bJ() {\\n if (this.bv && this.bx != null) {\\n if (this.bx.b(\\\"UUIDMost\\\") && this.bx.b(\\\"UUIDLeast\\\")) {\\n UUID uuid = new UUID(this.bx.f(\\\"UUIDMost\\\"), this.bx.f(\\\"UUIDLeast\\\"));\\n@@ -821,7 +821,7 @@ private void bF() {\\n while (iterator.hasNext()) {\\n EntityLivingBase entitylivingbase = (EntityLivingBase) iterator.next();\\n \\n- if (entitylivingbase.au().equals(uuid)) {\\n+ if (entitylivingbase.av().equals(uuid)) {\\n this.bw = entitylivingbase;\\n break;\\n }\\n@@ -838,7 +838,7 @@ private void bF() {\\n \\n this.bw = entityleashknot;\\n } else {\\n- this.i(false);\\n+ this.a(false, true);\\n }\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLiving.java\",\n \"sha\": \"9a5e444415b55ddba5384b1ef229c8106f0914e1\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 173,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLivingBase.java\",\n \"changes\": 333,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLivingBase.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 160,\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"new_code\": \" private int bo;\\n private float bp;\\n private int bq;\\n private float br;\\n this.ay();\\n this.g(this.aS());\\n protected void ay() {\\n this.aW().b(SharedMonsterAttributes.a);\\n this.aW().b(SharedMonsterAttributes.c);\\n this.aW().b(SharedMonsterAttributes.d);\\n if (!this.be()) {\\n public boolean az() {\\n if (this.S() && this.T()) {\\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1.0F).call();\\n if (this.S() && this.a(Material.h)) {\\n if (!this.az() && !this.i(Potion.o.H) && !flag0) {\\n this.g(this.h(this.ak()));\\n if (this.ak() == -20) {\\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2.0F).call();\\n if (!this.q.I && this.af() && this.o instanceof EntityLivingBase) {\\n if (this.aM() <= 0.0F) {\\n this.aA();\\n if (this.bn != null && !this.bn.S()) {\\n if (this.i != null && !this.i.S()) {\\n this.b((EntityLivingBase) null);\\n this.aI();\\n protected void aA() {\\n if (!this.q.I && (this.aT > 0 || this.aB()) && !this.g_() && this.q.O().b(\\\"doMobLoot\\\")) {\\n protected boolean aB() {\\n public Random aC() {\\n public EntityLivingBase aD() {\\n public int aE() {\\n return this.j;\\n }\\n\\n this.j = this.ac;\\n public EntityLivingBase aF() {\\n public int aG() {\\n return this.bo;\\n }\\n\\n } else {\\n this.bn = null;\\n\\n this.bo = this.ac;\\n public int aH() {\\n nbttagcompound.a(\\\"HealF\\\", this.aM());\\n nbttagcompound.a(\\\"Health\\\", (short) ((int) Math.ceil((double) this.aM())));\\n nbttagcompound.a(\\\"AbsorptionAmount\\\", this.bm());\\n ItemStack[] aitemstack = this.ad();\\n nbttagcompound.a(\\\"Attributes\\\", (NBTBase) SharedMonsterAttributes.a(this.aW()));\\n aitemstack = this.ad();\\n SharedMonsterAttributes.a(this.aW(), nbttagcompound.m(\\\"Attributes\\\"), this.q == null ? null : this.q.Y());\\n this.g(this.aS());\\n protected void aI() {\\n this.b(potioneffect);\\n this.a(potioneffect, false);\\n if (!this.ai()) {\\n public void aJ() {\\n this.b(potioneffect);\\n public Collection aK() {\\n public void c(PotionEffect potioneffect) {\\n if (this.d(potioneffect)) {\\n if (this.d(potioneffect)) {\\n this.a((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())), true);\\n public boolean d(PotionEffect potioneffect) {\\n if (this.aX() == EnumCreatureAttribute.b) {\\n public boolean aL() {\\n return this.aX() == EnumCreatureAttribute.b;\\n this.b(potioneffect);\\n Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\\n protected void a(PotionEffect potioneffect, boolean flag0) {\\n if (flag0 && !this.q.I) {\\n Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\\n Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\\n protected void b(PotionEffect potioneffect) {\\n Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\\n float f1 = this.aM();\\n public final float aM() {\\n this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aS())));\\n if (this.aq()) {\\n if (this.aM() <= 0.0F) {\\n this.ax = this.aM();\\n if (entitywolf.bT()) {\\n if (this.aM() <= 0.0F) {\\n this.a(this.aO(), this.aZ(), this.ba());\\n this.a(this.aN(), this.aZ(), this.ba());\\n EntityLivingBase entitylivingbase = this.aR();\\n protected String aN() {\\n protected String aO() {\\n public boolean S() {\\n return !this.M && this.aM() > 0.0F;\\n public int aP() {\\n ItemStack[] aitemstack = this.ad();\\n int i0 = 25 - this.aP();\\n i0 = EnchantmentHelper.a(this.ad(), damagesource);\\n if (!this.aq()) {\\n f0 = Math.max(f0 - this.bm(), 0.0F);\\n this.m(this.bm() - (f1 - f0));\\n float f2 = this.aM();\\n this.aQ().a(damagesource, f2, f0);\\n this.m(this.bm() - f0);\\n public CombatTracker aQ() {\\n public EntityLivingBase aR() {\\n public final float aS() {\\n public final int aT() {\\n public void aU() {\\n protected void aV() {\\n return this.aW().a(attribute);\\n public BaseAttributeMap aW() {\\n this.d = new ServersideAttributeMap();\\n public EnumCreatureAttribute aX() {\\n public abstract ItemStack aY();\\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\\n if (attributeinstance.a(b) != null) {\\n }\\n\\n if (flag0) {\\n attributeinstance.a(c);\\n public abstract ItemStack[] ad();\\n protected float aZ() {\\n protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\\n } else if (!this.bl()) {\\n if (this.bb()) {\\n } else if (this.bl()) {\\n if (this.be()) {\\n this.bh();\\n this.bk();\\n this.bh();\\n if (this.F && this.bq == 0) {\\n this.bd();\\n this.bq = 10;\\n this.bq = 0;\\n this.bi();\\n protected void bh() {}\\n protected void bi() {\\n public void U() {\\n super.U();\\n protected void bj() {}\\n protected void bk() {\\n public Vec3 Z() {\\n public boolean bl() {\\n public float ao() {\\n public float bm() {\\n return this.br;\\n this.br = f0;\\n }\\n\\n public Team bn() {\\n return null;\\n }\\n\\n public boolean c(EntityLivingBase entitylivingbase) {\\n return this.a(entitylivingbase.bn());\\n }\\n\\n public boolean a(Team team) {\\n return this.bn() != null ? this.bn().a(team) : false;\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"this.aW().b(SharedMonsterAttributes.a);\\n this.aW().b(SharedMonsterAttributes.c);\\n this.aW().b(SharedMonsterAttributes.d);\\n if (!this.be()) {\\n public boolean az() {\\n if (this.S() && this.T()) {\\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1.0F).call();\\n if (this.S() && this.a(Material.h)) {\\n if (!this.az() && !this.i(Potion.o.H) && !flag0) {\\n this.g(this.h(this.ak()));\\n if (this.ak() == -20) {\\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2.0F).call();\\n if (!this.q.I && this.af() && this.o instanceof EntityLivingBase) {\\n if (this.aM() <= 0.0F) {\\n this.aA();\\n if (this.bn != null && !this.bn.S()) {\\n if (this.i != null && !this.i.S()) {\\n this.b((EntityLivingBase) null);\\n this.aI();\\n protected void aA() {\\n if (!this.q.I && (this.aT > 0 || this.aB()) && !this.g_() && this.q.O().b(\\\"doMobLoot\\\")) {\\n protected boolean aB() {\\n public Random aC() {\\n public EntityLivingBase aD() {\\n public int aE() {\\n return this.j;\",\n \"signature\": \"void ay()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"public int aG() {\\n return this.bo;\",\n \"signature\": \"EntityLivingBase aF()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"nbttagcompound.a(\\\"HealF\\\", this.aM());\\n nbttagcompound.a(\\\"Health\\\", (short) ((int) Math.ceil((double) this.aM())));\\n nbttagcompound.a(\\\"AbsorptionAmount\\\", this.bm());\\n ItemStack[] aitemstack = this.ad();\\n nbttagcompound.a(\\\"Attributes\\\", (NBTBase) SharedMonsterAttributes.a(this.aW()));\\n aitemstack = this.ad();\\n SharedMonsterAttributes.a(this.aW(), nbttagcompound.m(\\\"Attributes\\\"), this.q == null ? null : this.q.Y());\\n this.g(this.aS());\\n protected void aI() {\\n this.b(potioneffect);\\n this.a(potioneffect, false);\\n if (!this.ai()) {\\n public void aJ() {\\n this.b(potioneffect);\\n public Collection aK() {\\n public void c(PotionEffect potioneffect) {\\n if (this.d(potioneffect)) {\\n if (this.d(potioneffect)) {\\n this.a((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())), true);\\n public boolean d(PotionEffect potioneffect) {\\n if (this.aX() == EnumCreatureAttribute.b) {\\n public boolean aL() {\\n return this.aX() == EnumCreatureAttribute.b;\\n this.b(potioneffect);\\n Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\\n protected void a(PotionEffect potioneffect, boolean flag0) {\\n if (flag0 && !this.q.I) {\\n Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\\n Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\\n protected void b(PotionEffect potioneffect) {\\n Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\\n float f1 = this.aM();\\n public final float aM() {\\n this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aS())));\\n if (this.aq()) {\\n if (this.aM() <= 0.0F) {\\n this.ax = this.aM();\\n if (entitywolf.bT()) {\\n if (this.aM() <= 0.0F) {\\n this.a(this.aO(), this.aZ(), this.ba());\\n this.a(this.aN(), this.aZ(), this.ba());\\n EntityLivingBase entitylivingbase = this.aR();\\n protected String aN() {\\n protected String aO() {\\n public boolean S() {\\n return !this.M && this.aM() > 0.0F;\\n public int aP() {\\n ItemStack[] aitemstack = this.ad();\\n int i0 = 25 - this.aP();\\n i0 = EnchantmentHelper.a(this.ad(), damagesource);\\n if (!this.aq()) {\\n f0 = Math.max(f0 - this.bm(), 0.0F);\\n this.m(this.bm() - (f1 - f0));\\n float f2 = this.aM();\\n this.aQ().a(damagesource, f2, f0);\\n this.m(this.bm() - f0);\\n public CombatTracker aQ() {\\n public EntityLivingBase aR() {\\n public final float aS() {\\n public final int aT() {\\n public void aU() {\\n protected void aV() {\\n return this.aW().a(attribute);\\n public BaseAttributeMap aW() {\\n this.d = new ServersideAttributeMap();\\n public EnumCreatureAttribute aX() {\\n public abstract ItemStack aY();\\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\\n if (attributeinstance.a(b) != null) {\",\n \"signature\": \"int aH()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"signature\": \"float aZ()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"\",\n \"signature\": \"void bh()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"public void U() {\\n super.U();\\n protected void bj() {\",\n \"signature\": \"void bi()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"public Vec3 Z() {\\n public boolean bl() {\\n public float ao() {\\n public float bm() {\\n return this.br;\\n this.br = f0;\",\n \"signature\": \"void bk()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"return null;\",\n \"signature\": \"Team bn()\"\n },\n {\n \"arguments\": [\n \"EntityLivingBase entitylivingbase\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"return this.a(entitylivingbase.bn());\",\n \"signature\": \"boolean c(EntityLivingBase entitylivingbase)\"\n }\n ],\n \"old_code\": \" private float bo;\\n private int bp;\\n private float bq;\\n this.ax();\\n this.g(this.aP());\\n protected void ax() {\\n this.aT().b(SharedMonsterAttributes.a);\\n this.aT().b(SharedMonsterAttributes.c);\\n this.aT().b(SharedMonsterAttributes.d);\\n if (!this.bb()) {\\n public boolean ay() {\\n if (this.R() && this.S()) {\\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1).call();\\n if (this.R() && this.a(Material.h)) {\\n if (!this.ay() && !this.i(Potion.o.H) && !flag0) {\\n this.g(this.h(this.aj()));\\n if (this.aj() == -20) {\\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2).call();\\n if (!this.q.I && this.ae() && this.o instanceof EntityLivingBase) {\\n if (this.aJ() <= 0.0F) {\\n this.az();\\n if (this.bn != null && !this.bn.R()) {\\n if (this.i != null) {\\n if (!this.i.R()) {\\n this.b((EntityLivingBase) null);\\n } else if (this.j > 0) {\\n --this.j;\\n } else {\\n this.b((EntityLivingBase) null);\\n }\\n this.aF();\\n protected void az() {\\n if (!this.q.I && (this.aT > 0 || this.aA()) && !this.g_() && this.q.O().b(\\\"doMobLoot\\\")) {\\n protected boolean aA() {\\n public Random aB() {\\n public EntityLivingBase aC() {\\n this.j = this.i != null ? 100 : 0;\\n public EntityLivingBase aD() {\\n public int aE() {\\n nbttagcompound.a(\\\"HealF\\\", this.aJ());\\n nbttagcompound.a(\\\"Health\\\", (short) ((int) Math.ceil((double) this.aJ())));\\n nbttagcompound.a(\\\"AbsorptionAmount\\\", this.bj());\\n ItemStack[] aitemstack = this.ac();\\n nbttagcompound.a(\\\"Attributes\\\", (NBTBase) SharedMonsterAttributes.a(this.aT()));\\n aitemstack = this.ac();\\n SharedMonsterAttributes.a(this.aT(), nbttagcompound.m(\\\"Attributes\\\"), this.q == null ? null : this.q.Y());\\n this.g(this.aP());\\n protected void aF() {\\n this.c(potioneffect);\\n this.b(potioneffect);\\n if (!this.ah()) {\\n public void aG() {\\n this.c(potioneffect);\\n public Collection aH() {\\n public void d(PotionEffect potioneffect) {\\n if (this.e(potioneffect)) {\\n if (this.e(potioneffect)) {\\n this.b((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())));\\n public boolean e(PotionEffect potioneffect) {\\n if (this.aU() == EnumCreatureAttribute.b) {\\n public boolean aI() {\\n return this.aU() == EnumCreatureAttribute.b;\\n this.c(potioneffect);\\n Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\\n protected void b(PotionEffect potioneffect) {\\n if (!this.q.I) {\\n Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\\n }\\n\\n if (!this.q.I) {\\n Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\\n protected void c(PotionEffect potioneffect) {\\n Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\\n float f1 = this.aJ();\\n public final float aJ() {\\n this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aP())));\\n if (this.ap()) {\\n if (this.aJ() <= 0.0F) {\\n this.ax = this.aJ();\\n if (entitywolf.bP()) {\\n if (this.aJ() <= 0.0F) {\\n this.a(this.aL(), this.aW(), this.aX());\\n this.a(this.aK(), this.aW(), this.aX());\\n EntityLivingBase entitylivingbase = this.aO();\\n protected String aK() {\\n protected String aL() {\\n public boolean R() {\\n return !this.M && this.aJ() > 0.0F;\\n public int aM() {\\n ItemStack[] aitemstack = this.ac();\\n int i0 = 25 - this.aM();\\n i0 = EnchantmentHelper.a(this.ac(), damagesource);\\n if (!this.ap()) {\\n f0 = Math.max(f0 - this.bj(), 0.0F);\\n this.m(this.bj() - (f1 - f0));\\n float f2 = this.aJ();\\n this.aN().a(damagesource, f2, f0);\\n this.m(this.bj() - f0);\\n public CombatTracker aN() {\\n public EntityLivingBase aO() {\\n public final float aP() {\\n public final int aQ() {\\n public void aR() {\\n protected void aS() {\\n return this.aT().a(attribute);\\n public BaseAttributeMap aT() {\\n if (this.q != null && !this.q.I) {\\n this.d = new ServersideAttributeMap();\\n } else {\\n this.d = new ClientsideAttributeMap();\\n }\\n public EnumCreatureAttribute aU() {\\n public abstract ItemStack aV();\\n if (!this.q.I) {\\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\\n if (flag0) {\\n attributeinstance.a(c);\\n }\\n public abstract ItemStack[] ac();\\n protected float aW() {\\n protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\\n } else if (!this.bi()) {\\n if (this.aY()) {\\n } else if (this.bi()) {\\n if (this.bb()) {\\n this.be();\\n this.bh();\\n this.be();\\n if (this.F && this.bp == 0) {\\n this.ba();\\n this.bp = 10;\\n this.bp = 0;\\n this.bf();\\n protected void be() {}\\n protected void bf() {\\n public void T() {\\n super.T();\\n protected void bg() {}\\n protected void bh() {\\n public Vec3 Y() {\\n public boolean bi() {\\n public float an() {\\n public float bj() {\\n return this.bq;\\n this.bq = f0;\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"this.aT().b(SharedMonsterAttributes.a);\\n this.aT().b(SharedMonsterAttributes.c);\\n this.aT().b(SharedMonsterAttributes.d);\\n if (!this.bb()) {\\n public boolean ay() {\\n if (this.R() && this.S()) {\\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1).call();\\n if (this.R() && this.a(Material.h)) {\\n if (!this.ay() && !this.i(Potion.o.H) && !flag0) {\\n this.g(this.h(this.aj()));\\n if (this.aj() == -20) {\\n DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2).call();\\n if (!this.q.I && this.ae() && this.o instanceof EntityLivingBase) {\\n if (this.aJ() <= 0.0F) {\\n this.az();\\n if (this.bn != null && !this.bn.R()) {\\n if (this.i != null) {\\n if (!this.i.R()) {\\n this.b((EntityLivingBase) null);\",\n \"signature\": \"void ax()\"\n },\n {\n \"arguments\": [\n \"this.j > 0\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"--this.j;\",\n \"signature\": \"else if (this.j > 0)\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"if (!this.q.I && (this.aT > 0 || this.aA()) && !this.g_() && this.q.O().b(\\\"doMobLoot\\\")) {\\n protected boolean aA() {\\n public Random aB() {\\n public EntityLivingBase aC() {\\n this.j = this.i != null ? 100 : 0;\\n public EntityLivingBase aD() {\\n public int aE() {\\n nbttagcompound.a(\\\"HealF\\\", this.aJ());\\n nbttagcompound.a(\\\"Health\\\", (short) ((int) Math.ceil((double) this.aJ())));\\n nbttagcompound.a(\\\"AbsorptionAmount\\\", this.bj());\\n ItemStack[] aitemstack = this.ac();\\n nbttagcompound.a(\\\"Attributes\\\", (NBTBase) SharedMonsterAttributes.a(this.aT()));\\n aitemstack = this.ac();\\n SharedMonsterAttributes.a(this.aT(), nbttagcompound.m(\\\"Attributes\\\"), this.q == null ? null : this.q.Y());\\n this.g(this.aP());\\n protected void aF() {\\n this.c(potioneffect);\\n this.b(potioneffect);\\n if (!this.ah()) {\\n public void aG() {\\n this.c(potioneffect);\\n public Collection aH() {\\n public void d(PotionEffect potioneffect) {\\n if (this.e(potioneffect)) {\\n if (this.e(potioneffect)) {\\n this.b((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())));\\n public boolean e(PotionEffect potioneffect) {\\n if (this.aU() == EnumCreatureAttribute.b) {\\n public boolean aI() {\\n return this.aU() == EnumCreatureAttribute.b;\\n this.c(potioneffect);\\n Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\\n protected void b(PotionEffect potioneffect) {\\n if (!this.q.I) {\\n Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\",\n \"signature\": \"void az()\"\n },\n {\n \"arguments\": [\n \"PotionEffect potioneffect\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\\n float f1 = this.aJ();\\n public final float aJ() {\\n this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aP())));\\n if (this.ap()) {\\n if (this.aJ() <= 0.0F) {\\n this.ax = this.aJ();\\n if (entitywolf.bP()) {\\n if (this.aJ() <= 0.0F) {\\n this.a(this.aL(), this.aW(), this.aX());\\n this.a(this.aK(), this.aW(), this.aX());\\n EntityLivingBase entitylivingbase = this.aO();\\n protected String aK() {\\n protected String aL() {\\n public boolean R() {\\n return !this.M && this.aJ() > 0.0F;\\n public int aM() {\\n ItemStack[] aitemstack = this.ac();\\n int i0 = 25 - this.aM();\\n i0 = EnchantmentHelper.a(this.ac(), damagesource);\\n if (!this.ap()) {\\n f0 = Math.max(f0 - this.bj(), 0.0F);\\n this.m(this.bj() - (f1 - f0));\\n float f2 = this.aJ();\\n this.aN().a(damagesource, f2, f0);\\n this.m(this.bj() - f0);\\n public CombatTracker aN() {\\n public EntityLivingBase aO() {\\n public final float aP() {\\n public final int aQ() {\\n public void aR() {\\n protected void aS() {\\n return this.aT().a(attribute);\\n public BaseAttributeMap aT() {\\n if (this.q != null && !this.q.I) {\\n this.d = new ServersideAttributeMap();\",\n \"signature\": \"void c(PotionEffect potioneffect)\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"public abstract ItemStack aV();\\n if (!this.q.I) {\\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\\n if (flag0) {\\n attributeinstance.a(c);\",\n \"signature\": \"EnumCreatureAttribute aU()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"signature\": \"float aW()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"\",\n \"signature\": \"void be()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityLivingBase.java\",\n \"implementation\": \"public void T() {\\n super.T();\\n protected void bg() {\",\n \"signature\": \"void bf()\"\n }\n ],\n \"patch\": \"@@ -72,17 +72,18 @@ public abstract class EntityLivingBase extends Entity {\\n private EntityLivingBase i;\\n private int j;\\n private EntityLivingBase bn;\\n- private float bo;\\n- private int bp;\\n- private float bq;\\n+ private int bo;\\n+ private float bp;\\n+ private int bq;\\n+ private float br;\\n \\n // CanaryMod: Custom MaxHealth\\n protected int maxHealth;\\n \\n public EntityLivingBase(World world) {\\n super(world);\\n- this.ax();\\n- this.g(this.aP());\\n+ this.ay();\\n+ this.g(this.aS());\\n this.m = true;\\n this.aM = (float) (Math.random() + 1.0D) * 0.01F;\\n this.b(this.u, this.v, this.w);\\n@@ -99,11 +100,11 @@ protected void a() {\\n this.ah.a(6, Float.valueOf(1.0F));\\n }\\n \\n- protected void ax() {\\n- this.aT().b(SharedMonsterAttributes.a);\\n- this.aT().b(SharedMonsterAttributes.c);\\n- this.aT().b(SharedMonsterAttributes.d);\\n- if (!this.bb()) {\\n+ protected void ay() {\\n+ this.aW().b(SharedMonsterAttributes.a);\\n+ this.aW().b(SharedMonsterAttributes.c);\\n+ this.aW().b(SharedMonsterAttributes.d);\\n+ if (!this.be()) {\\n this.a(SharedMonsterAttributes.d).a(0.10000000149011612D);\\n }\\n }\\n@@ -135,17 +136,17 @@ protected void a(double d0, boolean flag0) {\\n super.a(d0, flag0);\\n }\\n \\n- public boolean ay() {\\n+ public boolean az() {\\n return false;\\n }\\n \\n public void x() {\\n this.aD = this.aE;\\n super.x();\\n this.q.C.a(\\\"livingEntityBaseTick\\\");\\n- if (this.R() && this.S()) {\\n+ if (this.S() && this.T()) {\\n // CanaryMod: call DamageHook (Suffocation)\\n- DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1).call();\\n+ DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.d), 1.0F).call();\\n if (!hook.isCanceled()) {\\n this.a((((CanaryDamageSource) hook.getDamageSource()).getHandle()), hook.getDamageDealt());\\n }\\n@@ -158,14 +159,14 @@ public void x() {\\n \\n boolean flag0 = this instanceof EntityPlayer && ((EntityPlayer) this).bG.a;\\n \\n- if (this.R() && this.a(Material.h)) {\\n- if (!this.ay() && !this.i(Potion.o.H) && !flag0) {\\n- this.g(this.h(this.aj()));\\n- if (this.aj() == -20) {\\n+ if (this.S() && this.a(Material.h)) {\\n+ if (!this.az() && !this.i(Potion.o.H) && !flag0) {\\n+ this.g(this.h(this.ak()));\\n+ if (this.ak() == -20) {\\n this.g(0);\\n \\n // CanaryMod - drowning damage.\\n- DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2).call();\\n+ DamageHook hook = (DamageHook) new DamageHook(null, entity, new CanaryDamageSource(DamageSource.e), 2.0F).call();\\n if (!hook.isCanceled()) {\\n for (int i0 = 0; i0 < 8; ++i0) {\\n float f0 = this.ab.nextFloat() - this.ab.nextFloat();\\n@@ -182,7 +183,7 @@ public void x() {\\n }\\n \\n this.A();\\n- if (!this.q.I && this.ae() && this.o instanceof EntityLivingBase) {\\n+ if (!this.q.I && this.af() && this.o instanceof EntityLivingBase) {\\n this.a((Entity) null);\\n }\\n } else {\\n@@ -202,8 +203,8 @@ public void x() {\\n --this.af;\\n }\\n \\n- if (this.aJ() <= 0.0F) {\\n- this.az();\\n+ if (this.aM() <= 0.0F) {\\n+ this.aA();\\n }\\n \\n if (this.aT > 0) {\\n@@ -212,21 +213,15 @@ public void x() {\\n this.aS = null;\\n }\\n \\n- if (this.bn != null && !this.bn.R()) {\\n+ if (this.bn != null && !this.bn.S()) {\\n this.bn = null;\\n }\\n \\n- if (this.i != null) {\\n- if (!this.i.R()) {\\n- this.b((EntityLivingBase) null);\\n- } else if (this.j > 0) {\\n- --this.j;\\n- } else {\\n- this.b((EntityLivingBase) null);\\n- }\\n+ if (this.i != null && !this.i.S()) {\\n+ this.b((EntityLivingBase) null);\\n }\\n \\n- this.aF();\\n+ this.aI();\\n this.aZ = this.aY;\\n this.aO = this.aN;\\n this.aQ = this.aP;\\n@@ -239,12 +234,12 @@ public boolean g_() {\\n return false;\\n }\\n \\n- protected void az() {\\n+ protected void aA() {\\n ++this.aB;\\n if (this.aB == 20) {\\n int i0;\\n \\n- if (!this.q.I && (this.aT > 0 || this.aA()) && !this.g_() && this.q.O().b(\\\"doMobLoot\\\")) {\\n+ if (!this.q.I && (this.aT > 0 || this.aB()) && !this.g_() && this.q.O().b(\\\"doMobLoot\\\")) {\\n i0 = this.e(this.aS);\\n \\n while (i0 > 0) {\\n@@ -277,45 +272,57 @@ protected int e(EntityPlayer entityplayer) {\\n return 0;\\n }\\n \\n- protected boolean aA() {\\n+ protected boolean aB() {\\n return false;\\n }\\n \\n- public Random aB() {\\n+ public Random aC() {\\n return this.ab;\\n }\\n \\n- public EntityLivingBase aC() {\\n+ public EntityLivingBase aD() {\\n return this.i;\\n }\\n \\n+ public int aE() {\\n+ return this.j;\\n+ }\\n+\\n public void b(EntityLivingBase entitylivingbase) {\\n this.i = entitylivingbase;\\n- this.j = this.i != null ? 100 : 0;\\n+ this.j = this.ac;\\n }\\n \\n- public EntityLivingBase aD() {\\n+ public EntityLivingBase aF() {\\n return this.bn;\\n }\\n \\n+ public int aG() {\\n+ return this.bo;\\n+ }\\n+\\n public void k(Entity entity) {\\n if (entity instanceof EntityLivingBase) {\\n this.bn = (EntityLivingBase) entity;\\n+ } else {\\n+ this.bn = null;\\n }\\n+\\n+ this.bo = this.ac;\\n }\\n \\n- public int aE() {\\n+ public int aH() {\\n return this.aV;\\n }\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n- nbttagcompound.a(\\\"HealF\\\", this.aJ());\\n- nbttagcompound.a(\\\"Health\\\", (short) ((int) Math.ceil((double) this.aJ())));\\n+ nbttagcompound.a(\\\"HealF\\\", this.aM());\\n+ nbttagcompound.a(\\\"Health\\\", (short) ((int) Math.ceil((double) this.aM())));\\n nbttagcompound.a(\\\"HurtTime\\\", (short) this.ay);\\n nbttagcompound.a(\\\"DeathTime\\\", (short) this.aB);\\n nbttagcompound.a(\\\"AttackTime\\\", (short) this.aC);\\n- nbttagcompound.a(\\\"AbsorptionAmount\\\", this.bj());\\n- ItemStack[] aitemstack = this.ac();\\n+ nbttagcompound.a(\\\"AbsorptionAmount\\\", this.bm());\\n+ ItemStack[] aitemstack = this.ad();\\n int i0 = aitemstack.length;\\n \\n int i1;\\n@@ -328,8 +335,8 @@ public void b(NBTTagCompound nbttagcompound) {\\n }\\n }\\n \\n- nbttagcompound.a(\\\"Attributes\\\", (NBTBase) SharedMonsterAttributes.a(this.aT()));\\n- aitemstack = this.ac();\\n+ nbttagcompound.a(\\\"Attributes\\\", (NBTBase) SharedMonsterAttributes.a(this.aW()));\\n+ aitemstack = this.ad();\\n i0 = aitemstack.length;\\n \\n for (i1 = 0; i1 < i0; ++i1) {\\n@@ -356,7 +363,7 @@ public void b(NBTTagCompound nbttagcompound) {\\n public void a(NBTTagCompound nbttagcompound) {\\n this.m(nbttagcompound.g(\\\"AbsorptionAmount\\\"));\\n if (nbttagcompound.b(\\\"Attributes\\\") && this.q != null && !this.q.I) {\\n- SharedMonsterAttributes.a(this.aT(), nbttagcompound.m(\\\"Attributes\\\"), this.q == null ? null : this.q.Y());\\n+ SharedMonsterAttributes.a(this.aW(), nbttagcompound.m(\\\"Attributes\\\"), this.q == null ? null : this.q.Y());\\n }\\n \\n if (nbttagcompound.b(\\\"ActiveEffects\\\")) {\\n@@ -376,7 +383,7 @@ public void a(NBTTagCompound nbttagcompound) {\\n NBTBase nbtbase = nbttagcompound.a(\\\"Health\\\");\\n \\n if (nbtbase == null) {\\n- this.g(this.aP());\\n+ this.g(this.aS());\\n } else if (nbtbase.a() == 5) {\\n this.g(((NBTTagFloat) nbtbase).a);\\n } else if (nbtbase.a() == 2) {\\n@@ -389,7 +396,7 @@ public void a(NBTTagCompound nbttagcompound) {\\n this.aC = nbttagcompound.d(\\\"AttackTime\\\");\\n }\\n \\n- protected void aF() {\\n+ protected void aI() {\\n Iterator iterator = this.f.keySet().iterator();\\n \\n while (iterator.hasNext()) {\\n@@ -399,10 +406,10 @@ protected void aF() {\\n if (!potioneffect.a(this)) {\\n if (!this.q.I) {\\n iterator.remove();\\n- this.c(potioneffect);\\n+ this.b(potioneffect);\\n }\\n } else if (potioneffect.b() % 600 == 0) {\\n- this.b(potioneffect);\\n+ this.a(potioneffect, false);\\n }\\n }\\n \\n@@ -431,7 +438,7 @@ protected void aF() {\\n if (i0 > 0) {\\n boolean flag1 = false;\\n \\n- if (!this.ah()) {\\n+ if (!this.ai()) {\\n flag1 = this.ab.nextBoolean();\\n } else {\\n flag1 = this.ab.nextInt(15) == 0;\\n@@ -451,7 +458,7 @@ protected void aF() {\\n }\\n }\\n \\n- public void aG() {\\n+ public void aJ() {\\n Iterator iterator = this.f.keySet().iterator();\\n \\n while (iterator.hasNext()) {\\n@@ -460,12 +467,12 @@ public void aG() {\\n \\n if (!this.q.I) {\\n iterator.remove();\\n- this.c(potioneffect);\\n+ this.b(potioneffect);\\n }\\n }\\n }\\n \\n- public Collection aH() {\\n+ public Collection aK() {\\n return this.f.values();\\n }\\n \\n@@ -481,19 +488,19 @@ public PotionEffect b(Potion potion) {\\n return (PotionEffect) this.f.get(Integer.valueOf(potion.H));\\n }\\n \\n- public void d(PotionEffect potioneffect) {\\n- if (this.e(potioneffect)) {\\n+ public void c(PotionEffect potioneffect) {\\n+ if (this.d(potioneffect)) {\\n // CanaryMod: PotionEffectApplied\\n PotionEffectAppliedHook hook = (PotionEffectAppliedHook) new PotionEffectAppliedHook((net.canarymod.api.entity.living.LivingBase) getCanaryEntity(), new CanaryPotionEffect(potioneffect)).call();\\n if (hook.getPotionEffect() == null) {\\n return;\\n }\\n potioneffect = ((CanaryPotionEffect) hook.getPotionEffect()).getHandle();\\n //\\n- if (this.e(potioneffect)) {\\n+ if (this.d(potioneffect)) {\\n if (this.f.containsKey(Integer.valueOf(potioneffect.a()))) {\\n ((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a()))).a(potioneffect);\\n- this.b((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())));\\n+ this.a((PotionEffect) this.f.get(Integer.valueOf(potioneffect.a())), true);\\n } else {\\n this.f.put(Integer.valueOf(potioneffect.a()), potioneffect);\\n this.a(potioneffect);\\n@@ -502,8 +509,8 @@ public void d(PotionEffect potioneffect) {\\n }\\n }\\n \\n- public boolean e(PotionEffect potioneffect) {\\n- if (this.aU() == EnumCreatureAttribute.b) {\\n+ public boolean d(PotionEffect potioneffect) {\\n+ if (this.aX() == EnumCreatureAttribute.b) {\\n int i0 = potioneffect.a();\\n \\n if (i0 == Potion.l.H || i0 == Potion.u.H) {\\n@@ -514,70 +521,67 @@ public boolean e(PotionEffect potioneffect) {\\n return true;\\n }\\n \\n- public boolean aI() {\\n- return this.aU() == EnumCreatureAttribute.b;\\n+ public boolean aL() {\\n+ return this.aX() == EnumCreatureAttribute.b;\\n }\\n \\n public void k(int i0) {\\n PotionEffect potioneffect = (PotionEffect) this.f.remove(Integer.valueOf(i0));\\n \\n if (potioneffect != null) {\\n- this.c(potioneffect);\\n+ this.b(potioneffect);\\n }\\n }\\n \\n protected void a(PotionEffect potioneffect) {\\n this.h = true;\\n if (!this.q.I) {\\n- Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\\n+ Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\\n }\\n }\\n \\n- protected void b(PotionEffect potioneffect) {\\n+ protected void a(PotionEffect potioneffect, boolean flag0) {\\n this.h = true;\\n- if (!this.q.I) {\\n- Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\\n- }\\n-\\n- if (!this.q.I) {\\n- Potion.a[potioneffect.a()].b(this, this.aT(), potioneffect.c());\\n+ if (flag0 && !this.q.I) {\\n+ Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\\n+ Potion.a[potioneffect.a()].b(this, this.aW(), potioneffect.c());\\n }\\n }\\n \\n- protected void c(PotionEffect potioneffect) {\\n+ protected void b(PotionEffect potioneffect) {\\n // CanaryMod: PotionEffectFinish\\n new PotionEffectFinishHook((net.canarymod.api.entity.living.LivingBase) getCanaryEntity(), new CanaryPotionEffect(potioneffect)).call();\\n //\\n this.h = true;\\n if (!this.q.I) {\\n- Potion.a[potioneffect.a()].a(this, this.aT(), potioneffect.c());\\n+ Potion.a[potioneffect.a()].a(this, this.aW(), potioneffect.c());\\n }\\n }\\n \\n public void f(float f0) {\\n- float f1 = this.aJ();\\n+ float f1 = this.aM();\\n \\n if (f1 > 0.0F) {\\n this.g(f1 + f0);\\n }\\n }\\n \\n- public final float aJ() {\\n+ public final float aM() {\\n return this.ah.d(6);\\n }\\n \\n public void g(float f0) {\\n- this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aP())));\\n+ this.ah.b(6, Float.valueOf(MathHelper.a(f0, 0.0F, this.aS())));\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else if (this.q.I) {\\n return false;\\n } else {\\n this.aV = 0;\\n- if (this.aJ() <= 0.0F) {\\n+ if (this.aM() <= 0.0F) {\\n return false;\\n } else if (damagesource.m() && this.a(Potion.n)) {\\n return false;\\n@@ -629,7 +633,7 @@ public boolean a(DamageSource damagesource, float f0) {\\n return false;\\n }\\n this.bc = f0;\\n- this.ax = this.aJ();\\n+ this.ax = this.aM();\\n this.af = this.aI;\\n this.d((((CanaryDamageSource) hook.getDamageSource()).getHandle()), hook.getDamageDealt());\\n this.ay = this.az = 10;\\n@@ -650,7 +654,7 @@ public boolean a(DamageSource damagesource, float f0) {\\n } else if (entity instanceof EntityWolf) {\\n EntityWolf entitywolf = (EntityWolf) entity;\\n \\n- if (entitywolf.bP()) {\\n+ if (entitywolf.bT()) {\\n this.aT = 100;\\n this.aS = null;\\n }\\n@@ -679,14 +683,14 @@ public boolean a(DamageSource damagesource, float f0) {\\n }\\n }\\n \\n- if (this.aJ() <= 0.0F) {\\n+ if (this.aM() <= 0.0F) {\\n if (flag0) {\\n- this.a(this.aL(), this.aW(), this.aX());\\n+ this.a(this.aO(), this.aZ(), this.ba());\\n }\\n \\n this.a(damagesource);\\n } else if (flag0) {\\n- this.a(this.aK(), this.aW(), this.aX());\\n+ this.a(this.aN(), this.aZ(), this.ba());\\n }\\n \\n return true;\\n@@ -716,7 +720,7 @@ public void a(DamageSource damagesource) {\\n new EntityDeathHook(this.getCanaryEntity(), damagesource.getCanaryDamageSource()).call();\\n //\\n Entity entity = damagesource.i();\\n- EntityLivingBase entitylivingbase = this.aO();\\n+ EntityLivingBase entitylivingbase = this.aR();\\n \\n if (this.bb >= 0 && entitylivingbase != null) {\\n entitylivingbase.b(this, this.bb);\\n@@ -770,11 +774,11 @@ public void a(Entity entity, float f0, double d0, double d1) {\\n }\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"damage.hit\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"damage.hit\\\";\\n }\\n \\n@@ -791,8 +795,8 @@ public boolean e() {\\n return i3 == Block.aK.cF || i3 == Block.bz.cF;\\n }\\n \\n- public boolean R() {\\n- return !this.M && this.aJ() > 0.0F;\\n+ public boolean S() {\\n+ return !this.M && this.aM() > 0.0F;\\n }\\n \\n protected void b(float f0) {\\n@@ -825,9 +829,9 @@ protected void b(float f0) {\\n }\\n }\\n \\n- public int aM() {\\n+ public int aP() {\\n int i0 = 0;\\n- ItemStack[] aitemstack = this.ac();\\n+ ItemStack[] aitemstack = this.ad();\\n int i1 = aitemstack.length;\\n \\n for (int i2 = 0; i2 < i1; ++i2) {\\n@@ -847,7 +851,7 @@ protected void h(float f0) {}\\n \\n protected float b(DamageSource damagesource, float f0) {\\n if (!damagesource.e()) {\\n- int i0 = 25 - this.aM();\\n+ int i0 = 25 - this.aP();\\n float f1 = f0 * (float) i0;\\n \\n this.h(f0);\\n@@ -876,7 +880,7 @@ protected float c(DamageSource damagesource, float f0) {\\n if (f0 <= 0.0F) {\\n return 0.0F;\\n } else {\\n- i0 = EnchantmentHelper.a(this.ac(), damagesource);\\n+ i0 = EnchantmentHelper.a(this.ad(), damagesource);\\n if (i0 > 20) {\\n i0 = 20;\\n }\\n@@ -892,36 +896,36 @@ protected float c(DamageSource damagesource, float f0) {\\n }\\n \\n protected void d(DamageSource damagesource, float f0) {\\n- if (!this.ap()) {\\n+ if (!this.aq()) {\\n f0 = this.b(damagesource, f0);\\n f0 = this.c(damagesource, f0);\\n float f1 = f0;\\n \\n- f0 = Math.max(f0 - this.bj(), 0.0F);\\n- this.m(this.bj() - (f1 - f0));\\n+ f0 = Math.max(f0 - this.bm(), 0.0F);\\n+ this.m(this.bm() - (f1 - f0));\\n if (f0 != 0.0F) {\\n- float f2 = this.aJ();\\n+ float f2 = this.aM();\\n \\n this.g(f2 - f0);\\n- this.aN().a(damagesource, f2, f0);\\n- this.m(this.bj() - f0);\\n+ this.aQ().a(damagesource, f2, f0);\\n+ this.m(this.bm() - f0);\\n }\\n }\\n }\\n \\n- public CombatTracker aN() {\\n+ public CombatTracker aQ() {\\n return this.e;\\n }\\n \\n- public EntityLivingBase aO() {\\n+ public EntityLivingBase aR() {\\n return (EntityLivingBase) (this.e.c() != null ? this.e.c() : (this.aS != null ? this.aS : (this.i != null ? this.i : null)));\\n }\\n \\n- public final float aP() {\\n+ public final float aS() {\\n return (float) this.a(SharedMonsterAttributes.a).e();\\n }\\n \\n- public final int aQ() {\\n+ public final int aT() {\\n return this.ah.a(9);\\n }\\n \\n@@ -933,7 +937,7 @@ private int h() {\\n return this.a(Potion.e) ? 6 - (1 + this.b(Potion.e).c()) * 1 : (this.a(Potion.f) ? 6 + (1 + this.b(Potion.f).c()) * 2 : 6);\\n }\\n \\n- public void aR() {\\n+ public void aU() {\\n if (!this.au || this.av >= this.h() / 2 || this.av < 0) {\\n this.av = -1;\\n this.au = true;\\n@@ -947,7 +951,7 @@ protected void B() {\\n this.a(DamageSource.i, 4.0F);\\n }\\n \\n- protected void aS() {\\n+ protected void aV() {\\n int i0 = this.h();\\n \\n if (this.au) {\\n@@ -964,55 +968,52 @@ protected void aS() {\\n }\\n \\n public AttributeInstance a(Attribute attribute) {\\n- return this.aT().a(attribute);\\n+ return this.aW().a(attribute);\\n }\\n \\n- public BaseAttributeMap aT() {\\n+ public BaseAttributeMap aW() {\\n if (this.d == null) {\\n- if (this.q != null && !this.q.I) {\\n- this.d = new ServersideAttributeMap();\\n- } else {\\n- this.d = new ClientsideAttributeMap();\\n- }\\n+ this.d = new ServersideAttributeMap();\\n }\\n \\n return this.d;\\n }\\n \\n- public EnumCreatureAttribute aU() {\\n+ public EnumCreatureAttribute aX() {\\n return EnumCreatureAttribute.a;\\n }\\n \\n- public abstract ItemStack aV();\\n+ public abstract ItemStack aY();\\n \\n public abstract ItemStack n(int i0);\\n \\n public abstract void c(int i0, ItemStack itemstack);\\n \\n public void c(boolean flag0) {\\n super.c(flag0);\\n- if (!this.q.I) {\\n- AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\\n+ AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\\n \\n+ if (attributeinstance.a(b) != null) {\\n attributeinstance.b(c);\\n- if (flag0) {\\n- attributeinstance.a(c);\\n- }\\n+ }\\n+\\n+ if (flag0) {\\n+ attributeinstance.a(c);\\n }\\n }\\n \\n- public abstract ItemStack[] ac();\\n+ public abstract ItemStack[] ad();\\n \\n- protected float aW() {\\n+ protected float aZ() {\\n return 1.0F;\\n }\\n \\n- protected float aX() {\\n+ protected float ba() {\\n return this.g_() ? (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.5F : (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F;\\n }\\n \\n- protected boolean aY() {\\n- return this.aJ() <= 0.0F;\\n+ protected boolean bb() {\\n+ return this.aM() <= 0.0F;\\n }\\n \\n public void a(double d0, double d1, double d2) {\\n@@ -1050,13 +1051,13 @@ public void l(Entity entity) {\\n this.a(d0, d1, d2);\\n }\\n \\n- protected void ba() {\\n+ protected void bd() {\\n this.y = 0.41999998688697815D;\\n if (this.a(Potion.j)) {\\n this.y += (double) ((float) (this.b(Potion.j).c() + 1) * 0.1F);\\n }\\n \\n- if (this.ag()) {\\n+ if (this.ah()) {\\n float f0 = this.A * 0.017453292F;\\n \\n this.x -= (double) (MathHelper.a(f0) * 0.2F);\\n@@ -1071,7 +1072,7 @@ public void e(float f0, float f1) {\\n \\n if (this.G() && (!(this instanceof EntityPlayer) || !((EntityPlayer) this).bG.b)) {\\n d0 = this.v;\\n- this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n+ this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n this.d(this.x, this.y, this.z);\\n this.x *= 0.800000011920929D;\\n this.y *= 0.800000011920929D;\\n@@ -1107,7 +1108,7 @@ public void e(float f0, float f1) {\\n float f4;\\n \\n if (this.F) {\\n- f4 = this.bc() * f3;\\n+ f4 = this.bf() * f3;\\n } else {\\n f4 = this.aR;\\n }\\n@@ -1147,7 +1148,7 @@ public void e(float f0, float f1) {\\n this.y = -0.15D;\\n }\\n \\n- boolean flag0 = this.af() && this instanceof EntityPlayer;\\n+ boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n \\n if (flag0 && this.y < 0.0D) {\\n this.y = 0.0D;\\n@@ -1187,31 +1188,31 @@ public void e(float f0, float f1) {\\n this.aH += this.aG;\\n }\\n \\n- protected boolean bb() {\\n+ protected boolean be() {\\n return false;\\n }\\n \\n- public float bc() {\\n- return this.bb() ? this.bo : 0.1F;\\n+ public float bf() {\\n+ return this.be() ? this.bp : 0.1F;\\n }\\n \\n public void i(float f0) {\\n- this.bo = f0;\\n+ this.bp = f0;\\n }\\n \\n public boolean m(Entity entity) {\\n this.k(entity);\\n return false;\\n }\\n \\n- public boolean bd() {\\n+ public boolean bg() {\\n return false;\\n }\\n \\n public void l_() {\\n super.l_();\\n if (!this.q.I) {\\n- int i0 = this.aQ();\\n+ int i0 = this.aT();\\n \\n if (i0 > 0) {\\n if (this.aw <= 0) {\\n@@ -1337,8 +1338,8 @@ protected float f(float f0, float f1) {\\n }\\n \\n public void c() {\\n- if (this.bp > 0) {\\n- --this.bp;\\n+ if (this.bq > 0) {\\n+ --this.bq;\\n }\\n \\n if (this.bh > 0) {\\n@@ -1352,7 +1353,7 @@ public void c() {\\n --this.bh;\\n this.b(d0, d1, d2);\\n this.b(this.A, this.B);\\n- } else if (!this.bi()) {\\n+ } else if (!this.bl()) {\\n this.x *= 0.98D;\\n this.y *= 0.98D;\\n this.z *= 0.98D;\\n@@ -1371,41 +1372,41 @@ public void c() {\\n }\\n \\n this.q.C.a(\\\"ai\\\");\\n- if (this.aY()) {\\n+ if (this.bb()) {\\n this.bd = false;\\n this.be = 0.0F;\\n this.bf = 0.0F;\\n this.bg = 0.0F;\\n- } else if (this.bi()) {\\n- if (this.bb()) {\\n+ } else if (this.bl()) {\\n+ if (this.be()) {\\n this.q.C.a(\\\"newAi\\\");\\n- this.be();\\n+ this.bh();\\n this.q.C.b();\\n } else {\\n this.q.C.a(\\\"oldAi\\\");\\n- this.bh();\\n+ this.bk();\\n this.q.C.b();\\n this.aP = this.A;\\n }\\n }\\n // CanaryMod: NPC Addition, this is vital for pathfinding\\n // Just call the \\\"newAi\\\" method up there ^^\\n if (this instanceof EntityNonPlayableCharacter) {\\n- this.be();\\n+ this.bh();\\n }// END\\n this.q.C.b();\\n this.q.C.a(\\\"jump\\\");\\n if (this.bd) {\\n if (!this.G() && !this.I()) {\\n- if (this.F && this.bp == 0) {\\n- this.ba();\\n- this.bp = 10;\\n+ if (this.F && this.bq == 0) {\\n+ this.bd();\\n+ this.bq = 10;\\n }\\n } else {\\n this.y += 0.03999999910593033D;\\n }\\n } else {\\n- this.bp = 0;\\n+ this.bq = 0;\\n }\\n \\n this.q.C.b();\\n@@ -1417,15 +1418,15 @@ public void c() {\\n this.q.C.b();\\n this.q.C.a(\\\"push\\\");\\n if (!this.q.I) {\\n- this.bf();\\n+ this.bi();\\n }\\n \\n this.q.C.b();\\n }\\n \\n- protected void be() {}\\n+ protected void bh() {}\\n \\n- protected void bf() {\\n+ protected void bi() {\\n List list = this.q.b((Entity) this, this.E.b(0.20000000298023224D, 0.0D, 0.20000000298023224D));\\n \\n if (list != null && !list.isEmpty()) {\\n@@ -1443,16 +1444,16 @@ protected void n(Entity entity) {\\n entity.f((Entity) this);\\n }\\n \\n- public void T() {\\n- super.T();\\n+ public void U() {\\n+ super.U();\\n this.aW = this.aX;\\n this.aX = 0.0F;\\n this.T = 0.0F;\\n }\\n \\n- protected void bg() {}\\n+ protected void bj() {}\\n \\n- protected void bh() {\\n+ protected void bk() {\\n ++this.aV;\\n }\\n \\n@@ -1482,7 +1483,7 @@ public boolean o(Entity entity) {\\n return this.q.a(this.q.V().a(this.u, this.v + (double) this.f(), this.w), this.q.V().a(entity.u, entity.v + (double) entity.f(), entity.w)) == null;\\n }\\n \\n- public Vec3 Y() {\\n+ public Vec3 Z() {\\n return this.j(1.0F);\\n }\\n \\n@@ -1510,7 +1511,7 @@ public Vec3 j(float f0) {\\n }\\n }\\n \\n- public boolean bi() {\\n+ public boolean bl() {\\n return !this.q.I;\\n }\\n \\n@@ -1530,20 +1531,32 @@ protected void J() {\\n this.J = this.ab.nextDouble() >= this.a(SharedMonsterAttributes.c).e();\\n }\\n \\n- public float an() {\\n+ public float ao() {\\n return this.aP;\\n }\\n \\n- public float bj() {\\n- return this.bq;\\n+ public float bm() {\\n+ return this.br;\\n }\\n \\n public void m(float f0) {\\n if (f0 < 0.0F) {\\n f0 = 0.0F;\\n }\\n \\n- this.bq = f0;\\n+ this.br = f0;\\n+ }\\n+\\n+ public Team bn() {\\n+ return null;\\n+ }\\n+\\n+ public boolean c(EntityLivingBase entitylivingbase) {\\n+ return this.a(entitylivingbase.bn());\\n+ }\\n+\\n+ public boolean a(Team team) {\\n+ return this.bn() != null ? this.bn().a(team) : false;\\n }\\n \\n // CanaryMod\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityLivingBase.java\",\n \"sha\": \"2234a8a65e7277e6f158408b3dfc05f4dbe4b648\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 24,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMagmaCube.java\",\n \"changes\": 50,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMagmaCube.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 26,\n \"filename\": \"src/main/java/net/minecraft/server/EntityMagmaCube.java\",\n \"new_code\": \" protected void ay() {\\n super.ay();\\n public boolean bs() {\\n public int aP() {\\n return this.bR() * 3;\\n protected String bJ() {\\n protected EntitySlime bK() {\\n if (i1 > 0 && this.bR() > 1) {\\n public boolean ae() {\\n protected int bL() {\\n return super.bL() * 4;\\n protected void bM() {\\n protected void bd() {\\n this.y = (double) (0.42F + (float) this.bR() * 0.1F);\\n protected boolean bN() {\\n protected int bO() {\\n return super.bO() + 2;\\n protected String aN() {\\n return \\\"mob.slime.\\\" + (this.bR() > 1 ? \\\"big\\\" : \\\"small\\\");\\n protected String aO() {\\n return \\\"mob.slime.\\\" + (this.bR() > 1 ? \\\"big\\\" : \\\"small\\\");\\n protected String bP() {\\n return this.bR() > 1 ? \\\"mob.magmacube.big\\\" : \\\"mob.magmacube.small\\\";\\n protected boolean bQ() {\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n protected void ax() {\\n super.ax();\\n public boolean bo() {\\n public int aM() {\\n return this.bN() * 3;\\n protected String bF() {\\n protected EntitySlime bG() {\\n if (i1 > 0 && this.bN() > 1) {\\n public boolean ad() {\\n protected int bH() {\\n return super.bH() * 4;\\n protected void bI() {\\n protected void ba() {\\n this.y = (double) (0.42F + (float) this.bN() * 0.1F);\\n protected boolean bJ() {\\n protected int bK() {\\n return super.bK() + 2;\\n protected String aK() {\\n return \\\"mob.slime.\\\" + (this.bN() > 1 ? \\\"big\\\" : \\\"small\\\");\\n protected String aL() {\\n return \\\"mob.slime.\\\" + (this.bN() > 1 ? \\\"big\\\" : \\\"small\\\");\\n protected String bL() {\\n return this.bN() > 1 ? \\\"mob.magmacube.big\\\" : \\\"mob.magmacube.small\\\";\\n protected boolean bM() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.living.monster.CanaryMagmaCube;\\n \\n-\\n public class EntityMagmaCube extends EntitySlime {\\n \\n public EntityMagmaCube(World world) {\\n@@ -13,28 +11,28 @@ public EntityMagmaCube(World world) {\\n this.entity = new CanaryMagmaCube(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.d).a(0.20000000298023224D);\\n }\\n \\n- public boolean bo() {\\n+ public boolean bs() {\\n return this.q.r > 0 && this.q.b(this.E) && this.q.a((Entity) this, this.E).isEmpty() && !this.q.d(this.E);\\n }\\n \\n- public int aM() {\\n- return this.bN() * 3;\\n+ public int aP() {\\n+ return this.bR() * 3;\\n }\\n \\n public float d(float f0) {\\n return 1.0F;\\n }\\n \\n- protected String bF() {\\n+ protected String bJ() {\\n return \\\"flame\\\";\\n }\\n \\n- protected EntitySlime bG() {\\n+ protected EntitySlime bK() {\\n return new EntityMagmaCube(this.q);\\n }\\n \\n@@ -45,7 +43,7 @@ protected int s() {\\n protected void b(boolean flag0, int i0) {\\n int i1 = this.s();\\n \\n- if (i1 > 0 && this.bN() > 1) {\\n+ if (i1 > 0 && this.bR() > 1) {\\n int i2 = this.ab.nextInt(4) - 2;\\n \\n if (i0 > 0) {\\n@@ -58,50 +56,50 @@ protected void b(boolean flag0, int i0) {\\n }\\n }\\n \\n- public boolean ad() {\\n+ public boolean ae() {\\n return false;\\n }\\n \\n- protected int bH() {\\n- return super.bH() * 4;\\n+ protected int bL() {\\n+ return super.bL() * 4;\\n }\\n \\n- protected void bI() {\\n+ protected void bM() {\\n this.h *= 0.9F;\\n }\\n \\n- protected void ba() {\\n- this.y = (double) (0.42F + (float) this.bN() * 0.1F);\\n+ protected void bd() {\\n+ this.y = (double) (0.42F + (float) this.bR() * 0.1F);\\n this.an = true;\\n }\\n \\n protected void b(float f0) {}\\n \\n- protected boolean bJ() {\\n+ protected boolean bN() {\\n return true;\\n }\\n \\n- protected int bK() {\\n- return super.bK() + 2;\\n+ protected int bO() {\\n+ return super.bO() + 2;\\n }\\n \\n- protected String aK() {\\n- return \\\"mob.slime.\\\" + (this.bN() > 1 ? \\\"big\\\" : \\\"small\\\");\\n+ protected String aN() {\\n+ return \\\"mob.slime.\\\" + (this.bR() > 1 ? \\\"big\\\" : \\\"small\\\");\\n }\\n \\n- protected String aL() {\\n- return \\\"mob.slime.\\\" + (this.bN() > 1 ? \\\"big\\\" : \\\"small\\\");\\n+ protected String aO() {\\n+ return \\\"mob.slime.\\\" + (this.bR() > 1 ? \\\"big\\\" : \\\"small\\\");\\n }\\n \\n- protected String bL() {\\n- return this.bN() > 1 ? \\\"mob.magmacube.big\\\" : \\\"mob.magmacube.small\\\";\\n+ protected String bP() {\\n+ return this.bR() > 1 ? \\\"mob.magmacube.big\\\" : \\\"mob.magmacube.small\\\";\\n }\\n \\n public boolean I() {\\n return false;\\n }\\n \\n- protected boolean bM() {\\n+ protected boolean bQ() {\\n return true;\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMagmaCube.java\",\n \"sha\": \"2a5ccfa6a744831ea16d923985781d33ee7583ad\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 5,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecart.java\",\n \"changes\": 10,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecart.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 5,\n \"filename\": \"src/main/java/net/minecraft/server/EntityMinecart.java\",\n \"new_code\": \" public double X() {\\n if (this.aq()) {\\n this.ao = this.ab();\\n public String am() {\\n return this.c != null ? this.c : super.am();\",\n \"new_methods\": [],\n \"old_code\": \" public double W() {\\n if (this.ap()) {\\n this.ao = this.aa();\\n public String al() {\\n return this.c != null ? this.c : super.al();\",\n \"old_methods\": [],\n \"patch\": \"@@ -95,13 +95,13 @@ public EntityMinecart(World world, double d0, double d1, double d2) {\\n this.t = d2;\\n }\\n \\n- public double W() {\\n+ public double X() {\\n return (double) this.P * 0.0D - 0.30000001192092896D;\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n if (!this.q.I && !this.M) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n // CanaryMod: VehicleDamage\\n@@ -195,7 +195,7 @@ public void l_() {\\n if (Configuration.getWorldConfig(getCanaryWorld().getFqName()).isNetherAllowed()) {\\n if (this.o == null && this.aq++ >= i0) {\\n this.aq = i0;\\n- this.ao = this.aa();\\n+ this.ao = this.ab();\\n byte b0;\\n \\n if (this.q.t.i == -1) {\\n@@ -831,8 +831,8 @@ public void a(String s0) {\\n this.c = s0;\\n }\\n \\n- public String al() {\\n- return this.c != null ? this.c : super.al();\\n+ public String am() {\\n+ return this.c != null ? this.c : super.am();\\n }\\n \\n public boolean c() {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecart.java\",\n \"sha\": \"d273247f4f96a43016246e27ff5d7ab0bf16b94d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartChest.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartChest.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/EntityMinecartChest.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.vehicle.CanaryChestMinecart;\\n \\n-\\n public class EntityMinecartChest extends EntityMinecartContainer {\\n \\n public EntityMinecartChest(World world) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartChest.java\",\n \"sha\": \"b458c4cec2e73d916302b59cab0dcfa7cb6c1888\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartContainer.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartContainer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/EntityMinecartContainer.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n public abstract class EntityMinecartContainer extends EntityMinecart implements IInventory {\\n \\n public ItemStack[] a = new ItemStack[36]; // CanaryMod: private -> public\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartContainer.java\",\n \"sha\": \"ddb13b60263930ad796d2b452fceeb9e75a808aa\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartFurnace.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartFurnace.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/EntityMinecartFurnace.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.vehicle.CanaryFurnaceMinecart;\\n \\n-\\n public class EntityMinecartFurnace extends EntityMinecart {\\n \\n public int c; // CanaryMod: private -> public\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartFurnace.java\",\n \"sha\": \"dba18f40493073652843ed7595416f133f3dac76\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 11,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartHopper.java\",\n \"changes\": 24,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartHopper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 13,\n \"filename\": \"src/main/java/net/minecraft/server/EntityMinecartHopper.java\",\n \"new_code\": \" if (flag1 != this.ay()) {\\n public boolean ay() {\\n public World az() {\\n public double aA() {\\n public double aB() {\\n public double aC() {\\n if (!this.q.I && this.S() && this.ay()) {\\n if (!this.aE()) {\\n if (this.aD()) {\\n public boolean aD() {\\n public boolean aE() {\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n if (flag1 != this.ax()) {\\n public boolean ax() {\\n public World ay() {\\n public double az() {\\n public double aA() {\\n public double aB() {\\n if (!this.q.I && this.R() && this.ax()) {\\n if (!this.aD()) {\\n if (this.aC()) {\\n public boolean aC() {\\n public boolean aD() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,10 +1,8 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.List;\\n import net.canarymod.api.entity.vehicle.CanaryHopperMinecart;\\n \\n-\\n public class EntityMinecartHopper extends EntityMinecartContainer implements Hopper {\\n \\n private boolean a = true;\\n@@ -47,50 +45,50 @@ public boolean c(EntityPlayer entityplayer) {\\n public void a(int i0, int i1, int i2, boolean flag0) {\\n boolean flag1 = !flag0;\\n \\n- if (flag1 != this.ax()) {\\n+ if (flag1 != this.ay()) {\\n this.f(flag1);\\n }\\n }\\n \\n- public boolean ax() {\\n+ public boolean ay() {\\n return this.a;\\n }\\n \\n public void f(boolean flag0) {\\n this.a = flag0;\\n }\\n \\n- public World ay() {\\n+ public World az() {\\n return this.q;\\n }\\n \\n- public double az() {\\n+ public double aA() {\\n return this.u;\\n }\\n \\n- public double aA() {\\n+ public double aB() {\\n return this.v;\\n }\\n \\n- public double aB() {\\n+ public double aC() {\\n return this.w;\\n }\\n \\n public void l_() {\\n super.l_();\\n- if (!this.q.I && this.R() && this.ax()) {\\n+ if (!this.q.I && this.S() && this.ay()) {\\n --this.b;\\n- if (!this.aD()) {\\n+ if (!this.aE()) {\\n this.l(0);\\n- if (this.aC()) {\\n+ if (this.aD()) {\\n this.l(4);\\n this.e();\\n }\\n }\\n }\\n }\\n \\n- public boolean aC() {\\n+ public boolean aD() {\\n if (TileEntityHopper.a((Hopper) this)) {\\n return true;\\n } else {\\n@@ -123,7 +121,7 @@ public void l(int i0) {\\n this.b = i0;\\n }\\n \\n- public boolean aD() {\\n+ public boolean aE() {\\n return this.b > 0;\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartHopper.java\",\n \"sha\": \"6f30698a2deaf455bdc685a0ad50c3c28749d97d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartMobSpawner.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartMobSpawner.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/EntityMinecartMobSpawner.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.vehicle.CanaryMobSpawnerMinecart;\\n \\n-\\n public class EntityMinecartMobSpawner extends EntityMinecart {\\n \\n public final MobSpawnerBaseLogic a = new EntityMinecartMobSpawnerLogic(this); // CanaryMod: private -> public\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartMobSpawner.java\",\n \"sha\": \"944b93c38fe0ffcaea4dc047298c6bfa8c13ea88\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartTNT.java\",\n \"changes\": 8,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartTNT.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 5,\n \"filename\": \"src/main/java/net/minecraft/server/EntityMinecartTNT.java\",\n \"new_code\": \" public boolean ay() {\\n return this.ay() && (BlockRailBase.e_(block.cF) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? 0.0F : super.a(explosion, world, i0, i1, i2, block);\\n return this.ay() && (BlockRailBase.e_(i3) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? false : super.a(explosion, world, i0, i1, i2, i3, f0);\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n public boolean ax() {\\n return this.ax() && (BlockRailBase.e_(block.cF) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? 0.0F : super.a(explosion, world, i0, i1, i2, block);\\n return this.ax() && (BlockRailBase.e_(i3) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? false : super.a(explosion, world, i0, i1, i2, i3, f0);\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.vehicle.CanaryTNTMinecart;\\n \\n-\\n public class EntityMinecartTNT extends EntityMinecart {\\n \\n public int a = -1; // CanaryMod: private -> public\\n@@ -94,16 +92,16 @@ public void d() {\\n }\\n }\\n \\n- public boolean ax() {\\n+ public boolean ay() {\\n return this.a > -1;\\n }\\n \\n public float a(Explosion explosion, World world, int i0, int i1, int i2, Block block) {\\n- return this.ax() && (BlockRailBase.e_(block.cF) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? 0.0F : super.a(explosion, world, i0, i1, i2, block);\\n+ return this.ay() && (BlockRailBase.e_(block.cF) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? 0.0F : super.a(explosion, world, i0, i1, i2, block);\\n }\\n \\n public boolean a(Explosion explosion, World world, int i0, int i1, int i2, int i3, float f0) {\\n- return this.ax() && (BlockRailBase.e_(i3) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? false : super.a(explosion, world, i0, i1, i2, i3, f0);\\n+ return this.ay() && (BlockRailBase.e_(i3) || BlockRailBase.d_(world, i0, i1 + 1, i2)) ? false : super.a(explosion, world, i0, i1, i2, i3, f0);\\n }\\n \\n protected void a(NBTTagCompound nbttagcompound) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMinecartTNT.java\",\n \"sha\": \"8915ff7be6981b7718f1c8bca413a6d5fce9ec74\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 8,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMob.java\",\n \"changes\": 16,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMob.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 8,\n \"filename\": \"src/main/java/net/minecraft/server/EntityMob.java\",\n \"new_code\": \" this.aV();\\n protected Entity bL() {\\n if (this.aq()) {\\n public boolean bs() {\\n return this.q.r > 0 && this.i_() && super.bs();\\n protected void ay() {\\n super.ay();\\n this.aW().b(SharedMonsterAttributes.e);\",\n \"new_methods\": [],\n \"old_code\": \" this.aS();\\n protected Entity bH() {\\n if (this.ap()) {\\n public boolean bo() {\\n return this.q.r > 0 && this.i_() && super.bo();\\n protected void ax() {\\n super.ax();\\n this.aT().b(SharedMonsterAttributes.e);\",\n \"old_methods\": [],\n \"patch\": \"@@ -10,7 +10,7 @@ public EntityMob(World world) {\\n }\\n \\n public void c() {\\n- this.aS();\\n+ this.aV();\\n float f0 = this.d(1.0F);\\n \\n if (f0 > 0.5F) {\\n@@ -27,14 +27,14 @@ public void l_() {\\n }\\n }\\n \\n- protected Entity bH() {\\n+ protected Entity bL() {\\n EntityPlayer entityplayer = this.q.b(this, 16.0D);\\n \\n return entityplayer != null && this.o(entityplayer) ? entityplayer : null;\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else if (super.a(damagesource, f0)) {\\n Entity entity = damagesource.i();\\n@@ -128,12 +128,12 @@ protected boolean i_() {\\n }\\n }\\n \\n- public boolean bo() {\\n- return this.q.r > 0 && this.i_() && super.bo();\\n+ public boolean bs() {\\n+ return this.q.r > 0 && this.i_() && super.bs();\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n- this.aT().b(SharedMonsterAttributes.e);\\n+ protected void ay() {\\n+ super.ay();\\n+ this.aW().b(SharedMonsterAttributes.e);\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMob.java\",\n \"sha\": \"881e6ba8a6205803a7d2352eb44be2cc851660fa\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMooshroom.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMooshroom.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/EntityMooshroom.java\",\n \"new_code\": \" entitycow.g(this.aM());\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n entitycow.g(this.aJ());\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.living.animal.CanaryMooshroom;\\n \\n-\\n public class EntityMooshroom extends EntityCow {\\n \\n public EntityMooshroom(World world) {\\n@@ -34,7 +32,7 @@ public boolean a(EntityPlayer entityplayer) {\\n EntityCow entitycow = new EntityCow(this.q);\\n \\n entitycow.b(this.u, this.v, this.w, this.A, this.B);\\n- entitycow.g(this.aJ());\\n+ entitycow.g(this.aM());\\n entitycow.aN = this.aN;\\n this.q.d((Entity) entitycow);\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityMooshroom.java\",\n \"sha\": \"1fa8761b7d3333578984c8d3a846ac17166ed0f7\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 25,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityOcelot.java\",\n \"changes\": 50,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityOcelot.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 25,\n \"filename\": \"src/main/java/net/minecraft/server/EntityOcelot.java\",\n \"new_code\": \" public void bj() {\\n return !this.bT() && this.ac > 2400;\\n public boolean be() {\\n protected void ay() {\\n super.ay();\\n nbttagcompound.a(\\\"CatType\\\", this.ca());\\n return this.bT() ? (this.bY() ? \\\"mob.cat.purr\\\" : (this.ab.nextInt(4) == 0 ? \\\"mob.cat.purreow\\\" : \\\"mob.cat.meow\\\")) : \\\"\\\";\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (this.aq()) {\\n if (this.bT()) {\\n this.bp.a(!this.bU());\\n this.j(true);\\n this.i(true);\\n this.i(false);\\n if (this.bT()) {\\n entityocelot.j(true);\\n entityocelot.p(this.ca());\\n } else if (!this.bT()) {\\n return !entityocelot.bT() ? false : this.bY() && entityocelot.bY();\\n public int ca() {\\n public boolean bs() {\\n public String am() {\\n return this.bB() ? this.bA() : (this.bT() ? \\\"entity.Cat.name\\\" : super.am());\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityOcelot.java\",\n \"implementation\": \"return !this.bT() && this.ac > 2400;\\n public boolean be() {\\n protected void ay() {\\n super.ay();\\n nbttagcompound.a(\\\"CatType\\\", this.ca());\\n return this.bT() ? (this.bY() ? \\\"mob.cat.purr\\\" : (this.ab.nextInt(4) == 0 ? \\\"mob.cat.purreow\\\" : \\\"mob.cat.meow\\\")) : \\\"\\\";\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (this.aq()) {\\n if (this.bT()) {\\n this.bp.a(!this.bU());\\n this.j(true);\\n this.i(true);\\n this.i(false);\\n if (this.bT()) {\\n entityocelot.j(true);\\n entityocelot.p(this.ca());\",\n \"signature\": \"void bj()\"\n }\n ],\n \"old_code\": \" public void bg() {\\n return !this.bP() && this.ac > 2400;\\n public boolean bb() {\\n protected void ax() {\\n super.ax();\\n nbttagcompound.a(\\\"CatType\\\", this.bW());\\n return this.bP() ? (this.bU() ? \\\"mob.cat.purr\\\" : (this.ab.nextInt(4) == 0 ? \\\"mob.cat.purreow\\\" : \\\"mob.cat.meow\\\")) : \\\"\\\";\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (this.ap()) {\\n if (this.bP()) {\\n this.bp.a(!this.bQ());\\n this.k(true);\\n this.j(true);\\n this.j(false);\\n if (this.bP()) {\\n entityocelot.k(true);\\n entityocelot.p(this.bW());\\n } else if (!this.bP()) {\\n return !entityocelot.bP() ? false : this.bU() && entityocelot.bU();\\n public int bW() {\\n public boolean bo() {\\n public String al() {\\n return this.bx() ? this.bw() : (this.bP() ? \\\"entity.Cat.name\\\" : super.al());\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityOcelot.java\",\n \"implementation\": \"return !this.bP() && this.ac > 2400;\\n public boolean bb() {\\n protected void ax() {\\n super.ax();\\n nbttagcompound.a(\\\"CatType\\\", this.bW());\\n return this.bP() ? (this.bU() ? \\\"mob.cat.purr\\\" : (this.ab.nextInt(4) == 0 ? \\\"mob.cat.purreow\\\" : \\\"mob.cat.meow\\\")) : \\\"\\\";\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (this.ap()) {\\n if (this.bP()) {\\n this.bp.a(!this.bQ());\\n this.k(true);\\n this.j(true);\\n this.j(false);\\n if (this.bP()) {\\n entityocelot.k(true);\\n entityocelot.p(this.bW());\",\n \"signature\": \"void bg()\"\n }\n ],\n \"patch\": \"@@ -31,7 +31,7 @@ protected void a() {\\n this.ah.a(18, Byte.valueOf((byte) 0));\\n }\\n \\n- public void bg() {\\n+ public void bj() {\\n if (this.i().a()) {\\n double d0 = this.i().b();\\n \\n@@ -52,15 +52,15 @@ public void bg() {\\n }\\n \\n protected boolean t() {\\n- return !this.bP() && this.ac > 2400;\\n+ return !this.bT() && this.ac > 2400;\\n }\\n \\n- public boolean bb() {\\n+ public boolean be() {\\n return true;\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(10.0D);\\n this.a(SharedMonsterAttributes.d).a(0.30000001192092896D);\\n }\\n@@ -69,7 +69,7 @@ protected void b(float f0) {}\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n super.b(nbttagcompound);\\n- nbttagcompound.a(\\\"CatType\\\", this.bW());\\n+ nbttagcompound.a(\\\"CatType\\\", this.ca());\\n }\\n \\n public void a(NBTTagCompound nbttagcompound) {\\n@@ -78,18 +78,18 @@ public void a(NBTTagCompound nbttagcompound) {\\n }\\n \\n protected String r() {\\n- return this.bP() ? (this.bU() ? \\\"mob.cat.purr\\\" : (this.ab.nextInt(4) == 0 ? \\\"mob.cat.purreow\\\" : \\\"mob.cat.meow\\\")) : \\\"\\\";\\n+ return this.bT() ? (this.bY() ? \\\"mob.cat.purr\\\" : (this.ab.nextInt(4) == 0 ? \\\"mob.cat.purreow\\\" : \\\"mob.cat.meow\\\")) : \\\"\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.cat.hitt\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.cat.hitt\\\";\\n }\\n \\n- protected float aW() {\\n+ protected float aZ() {\\n return 0.4F;\\n }\\n \\n@@ -102,7 +102,7 @@ public boolean m(Entity entity) {\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n this.bp.a(false);\\n@@ -115,9 +115,9 @@ protected void b(boolean flag0, int i0) {}\\n public boolean a(EntityPlayer entityplayer) {\\n ItemStack itemstack = entityplayer.bn.h();\\n \\n- if (this.bP()) {\\n+ if (this.bT()) {\\n if (entityplayer.c_().equalsIgnoreCase(this.h_()) && !this.q.I && !this.c(itemstack)) {\\n- this.bp.a(!this.bQ());\\n+ this.bp.a(!this.bU());\\n }\\n } else if (this.bq.f() && itemstack != null && itemstack.d == Item.aW.cv && entityplayer.e(this) < 9.0D) {\\n if (!entityplayer.bG.d) {\\n@@ -134,14 +134,14 @@ public boolean a(EntityPlayer entityplayer) {\\n \\n if (hook.isTamed() && !hook.isCanceled()) {\\n //\\n- this.k(true);\\n+ this.j(true);\\n this.p(1 + this.q.s.nextInt(3));\\n this.b(entityplayer.c_());\\n- this.j(true);\\n+ this.i(true);\\n this.bp.a(true);\\n this.q.a((Entity) this, (byte) 7);\\n } else {\\n- this.j(false);\\n+ this.i(false);\\n this.q.a((Entity) this, (byte) 6);\\n }\\n }\\n@@ -155,10 +155,10 @@ public boolean a(EntityPlayer entityplayer) {\\n public EntityOcelot b(EntityAgeable entityageable) {\\n EntityOcelot entityocelot = new EntityOcelot(this.q);\\n \\n- if (this.bP()) {\\n+ if (this.bT()) {\\n entityocelot.b(this.h_());\\n- entityocelot.k(true);\\n- entityocelot.p(this.bW());\\n+ entityocelot.j(true);\\n+ entityocelot.p(this.ca());\\n }\\n \\n return entityocelot;\\n@@ -171,26 +171,26 @@ public boolean c(ItemStack itemstack) {\\n public boolean a(EntityAnimal entityanimal) {\\n if (entityanimal == this) {\\n return false;\\n- } else if (!this.bP()) {\\n+ } else if (!this.bT()) {\\n return false;\\n } else if (!(entityanimal instanceof EntityOcelot)) {\\n return false;\\n } else {\\n EntityOcelot entityocelot = (EntityOcelot) entityanimal;\\n \\n- return !entityocelot.bP() ? false : this.bU() && entityocelot.bU();\\n+ return !entityocelot.bT() ? false : this.bY() && entityocelot.bY();\\n }\\n }\\n \\n- public int bW() {\\n+ public int ca() {\\n return this.ah.a(18);\\n }\\n \\n public void p(int i0) {\\n this.ah.b(18, Byte.valueOf((byte) i0));\\n }\\n \\n- public boolean bo() {\\n+ public boolean bs() {\\n if (this.q.s.nextInt(3) == 0) {\\n return false;\\n } else {\\n@@ -214,8 +214,8 @@ public boolean bo() {\\n }\\n }\\n \\n- public String al() {\\n- return this.bx() ? this.bw() : (this.bP() ? \\\"entity.Cat.name\\\" : super.al());\\n+ public String am() {\\n+ return this.bB() ? this.bA() : (this.bT() ? \\\"entity.Cat.name\\\" : super.am());\\n }\\n \\n public EntityLivingData a(EntityLivingData entitylivingdata) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityOcelot.java\",\n \"sha\": \"23e021761c9a4c8d6df6dc4d5c70421a819a53e0\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPainting.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPainting.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/EntityPainting.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,10 +1,8 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.ArrayList;\\n import net.canarymod.api.entity.hanging.CanaryPainting;\\n \\n-\\n public class EntityPainting extends EntityHanging {\\n \\n public EnumArt e;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPainting.java\",\n \"sha\": \"07a41626a01638a184f4209cc8178b89f43329ea\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 18,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPig.java\",\n \"changes\": 36,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPig.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 18,\n \"filename\": \"src/main/java/net/minecraft/server/EntityPig.java\",\n \"new_code\": \" public boolean be() {\\n protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\\n } else if (this.bT() && !this.q.I && (this.n == null || this.n == entityplayer)) {\\n return this.ae() ? Item.at.cv : Item.as.cv;\\n if (this.ae()) {\\n if (this.bT()) {\\n public boolean bT() {\\n public void i(boolean flag0) {\\n public EntityAIControlledByPlayer bU() {\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityPig.java\",\n \"implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"signature\": \"boolean be()\"\n }\n ],\n \"old_code\": \" public boolean bb() {\\n protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\\n } else if (this.bP() && !this.q.I && (this.n == null || this.n == entityplayer)) {\\n return this.ad() ? Item.at.cv : Item.as.cv;\\n if (this.ad()) {\\n if (this.bP()) {\\n public boolean bP() {\\n public void j(boolean flag0) {\\n public EntityAIControlledByPlayer bQ() {\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityPig.java\",\n \"implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"signature\": \"boolean bb()\"\n }\n ],\n \"patch\": \"@@ -23,22 +23,22 @@ public EntityPig(World world) {\\n this.entity = new CanaryPig(this); // CanaryMod: Wrap Entity\\n }\\n \\n- public boolean bb() {\\n+ public boolean be() {\\n return true;\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(10.0D);\\n this.a(SharedMonsterAttributes.d).a(0.25D);\\n }\\n \\n- protected void be() {\\n- super.be();\\n+ protected void bh() {\\n+ super.bh();\\n }\\n \\n- public boolean bu() {\\n- ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n+ public boolean by() {\\n+ ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n \\n return itemstack != null && itemstack.d == Item.bT.cv;\\n }\\n@@ -50,23 +50,23 @@ protected void a() {\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n super.b(nbttagcompound);\\n- nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n+ nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n }\\n \\n public void a(NBTTagCompound nbttagcompound) {\\n super.a(nbttagcompound);\\n- this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n+ this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n }\\n \\n protected String r() {\\n return \\\"mob.pig.say\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.pig.say\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.pig.death\\\";\\n }\\n \\n@@ -77,7 +77,7 @@ protected void a(int i0, int i1, int i2, int i3) {\\n public boolean a(EntityPlayer entityplayer) {\\n if (super.a(entityplayer)) {\\n return true;\\n- } else if (this.bP() && !this.q.I && (this.n == null || this.n == entityplayer)) {\\n+ } else if (this.bT() && !this.q.I && (this.n == null || this.n == entityplayer)) {\\n entityplayer.a((Entity) this);\\n return true;\\n } else {\\n@@ -86,30 +86,30 @@ public boolean a(EntityPlayer entityplayer) {\\n }\\n \\n protected int s() {\\n- return this.ad() ? Item.at.cv : Item.as.cv;\\n+ return this.ae() ? Item.at.cv : Item.as.cv;\\n }\\n \\n protected void b(boolean flag0, int i0) {\\n int i1 = this.ab.nextInt(3) + 1 + this.ab.nextInt(1 + i0);\\n \\n for (int i2 = 0; i2 < i1; ++i2) {\\n- if (this.ad()) {\\n+ if (this.ae()) {\\n this.b(Item.at.cv, 1);\\n } else {\\n this.b(Item.as.cv, 1);\\n }\\n }\\n \\n- if (this.bP()) {\\n+ if (this.bT()) {\\n this.b(Item.aC.cv, 1);\\n }\\n }\\n \\n- public boolean bP() {\\n+ public boolean bT() {\\n return (this.ah.a(16) & 1) != 0;\\n }\\n \\n- public void j(boolean flag0) {\\n+ public void i(boolean flag0) {\\n if (flag0) {\\n this.ah.b(16, Byte.valueOf((byte) 1));\\n } else {\\n@@ -142,7 +142,7 @@ public boolean c(ItemStack itemstack) {\\n return itemstack != null && itemstack.d == Item.bM.cv;\\n }\\n \\n- public EntityAIControlledByPlayer bQ() {\\n+ public EntityAIControlledByPlayer bU() {\\n return this.bp;\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPig.java\",\n \"sha\": \"8b8ab00a24d171ee328530aac1de177b4f9b7117\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 12,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPigZombie.java\",\n \"changes\": 24,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPigZombie.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 12,\n \"filename\": \"src/main/java/net/minecraft/server/EntityPigZombie.java\",\n \"new_code\": \" protected void ay() {\\n super.ay();\\n protected boolean be() {\\n this.a(\\\"mob.zombiepig.zpigangry\\\", this.aZ() * 2.0F, ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 1.8F);\\n public boolean bs() {\\n protected Entity bL() {\\n return this.bs == 0 ? null : super.bL();\\n if (this.aq()) {\\n protected String aN() {\\n protected String aO() {\\n protected void bw() {\\n this.i(false);\",\n \"new_methods\": [],\n \"old_code\": \" protected void ax() {\\n super.ax();\\n protected boolean bb() {\\n this.a(\\\"mob.zombiepig.zpigangry\\\", this.aW() * 2.0F, ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 1.8F);\\n public boolean bo() {\\n protected Entity bH() {\\n return this.bs == 0 ? null : super.bH();\\n if (this.ap()) {\\n protected String aK() {\\n protected String aL() {\\n protected void bs() {\\n this.j(false);\",\n \"old_methods\": [],\n \"patch\": \"@@ -19,14 +19,14 @@ public EntityPigZombie(World world) {\\n this.entity = new CanaryPigZombie(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(bp).a(0.0D);\\n this.a(SharedMonsterAttributes.d).a(0.5D);\\n this.a(SharedMonsterAttributes.e).a(5.0D);\\n }\\n \\n- protected boolean bb() {\\n+ protected boolean be() {\\n return false;\\n }\\n \\n@@ -42,13 +42,13 @@ public void l_() {\\n \\n this.bu = this.j;\\n if (this.bt > 0 && --this.bt == 0) {\\n- this.a(\\\"mob.zombiepig.zpigangry\\\", this.aW() * 2.0F, ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 1.8F);\\n+ this.a(\\\"mob.zombiepig.zpigangry\\\", this.aZ() * 2.0F, ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 1.8F);\\n }\\n \\n super.l_();\\n }\\n \\n- public boolean bo() {\\n+ public boolean bs() {\\n return this.q.r > 0 && this.q.b(this.E) && this.q.a((Entity) this, this.E).isEmpty() && !this.q.d(this.E);\\n }\\n \\n@@ -62,12 +62,12 @@ public void a(NBTTagCompound nbttagcompound) {\\n this.bs = nbttagcompound.d(\\\"Anger\\\");\\n }\\n \\n- protected Entity bH() {\\n- return this.bs == 0 ? null : super.bH();\\n+ protected Entity bL() {\\n+ return this.bs == 0 ? null : super.bL();\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n Entity entity = damagesource.i();\\n@@ -106,11 +106,11 @@ protected String r() {\\n return \\\"mob.zombiepig.zpig\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.zombiepig.zpighurt\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.zombiepig.zpigdeath\\\";\\n }\\n \\n@@ -142,13 +142,13 @@ protected int s() {\\n return Item.bo.cv;\\n }\\n \\n- protected void bs() {\\n+ protected void bw() {\\n this.c(0, new ItemStack(Item.I));\\n }\\n \\n public EntityLivingData a(EntityLivingData entitylivingdata) {\\n super.a(entitylivingdata);\\n- this.j(false);\\n+ this.i(false);\\n return entitylivingdata;\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPigZombie.java\",\n \"sha\": \"dab36a27089fbaa81be8755d103edb6f44be0d2f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 105,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayer.java\",\n \"changes\": 246,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 141,\n \"filename\": \"src/main/java/net/minecraft/server/EntityPlayer.java\",\n \"new_code\": \" protected void ay() {\\n super.ay();\\n this.aW().b(SharedMonsterAttributes.e).a(1.0D);\\n public boolean bq() {\\n public void bs() {\\n this.bt();\\n public void bt() {\\n public boolean bu() {\\n return this.bq() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\\n this.bt();\\n if (this.bg()) {\\n if (this.ae() && this.bG.a) {\\n public int ab() {\\n this.bt();\\n protected boolean bb() {\\n return this.aM() <= 0.0F || this.bg();\\n public void U() {\\n if (!this.q.I && this.ag()) {\\n super.U();\\n protected void bk() {\\n super.bk();\\n this.aV();\\n if (this.q.r == 0 && this.aM() < this.aS() && this.q.O().b(\\\"naturalRegeneration\\\") && this.ac % 20 * 12 == 0) {\\n if (this.ah()) {\\n if (!this.F || this.aM() <= 0.0F) {\\n if (this.F || this.aM() <= 0.0F) {\\n if (this.aM() > 0.0F) {\\n public int bv() {\\n int i1 = this.bv();\\n Collection collection = this.bL().a(ScoreObjectiveCriteria.e);\\n collection.addAll(this.bL().a(ScoreObjectiveCriteria.d));\\n Score score = this.bL().a(this.am(), scoreobjective);\\n nbttagcompound.a(\\\"Score\\\", this.bv());\\n if (this.aq()) {\\n if (this.aM() <= 0.0F) {\\n if (this.bg() && !this.q.I) {\\n Team team = this.bn();\\n Team team1 = entityplayer.bn();\\n return team == null ? true : (!team.a(team1) ? true : team.g());\\n public int aP() {\\n public float bw() {\\n if (!this.aq()) {\\n if (!damagesource.e() && this.bu() && f0 > 0.0F) {\\n f0 = Math.max(f0 - this.bm(), 0.0F);\\n this.m(this.bm() - (f1 - f0));\\n float f2 = this.aM();\\n this.g(this.aM() - f0);\\n this.aQ().a(damagesource, f2, f0);\\n ItemStack itemstack = this.bx();\\n this.by();\\n if (itemstack != null && itemstack == this.bx()) {\\n this.by();\\n public ItemStack bx() {\\n public void by() {\\n public double W() {\\n if (entity.ap()) {\\n if (this.ah()) {\\n if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ae()) {\\n ItemStack itemstack = this.bx();\\n this.by();\\n public boolean T() {\\n return !this.bC && super.T();\\n if (this.bg() || !this.S()) {\\n if (this.af()) {\\n public boolean bg() {\\n public boolean bC() {\\n public ChunkCoordinates bE() {\\n public boolean bF() {\\n protected void bd() {\\n super.bd();\\n if (this.ah()) {\\n public float bf() {\\n if (this.ah()) {\\n public void al() {\\n super.al();\\n this.bJ += (float) i0 / (float) this.bG();\\n for (this.bI += i0; this.bJ >= 1.0F; this.bJ /= (float) this.bG()) {\\n this.bJ = (this.bJ - 1.0F) * (float) this.bG();\\n public int bG() {\\n public FoodStats bH() {\\n public boolean bI() {\\n return this.aM() > 0.0F && this.aM() < this.aS();\\n if (this.bx() != null) {\\n ItemStack itemstack = this.bx();\\n protected boolean aB() {\\n public String am() {\\n this.g(entityplayer.aM());\\n this.c(entityplayer.bv());\\n this.c(entityplayer.bv());\\n public InventoryEnderChest bJ() {\\n public ItemStack aY() {\\n public ItemStack[] ad() {\\n public boolean aw() {\\n public Scoreboard bL() {\\n public Team bn() {\\n return this.bL().i(this.bu);\\n public String ax() {\\n return ScorePlayerTeam.a(this.bn(), this.bu);\\n public float bm() {\\n this.bI -= (float) i / (float) this.bG();\\n for (this.bI -= i; this.bJ < 0.0F; this.bJ = this.bJ / this.bG() + 1.0F) {\\n this.bJ *= this.bG();\\n this.bJ = this.bI / (float) this.bG();\\n this.bJ = (this.bJ - 1.0F) * this.bG();\\n this.bJ /= this.bG();\",\n \"new_methods\": [],\n \"old_code\": \" protected void ax() {\\n super.ax();\\n this.aT().b(SharedMonsterAttributes.e).a(1.0D);\\n public boolean bm() {\\n public void bo() {\\n this.bp();\\n public void bp() {\\n public boolean bq() {\\n return this.bm() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\\n this.bp();\\n if (this.bd()) {\\n if (this.ad() && this.bG.a) {\\n public int aa() {\\n this.bp();\\n protected boolean aY() {\\n return this.aJ() <= 0.0F || this.bd();\\n public void T() {\\n if (!this.q.I && this.af()) {\\n super.T();\\n protected void bh() {\\n super.bh();\\n this.aS();\\n if (this.q.r == 0 && this.aJ() < this.aP() && this.q.O().b(\\\"naturalRegeneration\\\") && this.ac % 20 * 12 == 0) {\\n if (this.ag()) {\\n if (!this.F || this.aJ() <= 0.0F) {\\n if (this.F || this.aJ() <= 0.0F) {\\n if (this.aJ() > 0.0F) {\\n public int br() {\\n int i1 = this.br();\\n Collection collection = this.bH().a(ScoreObjectiveCriteria.e);\\n collection.addAll(this.bH().a(ScoreObjectiveCriteria.d));\\n Score score = this.bH().a(this.al(), scoreobjective);\\n nbttagcompound.a(\\\"Score\\\", this.br());\\n if (this.ap()) {\\n if (this.aJ() <= 0.0F) {\\n if (this.bd() && !this.q.I) {\\n if (entity instanceof EntityLivingBase) {\\n this.a((EntityLivingBase) entity, false);\\n }\\n\\n ScorePlayerTeam scoreplayerteam = this.bI();\\n ScorePlayerTeam scoreplayerteam1 = entityplayer.bI();\\n\\n return scoreplayerteam != scoreplayerteam1 ? true : (scoreplayerteam != null ? scoreplayerteam.g() : true);\\n }\\n\\n protected void a(EntityLivingBase entitylivingbase, boolean flag0) {\\n if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\\n if (entitylivingbase instanceof EntityWolf) {\\n EntityWolf entitywolf = (EntityWolf) entitylivingbase;\\n\\n if (entitywolf.bP() && this.bu.equals(entitywolf.h_())) {\\n return;\\n }\\n }\\n\\n if (!(entitylivingbase instanceof EntityPlayer) || this.a((EntityPlayer) entitylivingbase)) {\\n if (!(entitylivingbase instanceof EntityHorse) || !((EntityHorse) entitylivingbase).bS()) {\\n List list = this.q.a(EntityWolf.class, AxisAlignedBB.a().a(this.u, this.v, this.w, this.u + 1.0D, this.v + 1.0D, this.w + 1.0D).b(16.0D, 4.0D, 16.0D));\\n Iterator iterator = list.iterator();\\n\\n while (iterator.hasNext()) {\\n EntityWolf entitywolf1 = (EntityWolf) iterator.next();\\n if (entitywolf1.bP() && entitywolf1.bJ() == null && this.bu.equals(entitywolf1.h_()) && (!flag0 || !entitywolf1.bQ())) {\\n entitywolf1.l(false);\\n entitywolf1.b((Entity) entitylivingbase);\\n }\\n }\\n }\\n }\\n }\\n public int aM() {\\n public float bs() {\\n if (!this.ap()) {\\n if (!damagesource.e() && this.bq() && f0 > 0.0F) {\\n f0 = Math.max(f0 - this.bj(), 0.0F);\\n this.m(this.bj() - (f1 - f0));\\n float f2 = this.aJ();\\n this.g(this.aJ() - f0);\\n this.aN().a(damagesource, f2, f0);\\n ItemStack itemstack = this.bt();\\n this.bu();\\n if (itemstack != null && itemstack == this.bt()) {\\n this.bu();\\n public ItemStack bt() {\\n public void bu() {\\n public double V() {\\n if (entity.ao()) {\\n if (this.ag()) {\\n if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ad()) {\\n ItemStack itemstack = this.bt();\\n this.bu();\\n if (entity.R()) {\\n this.a((EntityLivingBase) entity, true);\\n }\\n\\n public boolean S() {\\n return !this.bC && super.S();\\n if (this.bd() || !this.R()) {\\n if (this.ae()) {\\n public boolean bd() {\\n public boolean by() {\\n public ChunkCoordinates bA() {\\n public boolean bB() {\\n protected void ba() {\\n super.ba();\\n if (this.ag()) {\\n public float bc() {\\n if (this.ag()) {\\n public void ak() {\\n super.ak();\\n this.bJ += (float) i0 / (float) this.bC();\\n for (this.bI += i0; this.bJ >= 1.0F; this.bJ /= (float) this.bC()) {\\n this.bJ = (this.bJ - 1.0F) * (float) this.bC();\\n public int bC() {\\n public FoodStats bD() {\\n public boolean bE() {\\n return this.aJ() > 0.0F && this.aJ() < this.aP();\\n if (this.bt() != null) {\\n ItemStack itemstack = this.bt();\\n protected boolean aA() {\\n public String al() {\\n this.g(entityplayer.aJ());\\n this.c(entityplayer.br());\\n this.c(entityplayer.br());\\n public InventoryEnderChest bF() {\\n public ItemStack aV() {\\n public ItemStack[] ac() {\\n public boolean av() {\\n public Scoreboard bH() {\\n public ScorePlayerTeam bI() {\\n return this.bH().i(this.bu);\\n public String aw() {\\n return ScorePlayerTeam.a(this.bI(), this.bu);\\n public float bj() {\\n this.bI -= (float) i / (float) this.bC();\\n for (this.bI -= i; this.bJ < 0.0F; this.bJ = this.bJ / this.bC() + 1.0F) {\\n this.bJ *= this.bC();\\n this.bJ = this.bI / (float) this.bC();\\n this.bJ = (this.bJ - 1.0F) * this.bC();\\n this.bJ /= this.bC();\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityPlayer.java\",\n \"implementation\": \"super.ax();\\n this.aT().b(SharedMonsterAttributes.e).a(1.0D);\\n public boolean bm() {\\n public void bo() {\\n this.bp();\\n public void bp() {\\n public boolean bq() {\\n return this.bm() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\\n this.bp();\\n if (this.bd()) {\\n if (this.ad() && this.bG.a) {\\n public int aa() {\\n this.bp();\\n protected boolean aY() {\\n return this.aJ() <= 0.0F || this.bd();\\n public void T() {\\n if (!this.q.I && this.af()) {\\n super.T();\\n protected void bh() {\\n super.bh();\\n this.aS();\\n if (this.q.r == 0 && this.aJ() < this.aP() && this.q.O().b(\\\"naturalRegeneration\\\") && this.ac % 20 * 12 == 0) {\\n if (this.ag()) {\\n if (!this.F || this.aJ() <= 0.0F) {\\n if (this.F || this.aJ() <= 0.0F) {\\n if (this.aJ() > 0.0F) {\\n public int br() {\\n int i1 = this.br();\\n Collection collection = this.bH().a(ScoreObjectiveCriteria.e);\\n collection.addAll(this.bH().a(ScoreObjectiveCriteria.d));\\n Score score = this.bH().a(this.al(), scoreobjective);\\n nbttagcompound.a(\\\"Score\\\", this.br());\\n if (this.ap()) {\\n if (this.aJ() <= 0.0F) {\\n if (this.bd() && !this.q.I) {\\n if (entity instanceof EntityLivingBase) {\\n this.a((EntityLivingBase) entity, false);\",\n \"signature\": \"void ax()\"\n },\n {\n \"arguments\": [\n \"EntityLivingBase entitylivingbase\",\n \" boolean flag0\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/EntityPlayer.java\",\n \"implementation\": \"if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\\n if (entitylivingbase instanceof EntityWolf) {\\n EntityWolf entitywolf = (EntityWolf) entitylivingbase;\\n\\n if (entitywolf.bP() && this.bu.equals(entitywolf.h_())) {\\n return;\",\n \"signature\": \"void a(EntityLivingBase entitylivingbase, boolean flag0)\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityPlayer.java\",\n \"implementation\": \"public float bs() {\\n if (!this.ap()) {\\n if (!damagesource.e() && this.bq() && f0 > 0.0F) {\\n f0 = Math.max(f0 - this.bj(), 0.0F);\\n this.m(this.bj() - (f1 - f0));\\n float f2 = this.aJ();\\n this.g(this.aJ() - f0);\\n this.aN().a(damagesource, f2, f0);\\n ItemStack itemstack = this.bt();\\n this.bu();\\n if (itemstack != null && itemstack == this.bt()) {\\n this.bu();\\n public ItemStack bt() {\\n public void bu() {\\n public double V() {\\n if (entity.ao()) {\\n if (this.ag()) {\\n if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ad()) {\\n ItemStack itemstack = this.bt();\\n this.bu();\\n if (entity.R()) {\\n this.a((EntityLivingBase) entity, true);\",\n \"signature\": \"int aM()\"\n }\n ],\n \"patch\": \"@@ -82,9 +82,9 @@ public EntityType getEntityType() {\\n };\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n- this.aT().b(SharedMonsterAttributes.e).a(1.0D);\\n+ protected void ay() {\\n+ super.ay();\\n+ this.aW().b(SharedMonsterAttributes.e).a(1.0D);\\n }\\n \\n protected void a() {\\n@@ -94,28 +94,28 @@ protected void a() {\\n this.ah.a(18, Integer.valueOf(0));\\n }\\n \\n- public boolean bm() {\\n+ public boolean bq() {\\n return this.f != null;\\n }\\n \\n- public void bo() {\\n+ public void bs() {\\n if (this.f != null) {\\n this.f.b(this.q, this, this.g);\\n }\\n \\n- this.bp();\\n+ this.bt();\\n }\\n \\n- public void bp() {\\n+ public void bt() {\\n this.f = null;\\n this.g = 0;\\n if (!this.q.I) {\\n this.e(false);\\n }\\n }\\n \\n- public boolean bq() {\\n- return this.bm() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\\n+ public boolean bu() {\\n+ return this.bq() && Item.g[this.f.d].c_(this.f) == EnumAction.d;\\n }\\n \\n public void l_() {\\n@@ -131,15 +131,15 @@ public void l_() {\\n this.n();\\n }\\n } else {\\n- this.bp();\\n+ this.bt();\\n }\\n }\\n \\n if (this.bv > 0) {\\n --this.bv;\\n }\\n \\n- if (this.bd()) {\\n+ if (this.bg()) {\\n ++this.b;\\n if (this.b > 100) {\\n this.b = 100;\\n@@ -165,7 +165,7 @@ public void l_() {\\n this.bp = this.bo;\\n }\\n \\n- if (this.ad() && this.bG.a) {\\n+ if (this.ae() && this.bG.a) {\\n this.A();\\n }\\n \\n@@ -218,7 +218,7 @@ public int y() {\\n return this.bG.a ? 0 : 80;\\n }\\n \\n- public int aa() {\\n+ public int ab() {\\n return 10;\\n }\\n \\n@@ -262,12 +262,12 @@ protected void n() {\\n }\\n }\\n \\n- this.bp();\\n+ this.bt();\\n }\\n }\\n \\n- protected boolean aY() {\\n- return this.aJ() <= 0.0F || this.bd();\\n+ protected boolean bb() {\\n+ return this.aM() <= 0.0F || this.bg();\\n }\\n \\n protected void i() {\\n@@ -290,8 +290,8 @@ public void a(Entity entity) {\\n }\\n }\\n \\n- public void T() {\\n- if (!this.q.I && this.af()) {\\n+ public void U() {\\n+ if (!this.q.I && this.ag()) {\\n this.a((Entity) null);\\n this.b(false);\\n } else {\\n@@ -301,7 +301,7 @@ public void T() {\\n float f0 = this.A;\\n float f1 = this.B;\\n \\n- super.T();\\n+ super.U();\\n this.bs = this.bt;\\n this.bt = 0.0F;\\n this.k(this.u - d0, this.v - d1, this.w - d2);\\n@@ -313,17 +313,17 @@ public void T() {\\n }\\n }\\n \\n- protected void bh() {\\n- super.bh();\\n- this.aS();\\n+ protected void bk() {\\n+ super.bk();\\n+ this.aV();\\n }\\n \\n public void c() {\\n if (this.br > 0) {\\n --this.br;\\n }\\n \\n- if (this.q.r == 0 && this.aJ() < this.aP() && this.q.O().b(\\\"naturalRegeneration\\\") && this.ac % 20 * 12 == 0) {\\n+ if (this.q.r == 0 && this.aM() < this.aS() && this.q.O().b(\\\"naturalRegeneration\\\") && this.ac % 20 * 12 == 0) {\\n this.f(1.0F);\\n }\\n \\n@@ -337,7 +337,7 @@ public void c() {\\n }\\n \\n this.aR = this.bL;\\n- if (this.ag()) {\\n+ if (this.ah()) {\\n this.aR = (float) ((double) this.aR + (double) this.bL * 0.3D);\\n }\\n \\n@@ -349,17 +349,17 @@ public void c() {\\n f0 = 0.1F;\\n }\\n \\n- if (!this.F || this.aJ() <= 0.0F) {\\n+ if (!this.F || this.aM() <= 0.0F) {\\n f0 = 0.0F;\\n }\\n \\n- if (this.F || this.aJ() <= 0.0F) {\\n+ if (this.F || this.aM() <= 0.0F) {\\n f1 = 0.0F;\\n }\\n \\n this.bt += (f0 - this.bt) * 0.4F;\\n this.aK += (f1 - this.aK) * 0.8F;\\n- if (this.aJ() > 0.0F) {\\n+ if (this.aM() > 0.0F) {\\n AxisAlignedBB axisalignedbb = null;\\n \\n if (this.o != null && !this.o.M) {\\n@@ -386,7 +386,7 @@ private void r(Entity entity) {\\n entity.b_(this);\\n }\\n \\n- public int br() {\\n+ public int bv() {\\n return this.ah.c(18);\\n }\\n \\n@@ -395,7 +395,7 @@ public void c(int i0) {\\n }\\n \\n public void p(int i0) {\\n- int i1 = this.br();\\n+ int i1 = this.bv();\\n \\n this.ah.b(18, Integer.valueOf(i1 + i0));\\n }\\n@@ -426,11 +426,11 @@ public void a(DamageSource damagesource) {\\n \\n public void b(Entity entity, int i0) {\\n this.p(i0);\\n- Collection collection = this.bH().a(ScoreObjectiveCriteria.e);\\n+ Collection collection = this.bL().a(ScoreObjectiveCriteria.e);\\n \\n if (entity instanceof EntityPlayer) {\\n this.a(StatList.A, 1);\\n- collection.addAll(this.bH().a(ScoreObjectiveCriteria.d));\\n+ collection.addAll(this.bL().a(ScoreObjectiveCriteria.d));\\n } else {\\n this.a(StatList.z, 1);\\n }\\n@@ -439,7 +439,7 @@ public void b(Entity entity, int i0) {\\n \\n while (iterator.hasNext()) {\\n ScoreObjective scoreobjective = (ScoreObjective) iterator.next();\\n- Score score = this.bH().a(this.al(), scoreobjective);\\n+ Score score = this.bL().a(this.am(), scoreobjective);\\n \\n score.a();\\n }\\n@@ -594,7 +594,7 @@ public void b(NBTTagCompound nbttagcompound) {\\n nbttagcompound.a(\\\"XpP\\\", this.bJ);\\n nbttagcompound.a(\\\"XpLevel\\\", this.bH);\\n nbttagcompound.a(\\\"XpTotal\\\", this.bI);\\n- nbttagcompound.a(\\\"Score\\\", this.br());\\n+ nbttagcompound.a(\\\"Score\\\", this.bv());\\n if (this.c != null) {\\n nbttagcompound.a(\\\"SpawnX\\\", this.c.a);\\n nbttagcompound.a(\\\"SpawnY\\\", this.c.b);\\n@@ -633,16 +633,16 @@ protected void d_() {\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else if (this.bG.a && !damagesource.g()) {\\n return false;\\n } else {\\n this.aV = 0;\\n- if (this.aJ() <= 0.0F) {\\n+ if (this.aM() <= 0.0F) {\\n return false;\\n } else {\\n- if (this.bd() && !this.q.I) {\\n+ if (this.bg() && !this.q.I) {\\n this.a(true, true, false);\\n }\\n \\n@@ -669,10 +669,6 @@ public boolean a(DamageSource damagesource, float f0) {\\n entity = ((EntityArrow) entity).c;\\n }\\n \\n- if (entity instanceof EntityLivingBase) {\\n- this.a((EntityLivingBase) entity, false);\\n- }\\n-\\n this.a(StatList.x, Math.round(f0 * 10.0F));\\n return super.a(damagesource, f0);\\n }\\n@@ -681,49 +677,21 @@ public boolean a(DamageSource damagesource, float f0) {\\n }\\n \\n public boolean a(EntityPlayer entityplayer) {\\n- ScorePlayerTeam scoreplayerteam = this.bI();\\n- ScorePlayerTeam scoreplayerteam1 = entityplayer.bI();\\n-\\n- return scoreplayerteam != scoreplayerteam1 ? true : (scoreplayerteam != null ? scoreplayerteam.g() : true);\\n- }\\n-\\n- protected void a(EntityLivingBase entitylivingbase, boolean flag0) {\\n- if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\\n- if (entitylivingbase instanceof EntityWolf) {\\n- EntityWolf entitywolf = (EntityWolf) entitylivingbase;\\n-\\n- if (entitywolf.bP() && this.bu.equals(entitywolf.h_())) {\\n- return;\\n- }\\n- }\\n-\\n- if (!(entitylivingbase instanceof EntityPlayer) || this.a((EntityPlayer) entitylivingbase)) {\\n- if (!(entitylivingbase instanceof EntityHorse) || !((EntityHorse) entitylivingbase).bS()) {\\n- List list = this.q.a(EntityWolf.class, AxisAlignedBB.a().a(this.u, this.v, this.w, this.u + 1.0D, this.v + 1.0D, this.w + 1.0D).b(16.0D, 4.0D, 16.0D));\\n- Iterator iterator = list.iterator();\\n-\\n- while (iterator.hasNext()) {\\n- EntityWolf entitywolf1 = (EntityWolf) iterator.next();\\n+ Team team = this.bn();\\n+ Team team1 = entityplayer.bn();\\n \\n- if (entitywolf1.bP() && entitywolf1.bJ() == null && this.bu.equals(entitywolf1.h_()) && (!flag0 || !entitywolf1.bQ())) {\\n- entitywolf1.l(false);\\n- entitywolf1.b((Entity) entitylivingbase);\\n- }\\n- }\\n- }\\n- }\\n- }\\n+ return team == null ? true : (!team.a(team1) ? true : team.g());\\n }\\n \\n protected void h(float f0) {\\n this.bn.a(f0);\\n }\\n \\n- public int aM() {\\n+ public int aP() {\\n return this.bn.l();\\n }\\n \\n- public float bs() {\\n+ public float bw() {\\n int i0 = 0;\\n ItemStack[] aitemstack = this.bn.b;\\n int i1 = aitemstack.length;\\n@@ -740,23 +708,23 @@ public float bs() {\\n }\\n \\n protected void d(DamageSource damagesource, float f0) {\\n- if (!this.ap()) {\\n- if (!damagesource.e() && this.bq() && f0 > 0.0F) {\\n+ if (!this.aq()) {\\n+ if (!damagesource.e() && this.bu() && f0 > 0.0F) {\\n f0 = (1.0F + f0) * 0.5F;\\n }\\n \\n f0 = this.b(damagesource, f0);\\n f0 = this.c(damagesource, f0);\\n float f1 = f0;\\n \\n- f0 = Math.max(f0 - this.bj(), 0.0F);\\n- this.m(this.bj() - (f1 - f0));\\n+ f0 = Math.max(f0 - this.bm(), 0.0F);\\n+ this.m(this.bm() - (f1 - f0));\\n if (f0 != 0.0F) {\\n this.a(damagesource.f());\\n- float f2 = this.aJ();\\n+ float f2 = this.aM();\\n \\n- this.g(this.aJ() - f0);\\n- this.aN().a(damagesource, f2, f0);\\n+ this.g(this.aM() - f0);\\n+ this.aQ().a(damagesource, f2, f0);\\n }\\n }\\n }\\n@@ -776,7 +744,7 @@ public void a(IMerchant imerchant, String s0) {}\\n public void c(ItemStack itemstack) {}\\n \\n public boolean p(Entity entity) {\\n- ItemStack itemstack = this.bt();\\n+ ItemStack itemstack = this.bx();\\n ItemStack itemstack1 = itemstack != null ? itemstack.m() : null;\\n if (entity.c(this)) {\\n return true;\\n@@ -794,15 +762,15 @@ public boolean p(Entity entity) {\\n \\n if (itemstack.a(this, (EntityLivingBase) entity)) {\\n if (itemstack.b <= 0 && !this.bG.d) {\\n- this.bu();\\n+ this.by();\\n }\\n \\n return true;\\n }\\n }\\n- if (itemstack != null && itemstack == this.bt()) {\\n+ if (itemstack != null && itemstack == this.bx()) {\\n if (itemstack.b <= 0 && !this.bG.d) {\\n- this.bu();\\n+ this.by();\\n } else if (itemstack.b < itemstack1.b && this.bG.d) {\\n itemstack.b = itemstack1.b;\\n }\\n@@ -812,20 +780,20 @@ public boolean p(Entity entity) {\\n }\\n }\\n \\n- public ItemStack bt() {\\n+ public ItemStack bx() {\\n return this.bn.h();\\n }\\n \\n- public void bu() {\\n+ public void by() {\\n this.bn.a(this.bn.c, (ItemStack) null);\\n }\\n \\n- public double V() {\\n+ public double W() {\\n return (double) (this.N - 0.5F);\\n }\\n \\n public void q(Entity entity) {\\n- if (entity.ao()) {\\n+ if (entity.ap()) {\\n if (!entity.i(this)) {\\n float f0 = (float) this.a(SharedMonsterAttributes.e).e();\\n int i0 = 0;\\n@@ -836,7 +804,7 @@ public void q(Entity entity) {\\n i0 += EnchantmentHelper.b(this, (EntityLivingBase) entity);\\n }\\n \\n- if (this.ag()) {\\n+ if (this.ah()) {\\n ++i0;\\n }\\n \\n@@ -851,7 +819,7 @@ public void q(Entity entity) {\\n boolean flag1 = false;\\n int i1 = EnchantmentHelper.a((EntityLivingBase) this);\\n \\n- if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ad()) {\\n+ if (entity instanceof EntityLivingBase && i1 > 0 && !entity.ae()) {\\n flag1 = true;\\n entity.d(1);\\n }\\n@@ -884,7 +852,7 @@ public void q(Entity entity) {\\n }\\n }\\n \\n- ItemStack itemstack = this.bt();\\n+ ItemStack itemstack = this.bx();\\n Object object = entity;\\n \\n if (entity instanceof EntityDragonPart) {\\n@@ -898,15 +866,11 @@ public void q(Entity entity) {\\n if (itemstack != null && object instanceof EntityLivingBase) {\\n itemstack.a((EntityLivingBase) object, this);\\n if (itemstack.b <= 0) {\\n- this.bu();\\n+ this.by();\\n }\\n }\\n \\n if (entity instanceof EntityLivingBase) {\\n- if (entity.R()) {\\n- this.a((EntityLivingBase) entity, true);\\n- }\\n-\\n this.a(StatList.w, Math.round(f0 * 10.0F));\\n if (i1 > 0 && flag2) {\\n entity.d(i1 * 4);\\n@@ -933,13 +897,13 @@ public void w() {\\n }\\n }\\n \\n- public boolean S() {\\n- return !this.bC && super.S();\\n+ public boolean T() {\\n+ return !this.bC && super.T();\\n }\\n \\n public EnumStatus a(int i0, int i1, int i2) {\\n if (!this.q.I) {\\n- if (this.bd() || !this.R()) {\\n+ if (this.bg() || !this.S()) {\\n return EnumStatus.e;\\n }\\n \\n@@ -964,7 +928,7 @@ public EnumStatus a(int i0, int i1, int i2) {\\n }\\n }\\n \\n- if (this.ae()) {\\n+ if (this.af()) {\\n this.a((Entity) null);\\n }\\n \\n@@ -1088,11 +1052,11 @@ public static ChunkCoordinates a(World world, ChunkCoordinates chunkcoordinates,\\n }\\n }\\n \\n- public boolean bd() {\\n+ public boolean bg() {\\n return this.bC;\\n }\\n \\n- public boolean by() {\\n+ public boolean bC() {\\n return this.bC && this.b >= 100;\\n }\\n \\n@@ -1108,11 +1072,11 @@ protected void b(int i0, boolean flag0) {\\n \\n public void a(String s0) {}\\n \\n- public ChunkCoordinates bA() {\\n+ public ChunkCoordinates bE() {\\n return this.c;\\n }\\n \\n- public boolean bB() {\\n+ public boolean bF() {\\n return this.d;\\n }\\n \\n@@ -1132,10 +1096,10 @@ public void a(StatBase statbase) {\\n \\n public void a(StatBase statbase, int i0) {}\\n \\n- protected void ba() {\\n- super.ba();\\n+ protected void bd() {\\n+ super.bd();\\n this.a(StatList.u, 1);\\n- if (this.ag()) {\\n+ if (this.ah()) {\\n this.a(0.8F);\\n } else {\\n this.a(0.2F);\\n@@ -1162,7 +1126,7 @@ public void e(float f0, float f1) {\\n this.j(this.u - d0, this.v - d1, this.w - d2);\\n }\\n \\n- public float bc() {\\n+ public float bf() {\\n return (float) this.a(SharedMonsterAttributes.d).e();\\n }\\n \\n@@ -1190,7 +1154,7 @@ public void j(double d0, double d1, double d2) {\\n i0 = Math.round(MathHelper.a(d0 * d0 + d2 * d2) * 100.0F);\\n if (i0 > 0) {\\n this.a(StatList.l, i0);\\n- if (this.ag()) {\\n+ if (this.ah()) {\\n this.a(0.099999994F * (float) i0 * 0.01F);\\n } else {\\n this.a(0.01F * (float) i0 * 0.01F);\\n@@ -1242,9 +1206,9 @@ public void a(EntityLivingBase entitylivingbase) {\\n }\\n }\\n \\n- public void ak() {\\n+ public void al() {\\n if (!this.bG.b) {\\n- super.ak();\\n+ super.al();\\n }\\n }\\n \\n@@ -1260,10 +1224,10 @@ public void s(int i0) {\\n i0 = i1;\\n }\\n \\n- this.bJ += (float) i0 / (float) this.bC();\\n+ this.bJ += (float) i0 / (float) this.bG();\\n \\n- for (this.bI += i0; this.bJ >= 1.0F; this.bJ /= (float) this.bC()) {\\n- this.bJ = (this.bJ - 1.0F) * (float) this.bC();\\n+ for (this.bI += i0; this.bJ >= 1.0F; this.bJ /= (float) this.bG()) {\\n+ this.bJ = (this.bJ - 1.0F) * (float) this.bG();\\n this.a(1);\\n }\\n }\\n@@ -1287,7 +1251,7 @@ public void a(int i0) {\\n }\\n }\\n \\n- public int bC() {\\n+ public int bG() {\\n return this.bH >= 30 ? 62 + (this.bH - 30) * 7 : (this.bH >= 15 ? 17 + (this.bH - 15) * 3 : 17);\\n }\\n \\n@@ -1299,16 +1263,16 @@ public void a(float f0) {\\n }\\n }\\n \\n- public FoodStats bD() {\\n+ public FoodStats bH() {\\n return this.bq;\\n }\\n \\n public boolean g(boolean flag0) {\\n return (flag0 || this.bq.c()) && !this.bG.a;\\n }\\n \\n- public boolean bE() {\\n- return this.aJ() > 0.0F && this.aJ() < this.aP();\\n+ public boolean bI() {\\n+ return this.aM() > 0.0F && this.aM() < this.aS();\\n }\\n \\n public void a(ItemStack itemstack, int i0) {\\n@@ -1334,8 +1298,8 @@ public boolean d(int i0, int i1, int i2) {\\n return true;\\n }\\n \\n- if (this.bt() != null) {\\n- ItemStack itemstack = this.bt();\\n+ if (this.bx() != null) {\\n+ ItemStack itemstack = this.bx();\\n \\n if (itemstack.b(block) || itemstack.a(block) > 1.0F) {\\n return true;\\n@@ -1361,30 +1325,30 @@ protected int e(EntityPlayer entityplayer) {\\n }\\n }\\n \\n- protected boolean aA() {\\n+ protected boolean aB() {\\n return true;\\n }\\n \\n- public String al() {\\n+ public String am() {\\n return this.bu;\\n }\\n \\n public void a(EntityPlayer entityplayer, boolean flag0) {\\n if (flag0) {\\n this.bn.b(entityplayer.bn);\\n- this.g(entityplayer.aJ());\\n+ this.g(entityplayer.aM());\\n this.bq = entityplayer.bq;\\n this.bH = entityplayer.bH;\\n this.bI = entityplayer.bI;\\n this.bJ = entityplayer.bJ;\\n- this.c(entityplayer.br());\\n+ this.c(entityplayer.bv());\\n this.as = entityplayer.as;\\n } else if (this.q.O().b(\\\"keepInventory\\\")) {\\n this.bn.b(entityplayer.bn);\\n this.bH = entityplayer.bH;\\n this.bI = entityplayer.bI;\\n this.bJ = entityplayer.bJ;\\n- this.c(entityplayer.br());\\n+ this.c(entityplayer.bv());\\n }\\n \\n this.a = entityplayer.a;\\n@@ -1406,40 +1370,40 @@ public World f_() {\\n return this.q;\\n }\\n \\n- public InventoryEnderChest bF() {\\n+ public InventoryEnderChest bJ() {\\n return this.a;\\n }\\n \\n public ItemStack n(int i0) {\\n return i0 == 0 ? this.bn.h() : this.bn.b[i0 - 1];\\n }\\n \\n- public ItemStack aV() {\\n+ public ItemStack aY() {\\n return this.bn.h();\\n }\\n \\n public void c(int i0, ItemStack itemstack) {\\n this.bn.b[i0] = itemstack;\\n }\\n \\n- public ItemStack[] ac() {\\n+ public ItemStack[] ad() {\\n return this.bn.b;\\n }\\n \\n- public boolean av() {\\n+ public boolean aw() {\\n return !this.bG.b;\\n }\\n \\n- public Scoreboard bH() {\\n+ public Scoreboard bL() {\\n return this.q.X();\\n }\\n \\n- public ScorePlayerTeam bI() {\\n- return this.bH().i(this.bu);\\n+ public Team bn() {\\n+ return this.bL().i(this.bu);\\n }\\n \\n- public String aw() {\\n- return ScorePlayerTeam.a(this.bI(), this.bu);\\n+ public String ax() {\\n+ return ScorePlayerTeam.a(this.bn(), this.bu);\\n }\\n \\n public void m(float f0) {\\n@@ -1450,7 +1414,7 @@ public void m(float f0) {\\n this.u().b(17, Float.valueOf(f0));\\n }\\n \\n- public float bj() {\\n+ public float bm() {\\n return this.u().d(17);\\n }\\n \\n@@ -1466,11 +1430,11 @@ public void removeXP(int i) {\\n i = this.bI;\\n }\\n \\n- this.bI -= (float) i / (float) this.bC();\\n+ this.bI -= (float) i / (float) this.bG();\\n \\n // Inverse of for loop in this.t(int)\\n- for (this.bI -= i; this.bJ < 0.0F; this.bJ = this.bJ / this.bC() + 1.0F) {\\n- this.bJ *= this.bC();\\n+ for (this.bI -= i; this.bJ < 0.0F; this.bJ = this.bJ / this.bG() + 1.0F) {\\n+ this.bJ *= this.bG();\\n this.a(-1);\\n }\\n updateXP();\\n@@ -1486,13 +1450,13 @@ public void setXP(int i) {\\n }\\n \\n public void recalculateXP() {\\n- this.bJ = this.bI / (float) this.bC();\\n+ this.bJ = this.bI / (float) this.bG();\\n this.bH = 0;\\n \\n while (this.bJ >= 1.0F) {\\n- this.bJ = (this.bJ - 1.0F) * this.bC();\\n+ this.bJ = (this.bJ - 1.0F) * this.bG();\\n this.bI++;\\n- this.bJ /= this.bC();\\n+ this.bJ /= this.bG();\\n }\\n \\n if (this instanceof EntityPlayerMP) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayer.java\",\n \"sha\": \"73797046af6371d67c7828ae34ee6724afb48a19\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 43,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayerMP.java\",\n \"changes\": 79,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayerMP.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 36,\n \"filename\": \"src/main/java/net/minecraft/server/EntityPlayerMP.java\",\n \"new_code\": \" if (itemstack != null && Item.g[itemstack.d].f() && this.a.f() <= 5) {\\n if (this.aM() != this.bP && bP != -99999999 && this.getPlayer() != null) {\\n super.b(this.aY());\\n HealthChangeHook hook = (HealthChangeHook) new HealthChangeHook(getPlayer(), bP, this.aM()).call();\\n if (this.aM() != this.bP || this.bQ != this.bq.a() || this.bq.e() == 0.0F != this.bR) {\\n int health = (int) (this.aM() / (this.bm() / 20));\\n health = (this.aM() > 0 && health == 0) ? 1 : health;\\n this.bP = this.aM();\\n if (this.aM() + this.bm() != this.bO) {\\n this.bO = this.aM() + this.bm();\\n Collection collection = this.bL().a(ScoreObjectiveCriteria.f);\\n this.bL().a(this.am(), scoreobjective).a(Arrays.asList(new EntityPlayer[]{ this }));\\n } else {\\n PlayerDeathHook hook = (PlayerDeathHook) new PlayerDeathHook(getPlayer(), damagesource.getCanaryDamageSource(), this.aQ().b().toString()).call();\\n Score score = this.bL().a(this.am(), scoreobjective);\\n EntityLivingBase entitylivingbase = this.aR();\\n if (this.aq()) {\\n if (this.bg()) {\\n public void a(TileEntity tileentity) {\\n if (tileentity instanceof TileEntitySign) {\\n ((TileEntitySign) tileentity).a((EntityPlayer) this);\\n this.a.b(new Packet133TileEditorOpen(0, tileentity.l, tileentity.m, tileentity.n));\\n }\\n }\\n\\n private void bM() {\\n this.bM();\\n this.bM();\\n this.bM();\\n this.bM();\\n this.bM();\\n this.bM();\\n this.bM();\\n this.bM();\\n this.bM();\\n this.bM();\\n this.bM();\\n this.bM();\\n protected void a(PotionEffect potioneffect, boolean flag0) {\\n super.a(potioneffect, flag0);\\n protected void b(PotionEffect potioneffect) {\\n super.b(potioneffect);\\n // return \\\"seed\\\".equals(s0) && !this.b.V() ? true : (!\\\"tell\\\".equals(s0) && !\\\"help\\\".equals(s0) && !\\\"me\\\".equals(s0) ? this.b.af().e(this.bu) ? this.b.k() >= i0 : false) : true);\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"TileEntity tileentity\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/EntityPlayerMP.java\",\n \"implementation\": \"if (tileentity instanceof TileEntitySign) {\\n ((TileEntitySign) tileentity).a((EntityPlayer) this);\\n this.a.b(new Packet133TileEditorOpen(0, tileentity.l, tileentity.m, tileentity.n));\",\n \"signature\": \"void a(TileEntity tileentity)\"\n }\n ],\n \"old_code\": \" if (itemstack != null && Item.g[itemstack.d].f() && this.a.e() <= 5) {\\n if (this.aJ() != this.bP && bP != -99999999 && this.getPlayer() != null) {\\n super.b(this.aW());\\n HealthChangeHook hook = (HealthChangeHook) new HealthChangeHook(getPlayer(), bP, this.aJ()).call();\\n if (this.aJ() != this.bP || this.bQ != this.bq.a() || this.bq.e() == 0.0F != this.bR) {\\n int health = (int) (this.aJ() / (this.aW() / 20));\\n health = (this.aX() > 0 && health == 0) ? 1 : health;\\n this.bP = this.aJ();\\n if (this.aJ() + this.bj() != this.bO) {\\n this.bO = this.aJ() + this.bj();\\n Collection collection = this.bH().a(ScoreObjectiveCriteria.f);\\n this.bH().a(this.al(), scoreobjective).a(Arrays.asList(new EntityPlayer[]{ this }));\\n } else if (getPlayer() != null) { // NPC?\\n PlayerDeathHook hook = (PlayerDeathHook) new PlayerDeathHook(getPlayer(), damagesource.getCanaryDamageSource(), this.aN().b().toString()).call();\\n Score score = this.bH().a(this.al(), scoreobjective);\\n EntityLivingBase entitylivingbase = this.aO();\\n if (this.ap()) {\\n if (this.bd()) {\\n private void bJ() {\\n this.bJ();\\n this.bJ();\\n this.bJ();\\n this.bJ();\\n this.bJ();\\n this.bJ();\\n this.bJ();\\n this.bJ();\\n this.bJ();\\n this.bJ();\\n this.bJ();\\n this.bJ();\\n protected void b(PotionEffect potioneffect) {\\n super.b(potioneffect);\\n protected void c(PotionEffect potioneffect) {\\n super.c(potioneffect);\\n // return \\\"seed\\\".equals(s0) && !this.b.T() ? true : (!\\\"tell\\\".equals(s0) && !\\\"help\\\".equals(s0) && !\\\"me\\\".equals(s0) ? this.b.ad().e(this.bS) : true);\",\n \"old_methods\": [],\n \"patch\": \"@@ -192,7 +192,7 @@ public void h() {\\n for (int i0 = 0; i0 < this.bn.j_(); ++i0) {\\n ItemStack itemstack = this.bn.a(i0);\\n \\n- if (itemstack != null && Item.g[itemstack.d].f() && this.a.e() <= 5) {\\n+ if (itemstack != null && Item.g[itemstack.d].f() && this.a.f() <= 5) {\\n Packet packet = ((ItemMapBase) Item.g[itemstack.d]).c(itemstack, this.q, this);\\n \\n if (packet != null) {\\n@@ -202,47 +202,47 @@ public void h() {\\n }\\n \\n // CanaryMod: HealthChange / HealthEnabled\\n- if (this.aJ() != this.bP && bP != -99999999 && this.getPlayer() != null) {\\n+ if (this.aM() != this.bP && bP != -99999999 && this.getPlayer() != null) {\\n // updates your health when it is changed.\\n if (!Configuration.getWorldConfig(getCanaryWorld().getFqName()).isHealthEnabled()) {\\n- super.b(this.aW());\\n+ super.b(this.aY());\\n this.M = false;\\n } else {\\n- HealthChangeHook hook = (HealthChangeHook) new HealthChangeHook(getPlayer(), bP, this.aJ()).call();\\n+ HealthChangeHook hook = (HealthChangeHook) new HealthChangeHook(getPlayer(), bP, this.aM()).call();\\n if (hook.isCanceled()) {\\n super.b(this.bP);\\n }\\n }\\n }\\n //\\n \\n- if (this.aJ() != this.bP || this.bQ != this.bq.a() || this.bq.e() == 0.0F != this.bR) {\\n+ if (this.aM() != this.bP || this.bQ != this.bq.a() || this.bq.e() == 0.0F != this.bR) {\\n // CanaryMod: convert health for values above 20\\n- int health = (int) (this.aJ() / (this.aW() / 20));\\n+ int health = (int) (this.aM() / (this.bm() / 20));\\n \\n- health = (this.aX() > 0 && health == 0) ? 1 : health;\\n+ health = (this.aM() > 0 && health == 0) ? 1 : health;\\n this.a.b(new Packet8UpdateHealth(health, this.bq.a(), this.bq.e()));\\n //\\n- this.bP = this.aJ();\\n+ this.bP = this.aM();\\n this.bQ = this.bq.a();\\n this.bR = this.bq.e() == 0.0F;\\n }\\n \\n- if (this.aJ() + this.bj() != this.bO) {\\n- this.bO = this.aJ() + this.bj();\\n- Collection collection = this.bH().a(ScoreObjectiveCriteria.f);\\n+ if (this.aM() + this.bm() != this.bO) {\\n+ this.bO = this.aM() + this.bm();\\n+ Collection collection = this.bL().a(ScoreObjectiveCriteria.f);\\n Iterator iterator = collection.iterator();\\n \\n while (iterator.hasNext()) {\\n ScoreObjective scoreobjective = (ScoreObjective) iterator.next();\\n \\n- this.bH().a(this.al(), scoreobjective).a(Arrays.asList(new EntityPlayer[]{ this }));\\n+ this.bL().a(this.am(), scoreobjective).a(Arrays.asList(new EntityPlayer[]{ this }));\\n }\\n // CanaryMod: ExperienceHook / ExperienceEnabled\\n if (!Configuration.getWorldConfig(getCanaryWorld().getFqName()).isExperienceEnabled()) {\\n this.bI = 0;\\n this.bH = 0;\\n- } else if (getPlayer() != null) { // NPC?\\n+ } else {\\n ExperienceHook hook = new ExperienceHook(getPlayer(), this.bS, this.bI);\\n \\n if (!hook.isCanceled()) {\\n@@ -263,7 +263,7 @@ public void h() {\\n \\n public void a(DamageSource damagesource) {\\n // CanaryMod: PlayerDeathHook\\n- PlayerDeathHook hook = (PlayerDeathHook) new PlayerDeathHook(getPlayer(), damagesource.getCanaryDamageSource(), this.aN().b().toString()).call();\\n+ PlayerDeathHook hook = (PlayerDeathHook) new PlayerDeathHook(getPlayer(), damagesource.getCanaryDamageSource(), this.aQ().b().toString()).call();\\n // Check Death Message enabled\\n if (Configuration.getServerConfig().isDeathMessageEnabled()) {\\n this.b.af().a(ChatMessageComponent.e(hook.getDeathMessage()));\\n@@ -278,12 +278,12 @@ public void a(DamageSource damagesource) {\\n \\n while (iterator.hasNext()) {\\n ScoreObjective scoreobjective = (ScoreObjective) iterator.next();\\n- Score score = this.bH().a(this.al(), scoreobjective);\\n+ Score score = this.bL().a(this.am(), scoreobjective);\\n \\n score.a();\\n }\\n \\n- EntityLivingBase entitylivingbase = this.aO();\\n+ EntityLivingBase entitylivingbase = this.aR();\\n \\n if (entitylivingbase != null) {\\n entitylivingbase.b(this, this.bb);\\n@@ -293,7 +293,7 @@ public void a(DamageSource damagesource) {\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n // CanaryMod moved pvp to per-world config\\n@@ -403,7 +403,7 @@ public EnumStatus a(int i0, int i1, int i2) {\\n }\\n \\n public void a(boolean flag0, boolean flag1, boolean flag2) {\\n- if (this.bd()) {\\n+ if (this.bg()) {\\n this.p().q().b(this, new Packet18Animation(this, 3));\\n }\\n \\n@@ -425,7 +425,14 @@ public void b(double d0, boolean flag0) {\\n super.a(d0, flag0);\\n }\\n \\n- private void bJ() {\\n+ public void a(TileEntity tileentity) {\\n+ if (tileentity instanceof TileEntitySign) {\\n+ ((TileEntitySign) tileentity).a((EntityPlayer) this);\\n+ this.a.b(new Packet133TileEditorOpen(0, tileentity.l, tileentity.m, tileentity.n));\\n+ }\\n+ }\\n+\\n+ private void bM() {\\n this.bX = this.bX % 100 + 1;\\n }\\n \\n@@ -438,7 +445,7 @@ public void b(int i0, int i1, int i2) {\\n return;\\n }\\n //\\n- this.bJ();\\n+ this.bM();\\n this.a.b(new Packet100OpenWindow(this.bX, 1, bench.getInventoryName(), 9, true));\\n this.bp = container;\\n this.bp.d = this.bX;\\n@@ -454,7 +461,7 @@ public void a(int i0, int i1, int i2, String s0) {\\n return;\\n }\\n //\\n- this.bJ();\\n+ this.bM();\\n this.a.b(new Packet100OpenWindow(this.bX, 4, s0 == null ? \\\"\\\" : s0, 9, s0 != null));\\n this.bp = new ContainerEnchantment(this.bn, this.q, i0, i1, i2);\\n this.bp.d = this.bX;\\n@@ -470,7 +477,7 @@ public void c(int i0, int i1, int i2) {\\n return;\\n }\\n //\\n- this.bJ();\\n+ this.bM();\\n this.a.b(new Packet100OpenWindow(this.bX, 8, \\\"Repairing\\\", 9, true));\\n this.bp = container;\\n this.bp.d = this.bX;\\n@@ -506,7 +513,7 @@ public void a(IInventory iinventory) {\\n }\\n }\\n //\\n- this.bJ();\\n+ this.bM();\\n this.a.b(new Packet100OpenWindow(this.bX, 0, iinventory.b(), iinventory.j_(), iinventory.c()));\\n this.bp = container;\\n this.bp.d = this.bX;\\n@@ -520,7 +527,7 @@ public void a(TileEntityHopper tileentityhopper) {\\n return;\\n }\\n //\\n- this.bJ();\\n+ this.bM();\\n this.a.b(new Packet100OpenWindow(this.bX, 9, tileentityhopper.b(), tileentityhopper.j_(), tileentityhopper.c()));\\n this.bp = new ContainerHopper(this.bn, tileentityhopper);\\n this.bp.d = this.bX;\\n@@ -534,7 +541,7 @@ public void a(EntityMinecartHopper entityminecarthopper) {\\n return;\\n }\\n //\\n- this.bJ();\\n+ this.bM();\\n this.a.b(new Packet100OpenWindow(this.bX, 9, entityminecarthopper.b(), entityminecarthopper.j_(), entityminecarthopper.c()));\\n this.bp = new ContainerHopper(this.bn, entityminecarthopper);\\n this.bp.d = this.bX;\\n@@ -548,7 +555,7 @@ public void a(TileEntityFurnace tileentityfurnace) {\\n return;\\n }\\n //\\n- this.bJ();\\n+ this.bM();\\n this.a.b(new Packet100OpenWindow(this.bX, 2, tileentityfurnace.b(), tileentityfurnace.j_(), tileentityfurnace.c()));\\n this.bp = new ContainerFurnace(this.bn, tileentityfurnace);\\n this.bp.d = this.bX;\\n@@ -562,7 +569,7 @@ public void a(TileEntityDispenser tileentitydispenser) {\\n return;\\n }\\n //\\n- this.bJ();\\n+ this.bM();\\n this.a.b(new Packet100OpenWindow(this.bX, tileentitydispenser instanceof TileEntityDropper ? 10 : 3, tileentitydispenser.b(), tileentitydispenser.j_(), tileentitydispenser.c()));\\n this.bp = new ContainerDispenser(this.bn, tileentitydispenser);\\n this.bp.d = this.bX;\\n@@ -576,7 +583,7 @@ public void a(TileEntityBrewingStand tileentitybrewingstand) {\\n return;\\n }\\n //\\n- this.bJ();\\n+ this.bM();\\n this.a.b(new Packet100OpenWindow(this.bX, 5, tileentitybrewingstand.b(), tileentitybrewingstand.j_(), tileentitybrewingstand.c()));\\n this.bp = new ContainerBrewingStand(this.bn, tileentitybrewingstand);\\n this.bp.d = this.bX;\\n@@ -590,15 +597,15 @@ public void a(TileEntityBeacon tileentitybeacon) {\\n return;\\n }\\n //\\n- this.bJ();\\n+ this.bM();\\n this.a.b(new Packet100OpenWindow(this.bX, 7, tileentitybeacon.b(), tileentitybeacon.j_(), tileentitybeacon.c()));\\n this.bp = new ContainerBeacon(this.bn, tileentitybeacon);\\n this.bp.d = this.bX;\\n this.bp.a((ICrafting) this);\\n }\\n \\n public void a(IMerchant imerchant, String s0) {\\n- this.bJ();\\n+ this.bM();\\n this.bp = new ContainerMerchant(this.bn, imerchant, this.q);\\n this.bp.d = this.bX;\\n this.bp.a((ICrafting) this);\\n@@ -635,7 +642,7 @@ public void a(EntityHorse entityhorse, IInventory iinventory) {\\n ContainerHorseInventory chi = new ContainerHorseInventory(this.bn, iinventory, entityhorse);\\n chi.setInventory(inv);\\n //\\n- this.bJ();\\n+ this.bM();\\n this.a.b(new Packet100OpenWindow(this.bX, 11, iinventory.b(), iinventory.j_(), iinventory.c(), entityhorse.k));\\n this.bp = chi;\\n this.bp.d = this.bX;\\n@@ -756,13 +763,13 @@ protected void a(PotionEffect potioneffect) {\\n this.a.b(new Packet41EntityEffect(this.k, potioneffect));\\n }\\n \\n- protected void b(PotionEffect potioneffect) {\\n- super.b(potioneffect);\\n+ protected void a(PotionEffect potioneffect, boolean flag0) {\\n+ super.a(potioneffect, flag0);\\n this.a.b(new Packet41EntityEffect(this.k, potioneffect));\\n }\\n \\n- protected void c(PotionEffect potioneffect) {\\n- super.c(potioneffect);\\n+ protected void b(PotionEffect potioneffect) {\\n+ super.b(potioneffect);\\n this.a.b(new Packet42RemoveEntityEffect(this.k, potioneffect));\\n }\\n \\n@@ -799,7 +806,7 @@ public void a(ChatMessageComponent chatmessagecomponent) {\\n \\n public boolean a(int i0, String s0) {\\n // CanaryMod: replace permission checking with ours\\n- // return \\\"seed\\\".equals(s0) && !this.b.T() ? true : (!\\\"tell\\\".equals(s0) && !\\\"help\\\".equals(s0) && !\\\"me\\\".equals(s0) ? this.b.ad().e(this.bS) : true);\\n+ // return \\\"seed\\\".equals(s0) && !this.b.V() ? true : (!\\\"tell\\\".equals(s0) && !\\\"help\\\".equals(s0) && !\\\"me\\\".equals(s0) ? this.b.af().e(this.bu) ? this.b.k() >= i0 : false) : true);\\n if (s0.trim().isEmpty()) { // Purely checking for permission level\\n return getPlayer().hasPermission(\\\"canary.world.commandblock\\\");\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPlayerMP.java\",\n \"sha\": \"76c1b5d0fcdf5cb0bbe881864d4fd1b20dd4eafe\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPotion.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPotion.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 4,\n \"filename\": \"src/main/java/net/minecraft/server/EntityPotion.java\",\n \"new_code\": \" // protected float e() {\\n entitylivingbase.c(new PotionEffect(i0, i1, potioneffect.c()));\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n // protected float g() {\\n entitylivingbase.d(new PotionEffect(i0, i1, potioneffect.c()));\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,11 +1,9 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.Iterator;\\n import java.util.List;\\n import net.canarymod.api.entity.throwable.CanaryEntityPotion;\\n \\n-\\n public class EntityPotion extends EntityThrowable {\\n \\n private ItemStack c;\\n@@ -41,7 +39,7 @@ public EntityPotion(World world, double d0, double d1, double d2, ItemStack item\\n }\\n \\n // CanaryMod: remove unneeded method override\\n- // protected float g() {\\n+ // protected float e() {\\n // return 0.05F;\\n // }\\n //\\n@@ -104,7 +102,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\\n int i1 = (int) (d1 * (double) potioneffect.b() + 0.5D);\\n \\n if (i1 > 20) {\\n- entitylivingbase.d(new PotionEffect(i0, i1, potioneffect.c()));\\n+ entitylivingbase.c(new PotionEffect(i0, i1, potioneffect.c()));\\n }\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityPotion.java\",\n \"sha\": \"38fb67ef9948279f003df5374a3c58810f4c2599\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 22,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySheep.java\",\n \"changes\": 45,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySheep.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 23,\n \"filename\": \"src/main/java/net/minecraft/server/EntitySheep.java\",\n \"new_code\": \" public static final float[][] bp = new float[][]{ { 1.0F, 1.0F, 1.0F }, { 0.85F, 0.5F, 0.2F }, { 0.7F, 0.3F, 0.85F }, { 0.4F, 0.6F, 0.85F }, { 0.9F, 0.9F, 0.2F }, { 0.5F, 0.8F, 0.1F }, { 0.95F, 0.5F, 0.65F }, { 0.3F, 0.3F, 0.3F }, { 0.6F, 0.6F, 0.6F }, { 0.3F, 0.5F, 0.6F }, { 0.5F, 0.25F, 0.7F }, { 0.2F, 0.3F, 0.7F }, { 0.4F, 0.3F, 0.2F },\\n { 0.4F, 0.5F, 0.2F }, { 0.6F, 0.2F, 0.2F }, { 0.1F, 0.1F, 0.1F } };\\n protected boolean be() {\\n protected void bh() {\\n super.bh();\\n protected void ay() {\\n super.ay();\\n if (!this.bU()) {\\n this.a(new ItemStack(Block.ag.cF, 1, this.bT()), 0.0F);\\n if (itemstack != null && itemstack.d == Item.bg.cv && !this.bU() && !this.g_()) {\\n this.i(true);\\n EntityItem entityitem = this.a(new ItemStack(Block.ag.cF, 1, this.bT()), 1.0F);\\n nbttagcompound.a(\\\"Sheared\\\", this.bU());\\n nbttagcompound.a(\\\"Color\\\", (byte) this.bT());\\n this.i(nbttagcompound.n(\\\"Sheared\\\"));\\n protected String aN() {\\n protected String aO() {\\n public int bT() {\\n public boolean bU() {\\n public void i(boolean flag0) {\\n this.i(false);\\n return 15 - ((EntitySheep) entityanimal).bT();\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n public static final float[][] bp = new float[][]{ { 1.0F, 1.0F, 1.0F }, { 0.85F, 0.5F, 0.2F }, { 0.7F, 0.3F, 0.85F }, { 0.4F, 0.6F, 0.85F }, { 0.9F, 0.9F, 0.2F }, { 0.5F, 0.8F, 0.1F }, { 0.95F, 0.5F, 0.65F }, { 0.3F, 0.3F, 0.3F }, { 0.6F, 0.6F, 0.6F }, { 0.3F, 0.5F, 0.6F }, { 0.5F, 0.25F, 0.7F }, { 0.2F, 0.3F, 0.7F }, { 0.4F, 0.3F, 0.2F }, { 0.4F, 0.5F, 0.2F }, { 0.6F, 0.2F, 0.2F }, { 0.1F, 0.1F, 0.1F } };\\n protected boolean bb() {\\n protected void be() {\\n super.be();\\n protected void ax() {\\n super.ax();\\n if (!this.bQ()) {\\n this.a(new ItemStack(Block.ag.cF, 1, this.bP()), 0.0F);\\n if (itemstack != null && itemstack.d == Item.bg.cv && !this.bQ() && !this.g_()) {\\n this.j(true);\\n EntityItem entityitem = this.a(new ItemStack(Block.ag.cF, 1, this.bP()), 1.0F);\\n nbttagcompound.a(\\\"Sheared\\\", this.bQ());\\n nbttagcompound.a(\\\"Color\\\", (byte) this.bP());\\n this.j(nbttagcompound.n(\\\"Sheared\\\"));\\n protected String aK() {\\n protected String aL() {\\n public int bP() {\\n public boolean bQ() {\\n public void j(boolean flag0) {\\n this.j(false);\\n return 15 - ((EntitySheep) entityanimal).bP();\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,14 +1,13 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.Random;\\n import net.canarymod.api.entity.living.animal.CanarySheep;\\n \\n-\\n public class EntitySheep extends EntityAnimal {\\n \\n private final InventoryCrafting bq = new InventoryCrafting(new ContainerSheep(this), 2, 1);\\n- public static final float[][] bp = new float[][]{ { 1.0F, 1.0F, 1.0F }, { 0.85F, 0.5F, 0.2F }, { 0.7F, 0.3F, 0.85F }, { 0.4F, 0.6F, 0.85F }, { 0.9F, 0.9F, 0.2F }, { 0.5F, 0.8F, 0.1F }, { 0.95F, 0.5F, 0.65F }, { 0.3F, 0.3F, 0.3F }, { 0.6F, 0.6F, 0.6F }, { 0.3F, 0.5F, 0.6F }, { 0.5F, 0.25F, 0.7F }, { 0.2F, 0.3F, 0.7F }, { 0.4F, 0.3F, 0.2F }, { 0.4F, 0.5F, 0.2F }, { 0.6F, 0.2F, 0.2F }, { 0.1F, 0.1F, 0.1F } };\\n+ public static final float[][] bp = new float[][]{ { 1.0F, 1.0F, 1.0F }, { 0.85F, 0.5F, 0.2F }, { 0.7F, 0.3F, 0.85F }, { 0.4F, 0.6F, 0.85F }, { 0.9F, 0.9F, 0.2F }, { 0.5F, 0.8F, 0.1F }, { 0.95F, 0.5F, 0.65F }, { 0.3F, 0.3F, 0.3F }, { 0.6F, 0.6F, 0.6F }, { 0.3F, 0.5F, 0.6F }, { 0.5F, 0.25F, 0.7F }, { 0.2F, 0.3F, 0.7F }, { 0.4F, 0.3F, 0.2F },\\n+ { 0.4F, 0.5F, 0.2F }, { 0.6F, 0.2F, 0.2F }, { 0.1F, 0.1F, 0.1F } };\\n private int br;\\n private EntityAIEatGrass bs = new EntityAIEatGrass(this);\\n \\n@@ -30,13 +29,13 @@ public EntitySheep(World world) {\\n this.entity = new CanarySheep(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected boolean bb() {\\n+ protected boolean be() {\\n return true;\\n }\\n \\n- protected void be() {\\n+ protected void bh() {\\n this.br = this.bs.f();\\n- super.be();\\n+ super.bh();\\n }\\n \\n public void c() {\\n@@ -47,8 +46,8 @@ public void c() {\\n super.c();\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(8.0D);\\n this.a(SharedMonsterAttributes.d).a(0.23000000417232513D);\\n }\\n@@ -59,8 +58,8 @@ protected void a() {\\n }\\n \\n protected void b(boolean flag0, int i0) {\\n- if (!this.bQ()) {\\n- this.a(new ItemStack(Block.ag.cF, 1, this.bP()), 0.0F);\\n+ if (!this.bU()) {\\n+ this.a(new ItemStack(Block.ag.cF, 1, this.bT()), 0.0F);\\n }\\n }\\n \\n@@ -71,13 +70,13 @@ protected int s() {\\n public boolean a(EntityPlayer entityplayer) {\\n ItemStack itemstack = entityplayer.bn.h();\\n \\n- if (itemstack != null && itemstack.d == Item.bg.cv && !this.bQ() && !this.g_()) {\\n+ if (itemstack != null && itemstack.d == Item.bg.cv && !this.bU() && !this.g_()) {\\n if (!this.q.I) {\\n- this.j(true);\\n+ this.i(true);\\n int i0 = 1 + this.ab.nextInt(3);\\n \\n for (int i1 = 0; i1 < i0; ++i1) {\\n- EntityItem entityitem = this.a(new ItemStack(Block.ag.cF, 1, this.bP()), 1.0F);\\n+ EntityItem entityitem = this.a(new ItemStack(Block.ag.cF, 1, this.bT()), 1.0F);\\n \\n entityitem.y += (double) (this.ab.nextFloat() * 0.05F);\\n entityitem.x += (double) ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.1F);\\n@@ -94,33 +93,33 @@ public boolean a(EntityPlayer entityplayer) {\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n super.b(nbttagcompound);\\n- nbttagcompound.a(\\\"Sheared\\\", this.bQ());\\n- nbttagcompound.a(\\\"Color\\\", (byte) this.bP());\\n+ nbttagcompound.a(\\\"Sheared\\\", this.bU());\\n+ nbttagcompound.a(\\\"Color\\\", (byte) this.bT());\\n }\\n \\n public void a(NBTTagCompound nbttagcompound) {\\n super.a(nbttagcompound);\\n- this.j(nbttagcompound.n(\\\"Sheared\\\"));\\n+ this.i(nbttagcompound.n(\\\"Sheared\\\"));\\n this.p(nbttagcompound.c(\\\"Color\\\"));\\n }\\n \\n protected String r() {\\n return \\\"mob.sheep.say\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.sheep.say\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.sheep.say\\\";\\n }\\n \\n protected void a(int i0, int i1, int i2, int i3) {\\n this.a(\\\"mob.sheep.step\\\", 0.15F, 1.0F);\\n }\\n \\n- public int bP() {\\n+ public int bT() {\\n return this.ah.a(16) & 15;\\n }\\n \\n@@ -130,11 +129,11 @@ public void p(int i0) {\\n this.ah.b(16, Byte.valueOf((byte) (b0 & 240 | i0 & 15)));\\n }\\n \\n- public boolean bQ() {\\n+ public boolean bU() {\\n return (this.ah.a(16) & 16) != 0;\\n }\\n \\n- public void j(boolean flag0) {\\n+ public void i(boolean flag0) {\\n byte b0 = this.ah.a(16);\\n \\n if (flag0) {\\n@@ -160,7 +159,7 @@ public EntitySheep b(EntityAgeable entityageable) {\\n }\\n \\n public void n() {\\n- this.j(false);\\n+ this.i(false);\\n if (this.g_()) {\\n this.a(60);\\n }\\n@@ -191,7 +190,7 @@ private int a(EntityAnimal entityanimal, EntityAnimal entityanimal1) {\\n }\\n \\n private int b(EntityAnimal entityanimal) {\\n- return 15 - ((EntitySheep) entityanimal).bP();\\n+ return 15 - ((EntitySheep) entityanimal).bT();\\n }\\n \\n public EntityAgeable a(EntityAgeable entityageable) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySheep.java\",\n \"sha\": \"2da5deb4826aee7fe7a823ff77ca0c8df408929b\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 14,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySilverfish.java\",\n \"changes\": 28,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySilverfish.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 14,\n \"filename\": \"src/main/java/net/minecraft/server/EntitySilverfish.java\",\n \"new_code\": \" protected void ay() {\\n super.ay();\\n protected Entity bL() {\\n protected String aN() {\\n protected String aO() {\\n if (this.aq()) {\\n protected void bk() {\\n super.bk();\\n if (this.j == null && !this.bM()) {\\n this.bK();\\n } else if (this.j != null && !this.bM()) {\\n public boolean bs() {\\n if (super.bs()) {\\n public EnumCreatureAttribute aX() {\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntitySilverfish.java\",\n \"implementation\": \"super.ay();\\n protected Entity bL() {\\n protected String aN() {\\n protected String aO() {\\n if (this.aq()) {\\n protected void bk() {\\n super.bk();\\n if (this.j == null && !this.bM()) {\\n this.bK();\",\n \"signature\": \"void ay()\"\n }\n ],\n \"old_code\": \" protected void ax() {\\n super.ax();\\n protected Entity bH() {\\n protected String aK() {\\n protected String aL() {\\n if (this.ap()) {\\n protected void bh() {\\n super.bh();\\n if (this.j == null && !this.bI()) {\\n this.bG();\\n } else if (this.j != null && !this.bI()) {\\n public boolean bo() {\\n if (super.bo()) {\\n public EnumCreatureAttribute aU() {\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntitySilverfish.java\",\n \"implementation\": \"super.ax();\\n protected Entity bH() {\\n protected String aK() {\\n protected String aL() {\\n if (this.ap()) {\\n protected void bh() {\\n super.bh();\\n if (this.j == null && !this.bI()) {\\n this.bG();\",\n \"signature\": \"void ax()\"\n }\n ],\n \"patch\": \"@@ -12,8 +12,8 @@ public EntitySilverfish(World world) {\\n this.entity = new CanarySilverfish(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(8.0D);\\n this.a(SharedMonsterAttributes.d).a(0.6000000238418579D);\\n this.a(SharedMonsterAttributes.e).a(1.0D);\\n@@ -23,7 +23,7 @@ protected boolean e_() {\\n return false;\\n }\\n \\n- protected Entity bH() {\\n+ protected Entity bL() {\\n double d0 = 8.0D;\\n \\n return this.q.b(this, d0);\\n@@ -33,16 +33,16 @@ protected String r() {\\n return \\\"mob.silverfish.say\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.silverfish.hit\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.silverfish.kill\\\";\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n if (this.bp <= 0 && (damagesource instanceof EntityDamageSource || damagesource == DamageSource.k)) {\\n@@ -73,8 +73,8 @@ public void l_() {\\n super.l_();\\n }\\n \\n- protected void bh() {\\n- super.bh();\\n+ protected void bk() {\\n+ super.bk();\\n if (!this.q.I) {\\n int i0;\\n int i1;\\n@@ -124,7 +124,7 @@ protected void bh() {\\n }\\n }\\n \\n- if (this.j == null && !this.bI()) {\\n+ if (this.j == null && !this.bM()) {\\n i0 = MathHelper.c(this.u);\\n i1 = MathHelper.c(this.v + 0.5D);\\n i2 = MathHelper.c(this.w);\\n@@ -136,9 +136,9 @@ protected void bh() {\\n this.q();\\n this.w();\\n } else {\\n- this.bG();\\n+ this.bK();\\n }\\n- } else if (this.j != null && !this.bI()) {\\n+ } else if (this.j != null && !this.bM()) {\\n this.j = null;\\n }\\n }\\n@@ -152,8 +152,8 @@ protected boolean i_() {\\n return true;\\n }\\n \\n- public boolean bo() {\\n- if (super.bo()) {\\n+ public boolean bs() {\\n+ if (super.bs()) {\\n EntityPlayer entityplayer = this.q.a(this, 5.0D);\\n \\n return entityplayer == null;\\n@@ -162,7 +162,7 @@ public boolean bo() {\\n }\\n }\\n \\n- public EnumCreatureAttribute aU() {\\n+ public EnumCreatureAttribute aX() {\\n return EnumCreatureAttribute.c;\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySilverfish.java\",\n \"sha\": \"1e4eef0584f2865d8aed045ec3bc44fe8fdd6041\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 31,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySkeleton.java\",\n \"changes\": 64,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySkeleton.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 33,\n \"filename\": \"src/main/java/net/minecraft/server/EntitySkeleton.java\",\n \"new_code\": \" this.bT();\\n protected void ay() {\\n super.ay();\\n public boolean be() {\\n protected String aN() {\\n protected String aO() {\\n if (this.bV() == 1 && entity instanceof EntityLivingBase) {\\n ((EntityLivingBase) entity).c(new PotionEffect(Potion.v.H, 200));\\n public EnumCreatureAttribute aX() {\\n if (this.q.I && this.bV() == 1) {\\n public void U() {\\n super.U();\\n if (this.bV() == 1) {\\n if (this.bV() == 1) {\\n protected void bw() {\\n super.bw();\\n if (this.q.t instanceof WorldProviderHell && this.aC().nextInt(5) > 0) {\\n this.bw();\\n this.bx();\\n public void bT() {\\n ItemStack itemstack = this.aY();\\n int i0 = EnchantmentHelper.a(Enchantment.v.z, this.aY());\\n int i1 = EnchantmentHelper.a(Enchantment.w.z, this.aY());\\n if (EnchantmentHelper.a(Enchantment.x.z, this.aY()) > 0 || this.bV() == 1) {\\n this.a(\\\"random.bow\\\", 1.0F, 1.0F / (this.aC().nextFloat() * 0.4F + 0.8F));\\n public int bV() {\\n this.bT();\\n nbttagcompound.a(\\\"SkeletonType\\\", (byte) this.bV());\\n this.bT();\\n public double W() {\\n return super.W() - 0.5D;\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n this.bP();\\n protected void ax() {\\n super.ax();\\n public boolean bb() {\\n protected String aK() {\\n protected String aL() {\\n if (this.bR() == 1 && entity instanceof EntityLivingBase) {\\n ((EntityLivingBase) entity).d(new PotionEffect(Potion.v.H, 200));\\n public EnumCreatureAttribute aU() {\\n if (this.q.I && this.bR() == 1) {\\n public void T() {\\n super.T();\\n if (this.bR() == 1) {\\n if (this.bR() == 1) {\\n protected void bs() {\\n super.bs();\\n if (this.q.t instanceof WorldProviderHell && this.aB().nextInt(5) > 0) {\\n this.bs();\\n this.bt();\\n public void bP() {\\n ItemStack itemstack = this.aV();\\n int i0 = EnchantmentHelper.a(Enchantment.v.z, this.aV());\\n int i1 = EnchantmentHelper.a(Enchantment.w.z, this.aV());\\n if (EnchantmentHelper.a(Enchantment.x.z, this.aV()) > 0 || this.bR() == 1) {\\n this.a(\\\"random.bow\\\", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));\\n public int bR() {\\n this.bP();\\n nbttagcompound.a(\\\"SkeletonType\\\", (byte) this.bR());\\n this.bP();\\n public double V() {\\n return super.V() - 0.5D;\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,10 +1,8 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.Calendar;\\n import net.canarymod.api.entity.living.monster.CanarySkeleton;\\n \\n-\\n public class EntitySkeleton extends EntityMob implements IRangedAttackMob {\\n \\n private EntityAIArrowAttack bp = new EntityAIArrowAttack(this, 1.0D, 20, 60, 15.0F);\\n@@ -21,13 +19,13 @@ public EntitySkeleton(World world) {\\n this.d.a(1, new EntityAIHurtByTarget(this, false));\\n this.d.a(2, new EntityAINearestAttackableTarget(this, EntityPlayer.class, 0, true));\\n if (world != null && !world.I) {\\n- this.bP();\\n+ this.bT();\\n }\\n this.entity = new CanarySkeleton(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.d).a(0.25D);\\n }\\n \\n@@ -36,19 +34,19 @@ protected void a() {\\n this.ah.a(13, new Byte((byte) 0));\\n }\\n \\n- public boolean bb() {\\n+ public boolean be() {\\n return true;\\n }\\n \\n protected String r() {\\n return \\\"mob.skeleton.say\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.skeleton.hurt\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.skeleton.death\\\";\\n }\\n \\n@@ -58,8 +56,8 @@ protected void a(int i0, int i1, int i2, int i3) {\\n \\n public boolean m(Entity entity) {\\n if (super.m(entity)) {\\n- if (this.bR() == 1 && entity instanceof EntityLivingBase) {\\n- ((EntityLivingBase) entity).d(new PotionEffect(Potion.v.H, 200));\\n+ if (this.bV() == 1 && entity instanceof EntityLivingBase) {\\n+ ((EntityLivingBase) entity).c(new PotionEffect(Potion.v.H, 200));\\n }\\n \\n return true;\\n@@ -68,7 +66,7 @@ public boolean m(Entity entity) {\\n }\\n }\\n \\n- public EnumCreatureAttribute aU() {\\n+ public EnumCreatureAttribute aX() {\\n return EnumCreatureAttribute.b;\\n }\\n \\n@@ -98,15 +96,15 @@ public void c() {\\n }\\n }\\n \\n- if (this.q.I && this.bR() == 1) {\\n+ if (this.q.I && this.bV() == 1) {\\n this.a(0.72F, 2.34F);\\n }\\n \\n super.c();\\n }\\n \\n- public void T() {\\n- super.T();\\n+ public void U() {\\n+ super.U();\\n if (this.o instanceof EntityCreature) {\\n EntityCreature entitycreature = (EntityCreature) this.o;\\n \\n@@ -135,7 +133,7 @@ protected void b(boolean flag0, int i0) {\\n int i1;\\n int i2;\\n \\n- if (this.bR() == 1) {\\n+ if (this.bV() == 1) {\\n i1 = this.ab.nextInt(3 + i0) - 1;\\n \\n for (i2 = 0; i2 < i1; ++i2) {\\n@@ -157,27 +155,27 @@ protected void b(boolean flag0, int i0) {\\n }\\n \\n protected void l(int i0) {\\n- if (this.bR() == 1) {\\n+ if (this.bV() == 1) {\\n this.a(new ItemStack(Item.bS.cv, 1, 1), 0.0F);\\n }\\n }\\n \\n- protected void bs() {\\n- super.bs();\\n+ protected void bw() {\\n+ super.bw();\\n this.c(0, new ItemStack(Item.m));\\n }\\n \\n public EntityLivingData a(EntityLivingData entitylivingdata) {\\n entitylivingdata = super.a(entitylivingdata);\\n- if (this.q.t instanceof WorldProviderHell && this.aB().nextInt(5) > 0) {\\n+ if (this.q.t instanceof WorldProviderHell && this.aC().nextInt(5) > 0) {\\n this.c.a(4, this.bq);\\n this.a(1);\\n this.c(0, new ItemStack(Item.x));\\n this.a(SharedMonsterAttributes.e).a(4.0D);\\n } else {\\n this.c.a(4, this.bp);\\n- this.bs();\\n- this.bt();\\n+ this.bw();\\n+ this.bx();\\n }\\n \\n this.h(this.ab.nextFloat() < 0.55F * this.q.b(this.u, this.v, this.w));\\n@@ -193,10 +191,10 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\\n return entitylivingdata;\\n }\\n \\n- public void bP() {\\n+ public void bT() {\\n this.c.a((EntityAIBase) this.bq);\\n this.c.a((EntityAIBase) this.bp);\\n- ItemStack itemstack = this.aV();\\n+ ItemStack itemstack = this.aY();\\n \\n if (itemstack != null && itemstack.d == Item.m.cv) {\\n this.c.a(4, this.bp);\\n@@ -207,8 +205,8 @@ public void bP() {\\n \\n public void a(EntityLivingBase entitylivingbase, float f0) {\\n EntityArrow entityarrow = new EntityArrow(this.q, this, entitylivingbase, 1.6F, (float) (14 - this.q.r * 4));\\n- int i0 = EnchantmentHelper.a(Enchantment.v.z, this.aV());\\n- int i1 = EnchantmentHelper.a(Enchantment.w.z, this.aV());\\n+ int i0 = EnchantmentHelper.a(Enchantment.v.z, this.aY());\\n+ int i1 = EnchantmentHelper.a(Enchantment.w.z, this.aY());\\n \\n entityarrow.b((double) (f0 * 2.0F) + this.ab.nextGaussian() * 0.25D + (double) ((float) this.q.r * 0.11F));\\n if (i0 > 0) {\\n@@ -219,15 +217,15 @@ public void a(EntityLivingBase entitylivingbase, float f0) {\\n entityarrow.a(i1);\\n }\\n \\n- if (EnchantmentHelper.a(Enchantment.x.z, this.aV()) > 0 || this.bR() == 1) {\\n+ if (EnchantmentHelper.a(Enchantment.x.z, this.aY()) > 0 || this.bV() == 1) {\\n entityarrow.d(100);\\n }\\n \\n- this.a(\\\"random.bow\\\", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));\\n+ this.a(\\\"random.bow\\\", 1.0F, 1.0F / (this.aC().nextFloat() * 0.4F + 0.8F));\\n this.q.d((Entity) entityarrow);\\n }\\n \\n- public int bR() {\\n+ public int bV() {\\n return this.ah.a(13);\\n }\\n \\n@@ -249,22 +247,22 @@ public void a(NBTTagCompound nbttagcompound) {\\n this.a(b0);\\n }\\n \\n- this.bP();\\n+ this.bT();\\n }\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n super.b(nbttagcompound);\\n- nbttagcompound.a(\\\"SkeletonType\\\", (byte) this.bR());\\n+ nbttagcompound.a(\\\"SkeletonType\\\", (byte) this.bV());\\n }\\n \\n public void c(int i0, ItemStack itemstack) {\\n super.c(i0, itemstack);\\n if (!this.q.I && i0 == 0) {\\n- this.bP();\\n+ this.bT();\\n }\\n }\\n \\n- public double V() {\\n- return super.V() - 0.5D;\\n+ public double W() {\\n+ return super.W() - 0.5D;\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySkeleton.java\",\n \"sha\": \"01c964d4f4924f2136ac80065540bc165226c6fc\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 48,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySlime.java\",\n \"changes\": 96,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySlime.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 48,\n \"filename\": \"src/main/java/net/minecraft/server/EntitySlime.java\",\n \"new_code\": \" this.g(this.aS());\\n public int bR() {\\n nbttagcompound.a(\\\"Size\\\", this.bR() - 1);\\n protected String bJ() {\\n protected String bP() {\\n return \\\"mob.slime.\\\" + (this.bR() > 1 ? \\\"big\\\" : \\\"small\\\");\\n if (!this.q.I && this.q.r == 0 && this.bR() > 0) {\\n i0 = this.bR();\\n this.q.a(this.bJ(), this.u + (double) f2, this.E.b, this.w + (double) f3, 0.0D, 0.0D, 0.0D);\\n if (this.bQ()) {\\n this.a(this.bP(), this.aZ(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) / 0.8F);\\n this.bM();\\n i0 = this.bR();\\n protected void bk() {\\n this.bo();\\n this.bn = this.bL();\\n if (this.bS()) {\\n this.a(this.bP(), this.aZ(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 0.8F);\\n this.bf = (float) (1 * this.bR());\\n protected void bM() {\\n protected int bL() {\\n protected EntitySlime bK() {\\n int i0 = this.bR();\\n if (!this.q.I && i0 > 1 && this.aM() <= 0.0F) {\\n EntitySlime entityslime = this.bK();\\n if (this.bN()) {\\n int i0 = this.bR();\\n if (this.o(entityplayer) && this.e(entityplayer) < 0.6D * (double) i0 * 0.6D * (double) i0 && entityplayer.a(DamageSource.a((EntityLivingBase) this), (float) this.bO())) {\\n protected boolean bN() {\\n return this.bR() > 1;\\n protected int bO() {\\n return this.bR();\\n protected String aN() {\\n return \\\"mob.slime.\\\" + (this.bR() > 1 ? \\\"big\\\" : \\\"small\\\");\\n protected String aO() {\\n return \\\"mob.slime.\\\" + (this.bR() > 1 ? \\\"big\\\" : \\\"small\\\");\\n return this.bR() == 1 ? Item.aO.cv : 0;\\n public boolean bs() {\\n if (this.bR() == 1 || this.q.r > 0) {\\n return super.bs();\\n return super.bs();\\n protected float aZ() {\\n return 0.4F * (float) this.bR();\\n public int bp() {\\n protected boolean bS() {\\n return this.bR() > 0;\\n protected boolean bQ() {\\n return this.bR() > 2;\",\n \"new_methods\": [],\n \"old_code\": \" this.g(this.aP());\\n public int bN() {\\n nbttagcompound.a(\\\"Size\\\", this.bN() - 1);\\n protected String bF() {\\n protected String bL() {\\n return \\\"mob.slime.\\\" + (this.bN() > 1 ? \\\"big\\\" : \\\"small\\\");\\n if (!this.q.I && this.q.r == 0 && this.bN() > 0) {\\n i0 = this.bN();\\n this.q.a(this.bF(), this.u + (double) f2, this.E.b, this.w + (double) f3, 0.0D, 0.0D, 0.0D);\\n if (this.bM()) {\\n this.a(this.bL(), this.aW(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) / 0.8F);\\n this.bI();\\n i0 = this.bN();\\n protected void bh() {\\n this.bk();\\n this.bn = this.bH();\\n if (this.bO()) {\\n this.a(this.bL(), this.aW(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 0.8F);\\n this.bf = (float) (1 * this.bN());\\n protected void bI() {\\n protected int bH() {\\n protected EntitySlime bG() {\\n int i0 = this.bN();\\n if (!this.q.I && i0 > 1 && this.aJ() <= 0.0F) {\\n EntitySlime entityslime = this.bG();\\n if (this.bJ()) {\\n int i0 = this.bN();\\n if (this.o(entityplayer) && this.e(entityplayer) < 0.6D * (double) i0 * 0.6D * (double) i0 && entityplayer.a(DamageSource.a((EntityLivingBase) this), (float) this.bK())) {\\n protected boolean bJ() {\\n return this.bN() > 1;\\n protected int bK() {\\n return this.bN();\\n protected String aK() {\\n return \\\"mob.slime.\\\" + (this.bN() > 1 ? \\\"big\\\" : \\\"small\\\");\\n protected String aL() {\\n return \\\"mob.slime.\\\" + (this.bN() > 1 ? \\\"big\\\" : \\\"small\\\");\\n return this.bN() == 1 ? Item.aO.cv : 0;\\n public boolean bo() {\\n if (this.bN() == 1 || this.q.r > 0) {\\n return super.bo();\\n return super.bo();\\n protected float aW() {\\n return 0.4F * (float) this.bN();\\n public int bl() {\\n protected boolean bO() {\\n return this.bN() > 0;\\n protected boolean bM() {\\n return this.bN() > 2;\",\n \"old_methods\": [],\n \"patch\": \"@@ -29,34 +29,34 @@ public void a(int i0) { // CanaryMod: protected => public\\n this.a(0.6F * (float) i0, 0.6F * (float) i0);\\n this.b(this.u, this.v, this.w);\\n this.a(SharedMonsterAttributes.a).a((double) (i0 * i0));\\n- this.g(this.aP());\\n+ this.g(this.aS());\\n this.b = i0;\\n }\\n \\n- public int bN() {\\n+ public int bR() {\\n return this.ah.a(16);\\n }\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n super.b(nbttagcompound);\\n- nbttagcompound.a(\\\"Size\\\", this.bN() - 1);\\n+ nbttagcompound.a(\\\"Size\\\", this.bR() - 1);\\n }\\n \\n public void a(NBTTagCompound nbttagcompound) {\\n super.a(nbttagcompound);\\n this.a(nbttagcompound.e(\\\"Size\\\") + 1);\\n }\\n \\n- protected String bF() {\\n+ protected String bJ() {\\n return \\\"slime\\\";\\n }\\n \\n- protected String bL() {\\n- return \\\"mob.slime.\\\" + (this.bN() > 1 ? \\\"big\\\" : \\\"small\\\");\\n+ protected String bP() {\\n+ return \\\"mob.slime.\\\" + (this.bR() > 1 ? \\\"big\\\" : \\\"small\\\");\\n }\\n \\n public void l_() {\\n- if (!this.q.I && this.q.r == 0 && this.bN() > 0) {\\n+ if (!this.q.I && this.q.r == 0 && this.bR() > 0) {\\n this.M = true;\\n }\\n \\n@@ -68,54 +68,54 @@ public void l_() {\\n int i0;\\n \\n if (this.F && !flag0) {\\n- i0 = this.bN();\\n+ i0 = this.bR();\\n \\n for (int i1 = 0; i1 < i0 * 8; ++i1) {\\n float f0 = this.ab.nextFloat() * 3.1415927F * 2.0F;\\n float f1 = this.ab.nextFloat() * 0.5F + 0.5F;\\n float f2 = MathHelper.a(f0) * (float) i0 * 0.5F * f1;\\n float f3 = MathHelper.b(f0) * (float) i0 * 0.5F * f1;\\n \\n- this.q.a(this.bF(), this.u + (double) f2, this.E.b, this.w + (double) f3, 0.0D, 0.0D, 0.0D);\\n+ this.q.a(this.bJ(), this.u + (double) f2, this.E.b, this.w + (double) f3, 0.0D, 0.0D, 0.0D);\\n }\\n \\n- if (this.bM()) {\\n- this.a(this.bL(), this.aW(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) / 0.8F);\\n+ if (this.bQ()) {\\n+ this.a(this.bP(), this.aZ(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) / 0.8F);\\n }\\n \\n this.h = -0.5F;\\n } else if (!this.F && flag0) {\\n this.h = 1.0F;\\n }\\n \\n- this.bI();\\n+ this.bM();\\n if (this.q.I) {\\n- i0 = this.bN();\\n+ i0 = this.bR();\\n this.a(0.6F * (float) i0, 0.6F * (float) i0);\\n }\\n }\\n \\n- protected void bh() {\\n- this.bk();\\n+ protected void bk() {\\n+ this.bo();\\n EntityPlayer entityplayer = this.q.b(this, 16.0D);\\n \\n if (entityplayer != null) {\\n this.a(entityplayer, 10.0F, 20.0F);\\n }\\n \\n if (this.F && this.bn-- <= 0) {\\n- this.bn = this.bH();\\n+ this.bn = this.bL();\\n if (entityplayer != null) {\\n this.bn /= 3;\\n }\\n \\n this.bd = true;\\n- if (this.bO()) {\\n- this.a(this.bL(), this.aW(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 0.8F);\\n+ if (this.bS()) {\\n+ this.a(this.bP(), this.aZ(), ((this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F) * 0.8F);\\n }\\n \\n this.be = 1.0F - this.ab.nextFloat() * 2.0F;\\n- this.bf = (float) (1 * this.bN());\\n+ this.bf = (float) (1 * this.bR());\\n } else {\\n this.bd = false;\\n if (this.F) {\\n@@ -124,28 +124,28 @@ protected void bh() {\\n }\\n }\\n \\n- protected void bI() {\\n+ protected void bM() {\\n this.h *= 0.6F;\\n }\\n \\n- protected int bH() {\\n+ protected int bL() {\\n return this.ab.nextInt(20) + 10;\\n }\\n \\n- protected EntitySlime bG() {\\n+ protected EntitySlime bK() {\\n return new EntitySlime(this.q);\\n }\\n \\n public void w() {\\n- int i0 = this.bN();\\n+ int i0 = this.bR();\\n \\n- if (!this.q.I && i0 > 1 && this.aJ() <= 0.0F) {\\n+ if (!this.q.I && i0 > 1 && this.aM() <= 0.0F) {\\n int i1 = 2 + this.ab.nextInt(3);\\n \\n for (int i2 = 0; i2 < i1; ++i2) {\\n float f0 = ((float) (i2 % 2) - 0.5F) * (float) i0 / 4.0F;\\n float f1 = ((float) (i2 / 2) - 0.5F) * (float) i0 / 4.0F;\\n- EntitySlime entityslime = this.bG();\\n+ EntitySlime entityslime = this.bK();\\n \\n entityslime.a(i0 / 2);\\n entityslime.b(this.u + (double) f0, this.v + 0.5D, this.w + (double) f1, this.ab.nextFloat() * 360.0F, 0.0F);\\n@@ -157,70 +157,70 @@ public void w() {\\n }\\n \\n public void b_(EntityPlayer entityplayer) {\\n- if (this.bJ()) {\\n- int i0 = this.bN();\\n+ if (this.bN()) {\\n+ int i0 = this.bR();\\n \\n- if (this.o(entityplayer) && this.e(entityplayer) < 0.6D * (double) i0 * 0.6D * (double) i0 && entityplayer.a(DamageSource.a((EntityLivingBase) this), (float) this.bK())) {\\n+ if (this.o(entityplayer) && this.e(entityplayer) < 0.6D * (double) i0 * 0.6D * (double) i0 && entityplayer.a(DamageSource.a((EntityLivingBase) this), (float) this.bO())) {\\n this.a(\\\"mob.attack\\\", 1.0F, (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n }\\n }\\n }\\n \\n- protected boolean bJ() {\\n- return this.bN() > 1;\\n+ protected boolean bN() {\\n+ return this.bR() > 1;\\n }\\n \\n- protected int bK() {\\n- return this.bN();\\n+ protected int bO() {\\n+ return this.bR();\\n }\\n \\n- protected String aK() {\\n- return \\\"mob.slime.\\\" + (this.bN() > 1 ? \\\"big\\\" : \\\"small\\\");\\n+ protected String aN() {\\n+ return \\\"mob.slime.\\\" + (this.bR() > 1 ? \\\"big\\\" : \\\"small\\\");\\n }\\n \\n- protected String aL() {\\n- return \\\"mob.slime.\\\" + (this.bN() > 1 ? \\\"big\\\" : \\\"small\\\");\\n+ protected String aO() {\\n+ return \\\"mob.slime.\\\" + (this.bR() > 1 ? \\\"big\\\" : \\\"small\\\");\\n }\\n \\n protected int s() {\\n- return this.bN() == 1 ? Item.aO.cv : 0;\\n+ return this.bR() == 1 ? Item.aO.cv : 0;\\n }\\n \\n- public boolean bo() {\\n+ public boolean bs() {\\n Chunk chunk = this.q.d(MathHelper.c(this.u), MathHelper.c(this.w));\\n \\n if (this.q.N().u() == WorldType.c && this.ab.nextInt(4) != 1) {\\n return false;\\n } else {\\n- if (this.bN() == 1 || this.q.r > 0) {\\n+ if (this.bR() == 1 || this.q.r > 0) {\\n BiomeGenBase biomegenbase = this.q.a(MathHelper.c(this.u), MathHelper.c(this.w));\\n \\n if (biomegenbase == BiomeGenBase.h && this.v > 50.0D && this.v < 70.0D && this.ab.nextFloat() < 0.5F && this.ab.nextFloat() < this.q.x() && this.q.n(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w)) <= this.ab.nextInt(8)) {\\n- return super.bo();\\n+ return super.bs();\\n }\\n \\n if (this.ab.nextInt(10) == 0 && chunk.a(987234911L).nextInt(10) == 0 && this.v < 40.0D) {\\n- return super.bo();\\n+ return super.bs();\\n }\\n }\\n \\n return false;\\n }\\n }\\n \\n- protected float aW() {\\n- return 0.4F * (float) this.bN();\\n+ protected float aZ() {\\n+ return 0.4F * (float) this.bR();\\n }\\n \\n- public int bl() {\\n+ public int bp() {\\n return 0;\\n }\\n \\n- protected boolean bO() {\\n- return this.bN() > 0;\\n+ protected boolean bS() {\\n+ return this.bR() > 0;\\n }\\n \\n- protected boolean bM() {\\n- return this.bN() > 2;\\n+ protected boolean bQ() {\\n+ return this.bR() > 2;\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySlime.java\",\n \"sha\": \"d553c4c5a9e2effd031d5c0b11c74491c5316ed6\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 5,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySnowman.java\",\n \"changes\": 12,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySnowman.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 7,\n \"filename\": \"src/main/java/net/minecraft/server/EntitySnowman.java\",\n \"new_code\": \" }\\n public boolean be() {\\n protected void ay() {\\n super.ay();\\n this.a(\\\"random.bow\\\", 1.0F, 1.0F / (this.aC().nextFloat() * 0.4F + 0.8F));\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n}\\n public boolean bb() {\\n protected void ax() {\\n super.ax();\\n this.a(\\\"random.bow\\\", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.living.CanarySnowman;\\n \\n-\\n public class EntitySnowman extends EntityGolem implements IRangedAttackMob {\\n \\n public EntitySnowman(World world) {\\n@@ -16,14 +14,14 @@ public EntitySnowman(World world) {\\n this.c.a(4, new EntityAILookIdle(this));\\n this.d.a(1, new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, true, false, IMob.a));\\n this.entity = new CanarySnowman(this); // CanaryMod: Wrap Entity\\n-}\\n+ }\\n \\n- public boolean bb() {\\n+ public boolean be() {\\n return true;\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(4.0D);\\n this.a(SharedMonsterAttributes.d).a(0.20000000298023224D);\\n }\\n@@ -72,7 +70,7 @@ public void a(EntityLivingBase entitylivingbase, float f0) {\\n float f1 = MathHelper.a(d0 * d0 + d2 * d2) * 0.2F;\\n \\n entitysnowball.c(d0, d1 + (double) f1, d2, 1.6F, 12.0F);\\n- this.a(\\\"random.bow\\\", 1.0F, 1.0F / (this.aB().nextFloat() * 0.4F + 0.8F));\\n+ this.a(\\\"random.bow\\\", 1.0F, 1.0F / (this.aC().nextFloat() * 0.4F + 0.8F));\\n this.q.d((Entity) entitysnowball);\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySnowman.java\",\n \"sha\": \"fb3be51dcf56fcf1dbf82e5062fcf55a5e531784\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 12,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySpider.java\",\n \"changes\": 26,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySpider.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 14,\n \"filename\": \"src/main/java/net/minecraft/server/EntitySpider.java\",\n \"new_code\": \" protected void ay() {\\n super.ay();\\n protected Entity bL() {\\n protected String aN() {\\n protected String aO() {\\n return this.bT();\\n public void al() {}\\n public EnumCreatureAttribute aX() {\\n public boolean d(PotionEffect potioneffect) {\\n return potioneffect.a() == Potion.u.H ? false : super.d(potioneffect);\\n public boolean bT() {\\n this.c(new PotionEffect(i0, Integer.MAX_VALUE));\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntitySpider.java\",\n \"implementation\": \"super.ay();\\n protected Entity bL() {\\n protected String aN() {\\n protected String aO() {\\n return this.bT();\\n public void al() {\",\n \"signature\": \"void ay()\"\n }\n ],\n \"old_code\": \"\\n\\n protected void ax() {\\n super.ax();\\n protected Entity bH() {\\n protected String aK() {\\n protected String aL() {\\n return this.bP();\\n public void ak() {}\\n public EnumCreatureAttribute aU() {\\n public boolean e(PotionEffect potioneffect) {\\n return potioneffect.a() == Potion.u.H ? false : super.e(potioneffect);\\n public boolean bP() {\\n this.d(new PotionEffect(i0, Integer.MAX_VALUE));\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntitySpider.java\",\n \"implementation\": \"super.ax();\\n protected Entity bH() {\\n protected String aK() {\\n protected String aL() {\\n return this.bP();\\n public void ak() {\",\n \"signature\": \"void ax()\"\n }\n ],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.living.monster.CanarySpider;\\n \\n-\\n public class EntitySpider extends EntityMob {\\n \\n public EntitySpider(World world) {\\n@@ -24,13 +22,13 @@ public void l_() {\\n }\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(16.0D);\\n this.a(SharedMonsterAttributes.d).a(0.800000011920929D);\\n }\\n \\n- protected Entity bH() {\\n+ protected Entity bL() {\\n float f0 = this.d(1.0F);\\n \\n if (f0 < 0.5F) {\\n@@ -46,11 +44,11 @@ protected String r() {\\n return \\\"mob.spider.say\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.spider.say\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.spider.death\\\";\\n }\\n \\n@@ -92,20 +90,20 @@ protected void b(boolean flag0, int i0) {\\n }\\n \\n public boolean e() {\\n- return this.bP();\\n+ return this.bT();\\n }\\n \\n- public void ak() {}\\n+ public void al() {}\\n \\n- public EnumCreatureAttribute aU() {\\n+ public EnumCreatureAttribute aX() {\\n return EnumCreatureAttribute.c;\\n }\\n \\n- public boolean e(PotionEffect potioneffect) {\\n- return potioneffect.a() == Potion.u.H ? false : super.e(potioneffect);\\n+ public boolean d(PotionEffect potioneffect) {\\n+ return potioneffect.a() == Potion.u.H ? false : super.d(potioneffect);\\n }\\n \\n- public boolean bP() {\\n+ public boolean bT() {\\n return (this.ah.a(16) & 1) != 0;\\n }\\n \\n@@ -144,7 +142,7 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\\n int i0 = ((SpiderEffectsGroupData) object).a;\\n \\n if (i0 > 0 && Potion.a[i0] != null) {\\n- this.d(new PotionEffect(i0, Integer.MAX_VALUE));\\n+ this.c(new PotionEffect(i0, Integer.MAX_VALUE));\\n }\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySpider.java\",\n \"sha\": \"2f37a380b255d5a06ad162a2f8db7536674ff333\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 9,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySquid.java\",\n \"changes\": 20,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySquid.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 11,\n \"filename\": \"src/main/java/net/minecraft/server/EntitySquid.java\",\n \"new_code\": \" protected void ay() {\\n super.ay();\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n protected void bk() {\\n this.bo();\\n public boolean bs() {\\n return this.v > 45.0D && this.v < 63.0D && super.bs();\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n protected void ax() {\\n super.ax();\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n protected void bh() {\\n this.bk();\\n public boolean bo() {\\n return this.v > 45.0D && this.v < 63.0D && super.bo();\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.entity.living.animal.CanarySquid;\\n \\n-\\n public class EntitySquid extends EntityWaterMob {\\n \\n public float bp;\\n@@ -28,24 +26,24 @@ public EntitySquid(World world) {\\n this.entity = new CanarySquid(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(10.0D);\\n }\\n \\n protected String r() {\\n return null;\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return null;\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return null;\\n }\\n \\n- protected float aW() {\\n+ protected float aZ() {\\n return 0.4F;\\n }\\n \\n@@ -129,7 +127,7 @@ public void e(float f0, float f1) {\\n this.d(this.x, this.y, this.z);\\n }\\n \\n- protected void bh() {\\n+ protected void bk() {\\n ++this.aV;\\n if (this.aV > 100) {\\n this.bA = this.bB = this.bC = 0.0F;\\n@@ -141,10 +139,10 @@ protected void bh() {\\n this.bC = MathHelper.a(f0) * 0.2F;\\n }\\n \\n- this.bk();\\n+ this.bo();\\n }\\n \\n- public boolean bo() {\\n- return this.v > 45.0D && this.v < 63.0D && super.bo();\\n+ public boolean bs() {\\n+ return this.v > 45.0D && this.v < 63.0D && super.bs();\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntitySquid.java\",\n \"sha\": \"13680d0889dff5608c43535b0a65592dd5adbe1f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityThrowable.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityThrowable.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 4,\n \"filename\": \"src/main/java/net/minecraft/server/EntityThrowable.java\",\n \"new_code\": \" this.aa();\\n this.h = this.g.am();\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n this.Z();\\n this.h = this.g.al();\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.List;\\n \\n-\\n public abstract class EntityThrowable extends Entity implements IProjectile {\\n \\n private int c = -1;\\n@@ -155,7 +153,7 @@ public void l_() {\\n \\n if (movingobjectposition != null) {\\n if (movingobjectposition.a == EnumMovingObjectType.a && this.q.a(movingobjectposition.b, movingobjectposition.c, movingobjectposition.d) == Block.bj.cF) {\\n- this.Z();\\n+ this.aa();\\n } else {\\n this.a(movingobjectposition);\\n }\\n@@ -220,7 +218,7 @@ public void b(NBTTagCompound nbttagcompound) {\\n nbttagcompound.a(\\\"shake\\\", (byte) this.b);\\n nbttagcompound.a(\\\"inGround\\\", (byte) (this.a ? 1 : 0));\\n if ((this.h == null || this.h.length() == 0) && this.g != null && this.g instanceof EntityPlayer) {\\n- this.h = this.g.al();\\n+ this.h = this.g.am();\\n }\\n \\n nbttagcompound.a(\\\"ownerName\\\", this.h == null ? \\\"\\\" : this.h);\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityThrowable.java\",\n \"sha\": \"197cc324be2ede2612e9db152eff89b7a77605f1\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 10,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityTrackerEntry.java\",\n \"changes\": 20,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityTrackerEntry.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 10,\n \"filename\": \"src/main/java/net/minecraft/server/EntityTrackerEntry.java\",\n \"new_code\": \" this.i = MathHelper.d(entity.ao() * 256.0F / 360.0F);\\n if (i09.a.f() <= 5) {\\n i0 = MathHelper.d(this.a.ao() * 256.0F / 360.0F);\\n ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aW();\\n ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aW();\\n if (this.a instanceof EntityLiving && ((EntityLiving) this.a).bI() != null) {\\n entityplayermp.a.b(new Packet39AttachEntity(1, this.a, ((EntityLiving) this.a).bI()));\\n if (entityplayer.bg()) {\\n Iterator iterator = entitylivingbase.aK().iterator();\\n this.i = MathHelper.d(this.a.ao() * 256.0F / 360.0F);\",\n \"new_methods\": [],\n \"old_code\": \" this.i = MathHelper.d(entity.an() * 256.0F / 360.0F);\\n if (i09.a.e() <= 5) {\\n i0 = MathHelper.d(this.a.an() * 256.0F / 360.0F);\\n ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aT();\\n ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aT();\\n if (this.a instanceof EntityLiving && ((EntityLiving) this.a).bE() != null) {\\n entityplayermp.a.b(new Packet39AttachEntity(1, this.a, ((EntityLiving) this.a).bE()));\\n if (entityplayer.bd()) {\\n Iterator iterator = entitylivingbase.aH().iterator();\\n this.i = MathHelper.d(this.a.an() * 256.0F / 360.0F);\",\n \"old_methods\": [],\n \"patch\": \"@@ -46,7 +46,7 @@ public EntityTrackerEntry(Entity entity, int i0, int i1, boolean flag0) {\\n this.f = MathHelper.c(entity.w * 32.0D);\\n this.g = MathHelper.d(entity.A * 256.0F / 360.0F);\\n this.h = MathHelper.d(entity.B * 256.0F / 360.0F);\\n- this.i = MathHelper.d(entity.an() * 256.0F / 360.0F);\\n+ this.i = MathHelper.d(entity.ao() * 256.0F / 360.0F);\\n \\n canaryEntry = new CanaryEntityTrackerEntry(this);\\n }\\n@@ -88,7 +88,7 @@ public void a(List list) {\\n EntityPlayerMP i09 = (EntityPlayerMP) i08;\\n \\n i06.a(i09, i04);\\n- if (i09.a.e() <= 5) {\\n+ if (i09.a.f() <= 5) {\\n Packet i10 = Item.bf.c(i04, this.a.q, i09);\\n \\n if (i10 != null) {\\n@@ -182,7 +182,7 @@ public void a(List list) {\\n this.w = true;\\n }\\n \\n- i0 = MathHelper.d(this.a.an() * 256.0F / 360.0F);\\n+ i0 = MathHelper.d(this.a.ao() * 256.0F / 360.0F);\\n if (Math.abs(i0 - this.i) >= 4) {\\n this.a((Packet) (new Packet35EntityHeadRotation(this.a.k, (byte) i0)));\\n this.i = i0;\\n@@ -206,7 +206,7 @@ private void b() {\\n }\\n \\n if (this.a instanceof EntityLivingBase) {\\n- ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aT();\\n+ ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aW();\\n Set set = serversideattributemap.b();\\n \\n if (!set.isEmpty()) {\\n@@ -267,7 +267,7 @@ public void b(EntityPlayerMP entityplayermp) {\\n }\\n \\n if (this.a instanceof EntityLivingBase) {\\n- ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aT();\\n+ ServersideAttributeMap serversideattributemap = (ServersideAttributeMap) ((EntityLivingBase) this.a).aW();\\n Collection collection = serversideattributemap.c();\\n \\n if (!collection.isEmpty()) {\\n@@ -286,8 +286,8 @@ public void b(EntityPlayerMP entityplayermp) {\\n entityplayermp.a.b(new Packet39AttachEntity(0, this.a, this.a.o));\\n }\\n \\n- if (this.a instanceof EntityLiving && ((EntityLiving) this.a).bE() != null) {\\n- entityplayermp.a.b(new Packet39AttachEntity(1, this.a, ((EntityLiving) this.a).bE()));\\n+ if (this.a instanceof EntityLiving && ((EntityLiving) this.a).bI() != null) {\\n+ entityplayermp.a.b(new Packet39AttachEntity(1, this.a, ((EntityLiving) this.a).bI()));\\n }\\n \\n if (this.a instanceof EntityLivingBase) {\\n@@ -303,14 +303,14 @@ public void b(EntityPlayerMP entityplayermp) {\\n if (this.a instanceof EntityPlayer) {\\n EntityPlayer entityplayer = (EntityPlayer) this.a;\\n \\n- if (entityplayer.bd()) {\\n+ if (entityplayer.bg()) {\\n entityplayermp.a.b(new Packet17Sleep(this.a, 0, MathHelper.c(this.a.u), MathHelper.c(this.a.v), MathHelper.c(this.a.w)));\\n }\\n }\\n \\n if (this.a instanceof EntityLivingBase) {\\n EntityLivingBase entitylivingbase = (EntityLivingBase) this.a;\\n- Iterator iterator = entitylivingbase.aH().iterator();\\n+ Iterator iterator = entitylivingbase.aK().iterator();\\n \\n while (iterator.hasNext()) {\\n PotionEffect potioneffect = (PotionEffect) iterator.next();\\n@@ -434,7 +434,7 @@ private Packet c() {\\n }\\n }\\n } else {\\n- this.i = MathHelper.d(this.a.an() * 256.0F / 360.0F);\\n+ this.i = MathHelper.d(this.a.ao() * 256.0F / 360.0F);\\n return new Packet24MobSpawn((EntityLivingBase) this.a);\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityTrackerEntry.java\",\n \"sha\": \"0c0bb94c3b64d48524f1e0a85059e3aa13287556\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 91,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityVillager.java\",\n \"changes\": 182,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityVillager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 91,\n \"filename\": \"src/main/java/net/minecraft/server/EntityVillager.java\",\n \"new_code\": \" this.c.a(5, new EntityAIMoveTowardsRestriction(this, 0.6D));\\n protected void ay() {\\n super.ay();\\n public boolean be() {\\n protected void bj() {\\n this.bR();\\n if (!this.bW() && this.bv > 0) {\\n this.c(new PotionEffect(Potion.l.H, 200, 0));\\n super.bj();\\n if (!flag0 && this.S() && !this.bW() && !this.g_()) {\\n entityplayer.a((IMerchant) this, this.bA());\\n nbttagcompound.a(\\\"Profession\\\", this.bT());\\n return this.bW() ? \\\"mob.villager.haggle\\\" : \\\"mob.villager.idle\\\";\\n protected String aN() {\\n protected String aO() {\\n public int bT() {\\n public boolean bU() {\\n public void i(boolean flag0) {\\n public void j(boolean flag0) {\\n public boolean bV() {\\n if (this.S()) {\\n public boolean bW() {\\n this.a(\\\"mob.villager.yes\\\", this.aZ(), this.ba());\\n this.a(\\\"mob.villager.yes\\\", this.aZ(), this.ba());\\n this.a(\\\"mob.villager.no\\\", this.aZ(), this.ba());\\n private float p(float f0) {\\n label50: switch (this.bT()) {\\n a(merchantrecipelist, Item.V.cv, this.ab, this.p(0.9F));\\n a(merchantrecipelist, Block.ag.cF, this.ab, this.p(0.5F));\\n a(merchantrecipelist, Item.bm.cv, this.ab, this.p(0.5F));\\n a(merchantrecipelist, Item.aX.cv, this.ab, this.p(0.4F));\\n b(merchantrecipelist, Item.W.cv, this.ab, this.p(0.9F));\\n b(merchantrecipelist, Item.bh.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.l.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.be.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.bg.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.k.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.bn.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.n.cv, this.ab, this.p(0.5F));\\n if (this.ab.nextFloat() < this.p(0.5F)) {\\n a(merchantrecipelist, Item.aM.cv, this.ab, this.p(0.8F));\\n a(merchantrecipelist, Item.aN.cv, this.ab, this.p(0.8F));\\n a(merchantrecipelist, Item.bI.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Block.as.cF, this.ab, this.p(0.8F));\\n b(merchantrecipelist, Block.R.cF, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.aS.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.aU.cv, this.ab, this.p(0.2F));\\n if (this.ab.nextFloat() < this.p(0.07F)) {\\n b(merchantrecipelist, Item.bC.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.bF.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.aE.cv, this.ab, this.p(0.4F));\\n b(merchantrecipelist, Block.bi.cF, this.ab, this.p(0.3F));\\n if (this.ab.nextFloat() < this.p(0.05F)) {\\n a(merchantrecipelist, Item.o.cv, this.ab, this.p(0.7F));\\n a(merchantrecipelist, Item.q.cv, this.ab, this.p(0.5F));\\n a(merchantrecipelist, Item.r.cv, this.ab, this.p(0.5F));\\n a(merchantrecipelist, Item.p.cv, this.ab, this.p(0.5F));\\n b(merchantrecipelist, Item.s.cv, this.ab, this.p(0.5F));\\n b(merchantrecipelist, Item.B.cv, this.ab, this.p(0.5F));\\n b(merchantrecipelist, Item.j.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.E.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.i.cv, this.ab, this.p(0.5F));\\n b(merchantrecipelist, Item.D.cv, this.ab, this.p(0.5F));\\n b(merchantrecipelist, Item.h.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.C.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.R.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.S.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.ai.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.am.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.af.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.aj.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.ag.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.ak.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.ah.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.al.cv, this.ab, this.p(0.2F));\\n b(merchantrecipelist, Item.ae.cv, this.ab, this.p(0.1F));\\n b(merchantrecipelist, Item.ab.cv, this.ab, this.p(0.1F));\\n b(merchantrecipelist, Item.ac.cv, this.ab, this.p(0.1F));\\n b(merchantrecipelist, Item.ad.cv, this.ab, this.p(0.1F));\\n a(merchantrecipelist, Item.o.cv, this.ab, this.p(0.7F));\\n a(merchantrecipelist, Item.as.cv, this.ab, this.p(0.5F));\\n a(merchantrecipelist, Item.bk.cv, this.ab, this.p(0.5F));\\n b(merchantrecipelist, Item.aC.cv, this.ab, this.p(0.1F));\\n b(merchantrecipelist, Item.Y.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.aa.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.X.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.Z.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.at.cv, this.ab, this.p(0.3F));\\n b(merchantrecipelist, Item.bl.cv, this.ab, this.p(0.3F));\\n public void bX() {\\n public boolean bG() {\",\n \"new_methods\": [],\n \"old_code\": \" this.c.a(5, new EntityAIMoveTwardsRestriction(this, 0.6D));\\n protected void ax() {\\n super.ax();\\n public boolean bb() {\\n protected void bg() {\\n this.bN();\\n if (!this.bS() && this.bv > 0) {\\n this.d(new PotionEffect(Potion.l.H, 200, 0));\\n super.bg();\\n if (!flag0 && this.R() && !this.bS() && !this.g_()) {\\n entityplayer.a((IMerchant) this, this.bw());\\n nbttagcompound.a(\\\"Profession\\\", this.bP());\\n return this.bS() ? \\\"mob.villager.haggle\\\" : \\\"mob.villager.idle\\\";\\n protected String aK() {\\n protected String aL() {\\n public int bP() {\\n public boolean bQ() {\\n public void j(boolean flag0) {\\n public void k(boolean flag0) {\\n public boolean bR() {\\n if (this.R()) {\\n public boolean bS() {\\n this.a(\\\"mob.villager.yes\\\", this.aW(), this.aX());\\n this.a(\\\"mob.villager.yes\\\", this.aW(), this.aX());\\n this.a(\\\"mob.villager.no\\\", this.aW(), this.aX());\\n private float o(float f0) {\\n label50: switch (this.bP()) {\\n a(merchantrecipelist, Item.V.cv, this.ab, this.o(0.9F));\\n a(merchantrecipelist, Block.ag.cF, this.ab, this.o(0.5F));\\n a(merchantrecipelist, Item.bm.cv, this.ab, this.o(0.5F));\\n a(merchantrecipelist, Item.aX.cv, this.ab, this.o(0.4F));\\n b(merchantrecipelist, Item.W.cv, this.ab, this.o(0.9F));\\n b(merchantrecipelist, Item.bh.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.l.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.be.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.bg.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.k.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.bn.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.n.cv, this.ab, this.o(0.5F));\\n if (this.ab.nextFloat() < this.o(0.5F)) {\\n a(merchantrecipelist, Item.aM.cv, this.ab, this.o(0.8F));\\n a(merchantrecipelist, Item.aN.cv, this.ab, this.o(0.8F));\\n a(merchantrecipelist, Item.bI.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Block.as.cF, this.ab, this.o(0.8F));\\n b(merchantrecipelist, Block.R.cF, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.aS.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.aU.cv, this.ab, this.o(0.2F));\\n if (this.ab.nextFloat() < this.o(0.07F)) {\\n b(merchantrecipelist, Item.bC.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.bF.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.aE.cv, this.ab, this.o(0.4F));\\n b(merchantrecipelist, Block.bi.cF, this.ab, this.o(0.3F));\\n if (this.ab.nextFloat() < this.o(0.05F)) {\\n a(merchantrecipelist, Item.o.cv, this.ab, this.o(0.7F));\\n a(merchantrecipelist, Item.q.cv, this.ab, this.o(0.5F));\\n a(merchantrecipelist, Item.r.cv, this.ab, this.o(0.5F));\\n a(merchantrecipelist, Item.p.cv, this.ab, this.o(0.5F));\\n b(merchantrecipelist, Item.s.cv, this.ab, this.o(0.5F));\\n b(merchantrecipelist, Item.B.cv, this.ab, this.o(0.5F));\\n b(merchantrecipelist, Item.j.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.E.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.i.cv, this.ab, this.o(0.5F));\\n b(merchantrecipelist, Item.D.cv, this.ab, this.o(0.5F));\\n b(merchantrecipelist, Item.h.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.C.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.R.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.S.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.ai.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.am.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.af.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.aj.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.ag.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.ak.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.ah.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.al.cv, this.ab, this.o(0.2F));\\n b(merchantrecipelist, Item.ae.cv, this.ab, this.o(0.1F));\\n b(merchantrecipelist, Item.ab.cv, this.ab, this.o(0.1F));\\n b(merchantrecipelist, Item.ac.cv, this.ab, this.o(0.1F));\\n b(merchantrecipelist, Item.ad.cv, this.ab, this.o(0.1F));\\n a(merchantrecipelist, Item.o.cv, this.ab, this.o(0.7F));\\n a(merchantrecipelist, Item.as.cv, this.ab, this.o(0.5F));\\n a(merchantrecipelist, Item.bk.cv, this.ab, this.o(0.5F));\\n b(merchantrecipelist, Item.aC.cv, this.ab, this.o(0.1F));\\n b(merchantrecipelist, Item.Y.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.aa.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.X.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.Z.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.at.cv, this.ab, this.o(0.3F));\\n b(merchantrecipelist, Item.bl.cv, this.ab, this.o(0.3F));\\n public void bT() {\\n public boolean bC() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -44,7 +44,7 @@ public EntityVillager(World world, int i0) {\\n this.c.a(2, new EntityAIMoveIndoors(this));\\n this.c.a(3, new EntityAIRestrictOpenDoor(this));\\n this.c.a(4, new EntityAIOpenDoor(this, true));\\n- this.c.a(5, new EntityAIMoveTwardsRestriction(this, 0.6D));\\n+ this.c.a(5, new EntityAIMoveTowardsRestriction(this, 0.6D));\\n this.c.a(6, new EntityAIVillagerMate(this));\\n this.c.a(7, new EntityAIFollowGolem(this));\\n this.c.a(8, new EntityAIPlay(this, 0.32D));\\n@@ -55,22 +55,22 @@ public EntityVillager(World world, int i0) {\\n this.entity = new CanaryVillager(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.d).a(0.5D);\\n }\\n \\n- public boolean bb() {\\n+ public boolean be() {\\n return true;\\n }\\n \\n- protected void bg() {\\n+ protected void bj() {\\n if (--this.bq <= 0) {\\n this.q.A.a(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w));\\n this.bq = 70 + this.ab.nextInt(50);\\n this.bp = this.q.A.a(MathHelper.c(this.u), MathHelper.c(this.v), MathHelper.c(this.w), 32);\\n if (this.bp == null) {\\n- this.bN();\\n+ this.bR();\\n } else {\\n ChunkCoordinates chunkcoordinates = this.bp.a();\\n \\n@@ -82,7 +82,7 @@ protected void bg() {\\n }\\n }\\n \\n- if (!this.bS() && this.bv > 0) {\\n+ if (!this.bW() && this.bv > 0) {\\n --this.bv;\\n if (this.bv <= 0) {\\n if (this.bw) {\\n@@ -106,21 +106,21 @@ protected void bg() {\\n }\\n }\\n \\n- this.d(new PotionEffect(Potion.l.H, 200, 0));\\n+ this.c(new PotionEffect(Potion.l.H, 200, 0));\\n }\\n }\\n \\n- super.bg();\\n+ super.bj();\\n }\\n \\n public boolean a(EntityPlayer entityplayer) {\\n ItemStack itemstack = entityplayer.bn.h();\\n boolean flag0 = itemstack != null && itemstack.d == Item.bE.cv;\\n \\n- if (!flag0 && this.R() && !this.bS() && !this.g_()) {\\n+ if (!flag0 && this.S() && !this.bW() && !this.g_()) {\\n if (!this.q.I) {\\n this.a_(entityplayer);\\n- entityplayer.a((IMerchant) this, this.bw());\\n+ entityplayer.a((IMerchant) this, this.bA());\\n }\\n \\n return true;\\n@@ -136,7 +136,7 @@ protected void a() {\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n super.b(nbttagcompound);\\n- nbttagcompound.a(\\\"Profession\\\", this.bP());\\n+ nbttagcompound.a(\\\"Profession\\\", this.bT());\\n nbttagcompound.a(\\\"Riches\\\", this.bx);\\n if (this.bu != null) {\\n nbttagcompound.a(\\\"Offers\\\", this.bu.a());\\n@@ -159,38 +159,38 @@ protected boolean t() {\\n }\\n \\n protected String r() {\\n- return this.bS() ? \\\"mob.villager.haggle\\\" : \\\"mob.villager.idle\\\";\\n+ return this.bW() ? \\\"mob.villager.haggle\\\" : \\\"mob.villager.idle\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.villager.hit\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.villager.death\\\";\\n }\\n \\n public void p(int i0) {\\n this.ah.b(16, Integer.valueOf(i0));\\n }\\n \\n- public int bP() {\\n+ public int bT() {\\n return this.ah.c(16);\\n }\\n \\n- public boolean bQ() {\\n+ public boolean bU() {\\n return this.br;\\n }\\n \\n- public void j(boolean flag0) {\\n+ public void i(boolean flag0) {\\n this.br = flag0;\\n }\\n \\n- public void k(boolean flag0) {\\n+ public void j(boolean flag0) {\\n this.bs = flag0;\\n }\\n \\n- public boolean bR() {\\n+ public boolean bV() {\\n return this.bs;\\n }\\n \\n@@ -206,7 +206,7 @@ public void b(EntityLivingBase entitylivingbase) {\\n }\\n \\n this.bp.a(((EntityPlayer) entitylivingbase).c_(), b0);\\n- if (this.R()) {\\n+ if (this.S()) {\\n this.q.a((Entity) this, (byte) 13);\\n }\\n }\\n@@ -243,14 +243,14 @@ public EntityPlayer m_() {\\n return this.bt;\\n }\\n \\n- public boolean bS() {\\n+ public boolean bW() {\\n return this.bt != null;\\n }\\n \\n public void a(MerchantRecipe merchantrecipe) {\\n merchantrecipe.f();\\n this.a_ = -this.o();\\n- this.a(\\\"mob.villager.yes\\\", this.aW(), this.aX());\\n+ this.a(\\\"mob.villager.yes\\\", this.aZ(), this.ba());\\n if (merchantrecipe.a((MerchantRecipe) this.bu.get(this.bu.size() - 1))) {\\n this.bv = 40;\\n this.bw = true;\\n@@ -270,9 +270,9 @@ public void a_(ItemStack itemstack) {\\n if (!this.q.I && this.a_ > -this.o() + 20) {\\n this.a_ = -this.o();\\n if (itemstack != null) {\\n- this.a(\\\"mob.villager.yes\\\", this.aW(), this.aX());\\n+ this.a(\\\"mob.villager.yes\\\", this.aZ(), this.ba());\\n } else {\\n- this.a(\\\"mob.villager.no\\\", this.aW(), this.aX());\\n+ this.a(\\\"mob.villager.no\\\", this.aZ(), this.ba());\\n }\\n }\\n }\\n@@ -285,7 +285,7 @@ public MerchantRecipeList b(EntityPlayer entityplayer) {\\n return this.bu;\\n }\\n \\n- private float o(float f0) {\\n+ private float p(float f0) {\\n float f1 = f0 + this.bA;\\n \\n return f1 > 0.9F ? 0.9F - (f1 - 0.9F) : f1;\\n@@ -303,34 +303,34 @@ private void q(int i0) {\\n merchantrecipelist = new MerchantRecipeList();\\n int i1;\\n \\n- label50: switch (this.bP()) {\\n+ label50: switch (this.bT()) {\\n case 0:\\n- a(merchantrecipelist, Item.V.cv, this.ab, this.o(0.9F));\\n- a(merchantrecipelist, Block.ag.cF, this.ab, this.o(0.5F));\\n- a(merchantrecipelist, Item.bm.cv, this.ab, this.o(0.5F));\\n- a(merchantrecipelist, Item.aX.cv, this.ab, this.o(0.4F));\\n- b(merchantrecipelist, Item.W.cv, this.ab, this.o(0.9F));\\n- b(merchantrecipelist, Item.bh.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.l.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.be.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.bg.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.k.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.bn.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.n.cv, this.ab, this.o(0.5F));\\n- if (this.ab.nextFloat() < this.o(0.5F)) {\\n+ a(merchantrecipelist, Item.V.cv, this.ab, this.p(0.9F));\\n+ a(merchantrecipelist, Block.ag.cF, this.ab, this.p(0.5F));\\n+ a(merchantrecipelist, Item.bm.cv, this.ab, this.p(0.5F));\\n+ a(merchantrecipelist, Item.aX.cv, this.ab, this.p(0.4F));\\n+ b(merchantrecipelist, Item.W.cv, this.ab, this.p(0.9F));\\n+ b(merchantrecipelist, Item.bh.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.l.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.be.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.bg.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.k.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.bn.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.n.cv, this.ab, this.p(0.5F));\\n+ if (this.ab.nextFloat() < this.p(0.5F)) {\\n merchantrecipelist.add(new MerchantRecipe(new ItemStack(Block.K, 10), new ItemStack(Item.bJ), new ItemStack(Item.ar.cv, 4 + this.ab.nextInt(2), 0)));\\n }\\n break;\\n \\n case 1:\\n- a(merchantrecipelist, Item.aM.cv, this.ab, this.o(0.8F));\\n- a(merchantrecipelist, Item.aN.cv, this.ab, this.o(0.8F));\\n- a(merchantrecipelist, Item.bI.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Block.as.cF, this.ab, this.o(0.8F));\\n- b(merchantrecipelist, Block.R.cF, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.aS.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.aU.cv, this.ab, this.o(0.2F));\\n- if (this.ab.nextFloat() < this.o(0.07F)) {\\n+ a(merchantrecipelist, Item.aM.cv, this.ab, this.p(0.8F));\\n+ a(merchantrecipelist, Item.aN.cv, this.ab, this.p(0.8F));\\n+ a(merchantrecipelist, Item.bI.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Block.as.cF, this.ab, this.p(0.8F));\\n+ b(merchantrecipelist, Block.R.cF, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.aS.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.aU.cv, this.ab, this.p(0.2F));\\n+ if (this.ab.nextFloat() < this.p(0.07F)) {\\n Enchantment enchantment = Enchantment.c[this.ab.nextInt(Enchantment.c.length)];\\n int i2 = MathHelper.a(this.ab, enchantment.d(), enchantment.b());\\n ItemStack itemstack = Item.bY.a(new EnchantmentData(enchantment, i2));\\n@@ -341,10 +341,10 @@ private void q(int i0) {\\n break;\\n \\n case 2:\\n- b(merchantrecipelist, Item.bC.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.bF.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.aE.cv, this.ab, this.o(0.4F));\\n- b(merchantrecipelist, Block.bi.cF, this.ab, this.o(0.3F));\\n+ b(merchantrecipelist, Item.bC.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.bF.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.aE.cv, this.ab, this.p(0.4F));\\n+ b(merchantrecipelist, Block.bi.cF, this.ab, this.p(0.3F));\\n int[] aint = new int[]{ Item.s.cv, Item.B.cv, Item.ag.cv, Item.ak.cv, Item.j.cv, Item.E.cv, Item.i.cv, Item.D.cv };\\n int[] aint1 = aint;\\n int i3 = aint.length;\\n@@ -358,53 +358,53 @@ private void q(int i0) {\\n \\n int i4 = aint1[i1];\\n \\n- if (this.ab.nextFloat() < this.o(0.05F)) {\\n+ if (this.ab.nextFloat() < this.p(0.05F)) {\\n merchantrecipelist.add(new MerchantRecipe(new ItemStack(i4, 1, 0), new ItemStack(Item.bJ, 2 + this.ab.nextInt(3), 0), EnchantmentHelper.a(this.ab, new ItemStack(i4, 1, 0), 5 + this.ab.nextInt(15))));\\n }\\n \\n ++i1;\\n }\\n \\n case 3:\\n- a(merchantrecipelist, Item.o.cv, this.ab, this.o(0.7F));\\n- a(merchantrecipelist, Item.q.cv, this.ab, this.o(0.5F));\\n- a(merchantrecipelist, Item.r.cv, this.ab, this.o(0.5F));\\n- a(merchantrecipelist, Item.p.cv, this.ab, this.o(0.5F));\\n- b(merchantrecipelist, Item.s.cv, this.ab, this.o(0.5F));\\n- b(merchantrecipelist, Item.B.cv, this.ab, this.o(0.5F));\\n- b(merchantrecipelist, Item.j.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.E.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.i.cv, this.ab, this.o(0.5F));\\n- b(merchantrecipelist, Item.D.cv, this.ab, this.o(0.5F));\\n- b(merchantrecipelist, Item.h.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.C.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.R.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.S.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.ai.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.am.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.af.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.aj.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.ag.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.ak.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.ah.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.al.cv, this.ab, this.o(0.2F));\\n- b(merchantrecipelist, Item.ae.cv, this.ab, this.o(0.1F));\\n- b(merchantrecipelist, Item.ab.cv, this.ab, this.o(0.1F));\\n- b(merchantrecipelist, Item.ac.cv, this.ab, this.o(0.1F));\\n- b(merchantrecipelist, Item.ad.cv, this.ab, this.o(0.1F));\\n+ a(merchantrecipelist, Item.o.cv, this.ab, this.p(0.7F));\\n+ a(merchantrecipelist, Item.q.cv, this.ab, this.p(0.5F));\\n+ a(merchantrecipelist, Item.r.cv, this.ab, this.p(0.5F));\\n+ a(merchantrecipelist, Item.p.cv, this.ab, this.p(0.5F));\\n+ b(merchantrecipelist, Item.s.cv, this.ab, this.p(0.5F));\\n+ b(merchantrecipelist, Item.B.cv, this.ab, this.p(0.5F));\\n+ b(merchantrecipelist, Item.j.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.E.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.i.cv, this.ab, this.p(0.5F));\\n+ b(merchantrecipelist, Item.D.cv, this.ab, this.p(0.5F));\\n+ b(merchantrecipelist, Item.h.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.C.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.R.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.S.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.ai.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.am.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.af.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.aj.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.ag.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.ak.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.ah.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.al.cv, this.ab, this.p(0.2F));\\n+ b(merchantrecipelist, Item.ae.cv, this.ab, this.p(0.1F));\\n+ b(merchantrecipelist, Item.ab.cv, this.ab, this.p(0.1F));\\n+ b(merchantrecipelist, Item.ac.cv, this.ab, this.p(0.1F));\\n+ b(merchantrecipelist, Item.ad.cv, this.ab, this.p(0.1F));\\n break;\\n \\n case 4:\\n- a(merchantrecipelist, Item.o.cv, this.ab, this.o(0.7F));\\n- a(merchantrecipelist, Item.as.cv, this.ab, this.o(0.5F));\\n- a(merchantrecipelist, Item.bk.cv, this.ab, this.o(0.5F));\\n- b(merchantrecipelist, Item.aC.cv, this.ab, this.o(0.1F));\\n- b(merchantrecipelist, Item.Y.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.aa.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.X.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.Z.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.at.cv, this.ab, this.o(0.3F));\\n- b(merchantrecipelist, Item.bl.cv, this.ab, this.o(0.3F));\\n+ a(merchantrecipelist, Item.o.cv, this.ab, this.p(0.7F));\\n+ a(merchantrecipelist, Item.as.cv, this.ab, this.p(0.5F));\\n+ a(merchantrecipelist, Item.bk.cv, this.ab, this.p(0.5F));\\n+ b(merchantrecipelist, Item.aC.cv, this.ab, this.p(0.1F));\\n+ b(merchantrecipelist, Item.Y.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.aa.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.X.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.Z.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.at.cv, this.ab, this.p(0.3F));\\n+ b(merchantrecipelist, Item.bl.cv, this.ab, this.p(0.3F));\\n }\\n \\n if (merchantrecipelist.isEmpty()) {\\n@@ -473,7 +473,7 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\\n return entitylivingdata;\\n }\\n \\n- public void bT() {\\n+ public void bX() {\\n this.bz = true;\\n }\\n \\n@@ -484,7 +484,7 @@ public EntityVillager b(EntityAgeable entityageable) {\\n return entityvillager;\\n }\\n \\n- public boolean bC() {\\n+ public boolean bG() {\\n return false;\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityVillager.java\",\n \"sha\": \"39e2c2294a36e4b1f9721b55232ff15b40f5ece8\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 16,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitch.java\",\n \"changes\": 32,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitch.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 16,\n \"filename\": \"src/main/java/net/minecraft/server/EntityWitch.java\",\n \"new_code\": \" protected String aN() {\\n protected String aO() {\\n public boolean bT() {\\n protected void ay() {\\n super.ay();\\n public boolean be() {\\n if (this.bT()) {\\n ItemStack itemstack = this.aY();\\n this.c(new PotionEffect(potioneffect));\\n if (this.ab.nextFloat() < 0.15F && this.ae() && !this.a(Potion.n)) {\\n } else if (this.ab.nextFloat() < 0.05F && this.aM() < this.aS()) {\\n } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e(this) > 121.0D) {\\n } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e(this) > 121.0D) {\\n this.bs = this.aY().n();\\n if (!this.bT()) {\\n } else if (entitylivingbase.aM() >= 8.0F && !entitylivingbase.a(Potion.u)) {\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWitch.java\",\n \"implementation\": \"protected String aO() {\\n public boolean bT() {\\n protected void ay() {\\n super.ay();\\n public boolean be() {\\n if (this.bT()) {\\n ItemStack itemstack = this.aY();\\n this.c(new PotionEffect(potioneffect));\\n if (this.ab.nextFloat() < 0.15F && this.ae() && !this.a(Potion.n)) {\",\n \"signature\": \"String aN()\"\n }\n ],\n \"old_code\": \" protected String aK() {\\n protected String aL() {\\n public boolean bP() {\\n protected void ax() {\\n super.ax();\\n public boolean bb() {\\n if (this.bP()) {\\n ItemStack itemstack = this.aV();\\n this.d(new PotionEffect(potioneffect));\\n if (this.ab.nextFloat() < 0.15F && this.ad() && !this.a(Potion.n)) {\\n } else if (this.ab.nextFloat() < 0.05F && this.aJ() < this.aP()) {\\n } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e((Entity) this) > 121.0D) {\\n } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e((Entity) this) > 121.0D) {\\n this.bs = this.aV().n();\\n if (!this.bP()) {\\n } else if (entitylivingbase.aJ() >= 8.0F && !entitylivingbase.a(Potion.u)) {\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWitch.java\",\n \"implementation\": \"protected String aL() {\\n public boolean bP() {\\n protected void ax() {\\n super.ax();\\n public boolean bb() {\\n if (this.bP()) {\\n ItemStack itemstack = this.aV();\\n this.d(new PotionEffect(potioneffect));\\n if (this.ab.nextFloat() < 0.15F && this.ad() && !this.a(Potion.n)) {\",\n \"signature\": \"String aK()\"\n }\n ],\n \"patch\": \"@@ -33,38 +33,38 @@ protected String r() {\\n return \\\"mob.witch.idle\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.witch.hurt\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.witch.death\\\";\\n }\\n \\n public void a(boolean flag0) {\\n this.u().b(21, Byte.valueOf((byte) (flag0 ? 1 : 0)));\\n }\\n \\n- public boolean bP() {\\n+ public boolean bT() {\\n return this.u().a(21) == 1;\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(26.0D);\\n this.a(SharedMonsterAttributes.d).a(0.25D);\\n }\\n \\n- public boolean bb() {\\n+ public boolean be() {\\n return true;\\n }\\n \\n public void c() {\\n if (!this.q.I) {\\n- if (this.bP()) {\\n+ if (this.bT()) {\\n if (this.bs-- <= 0) {\\n this.a(false);\\n- ItemStack itemstack = this.aV();\\n+ ItemStack itemstack = this.aY();\\n \\n this.c(0, (ItemStack) null);\\n if (itemstack != null && itemstack.d == Item.bu.cv) {\\n@@ -76,7 +76,7 @@ public void c() {\\n while (iterator.hasNext()) {\\n PotionEffect potioneffect = (PotionEffect) iterator.next();\\n \\n- this.d(new PotionEffect(potioneffect));\\n+ this.c(new PotionEffect(potioneffect));\\n }\\n }\\n }\\n@@ -86,19 +86,19 @@ public void c() {\\n } else {\\n short short1 = -1;\\n \\n- if (this.ab.nextFloat() < 0.15F && this.ad() && !this.a(Potion.n)) {\\n+ if (this.ab.nextFloat() < 0.15F && this.ae() && !this.a(Potion.n)) {\\n short1 = 16307;\\n- } else if (this.ab.nextFloat() < 0.05F && this.aJ() < this.aP()) {\\n+ } else if (this.ab.nextFloat() < 0.05F && this.aM() < this.aS()) {\\n short1 = 16341;\\n- } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e((Entity) this) > 121.0D) {\\n+ } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e(this) > 121.0D) {\\n short1 = 16274;\\n- } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e((Entity) this) > 121.0D) {\\n+ } else if (this.ab.nextFloat() < 0.25F && this.m() != null && !this.a(Potion.c) && this.m().e(this) > 121.0D) {\\n short1 = 16274;\\n }\\n \\n if (short1 > -1) {\\n this.c(0, new ItemStack(Item.bu, 1, short1));\\n- this.bs = this.aV().n();\\n+ this.bs = this.aY().n();\\n this.a(true);\\n AttributeInstance attributeinstance = this.a(SharedMonsterAttributes.d);\\n \\n@@ -146,7 +146,7 @@ protected void b(boolean flag0, int i0) {\\n }\\n \\n public void a(EntityLivingBase entitylivingbase, float f0) {\\n- if (!this.bP()) {\\n+ if (!this.bT()) {\\n EntityPotion entitypotion = new EntityPotion(this.q, this, 32732);\\n \\n entitypotion.B -= -20.0F;\\n@@ -157,7 +157,7 @@ public void a(EntityLivingBase entitylivingbase, float f0) {\\n \\n if (f1 >= 8.0F && !entitylivingbase.a(Potion.d)) {\\n entitypotion.a(32698);\\n- } else if (entitylivingbase.aJ() >= 8.0F && !entitylivingbase.a(Potion.u)) {\\n+ } else if (entitylivingbase.aM() >= 8.0F && !entitylivingbase.a(Potion.u)) {\\n entitypotion.a(32660);\\n } else if (f1 <= 3.0F && !entitylivingbase.a(Potion.t) && this.ab.nextFloat() < 0.25F) {\\n entitypotion.a(32696);\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitch.java\",\n \"sha\": \"0554d920941364aac03d7a30e054f36b0f818ffa\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 31,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWither.java\",\n \"changes\": 64,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWither.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 33,\n \"filename\": \"src/main/java/net/minecraft/server/EntityWither.java\",\n \"new_code\": \" this.g(this.aS());\\n this.entity = new CanaryWither(this); // CanaryMod: Wrap Entity\\n nbttagcompound.a(\\\"Invul\\\", this.bU());\\n protected String aN() {\\n protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {}\\n public int aP() {\\n if (this.aq()) {\\n } else if (this.bU() > 0) {\\n if (this.bV()) {\\n if (entity != null && !(entity instanceof EntityPlayer) && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).aX() == this.aX()) {\\n protected void bo() {\\n public void c(PotionEffect potioneffect) {}\\n protected boolean be() {\\n protected void ay() {\\n super.ay();\\n public int bU() {\\n public boolean bV() {\\n return this.aM() <= this.aS() / 2.0F;\\n public EnumCreatureAttribute aX() {\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWither.java\",\n \"implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"signature\": \"String aN()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWither.java\",\n \"implementation\": \"if (this.aq()) {\",\n \"signature\": \"int aP()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWither.java\",\n \"implementation\": \"public void c(PotionEffect potioneffect) {\",\n \"signature\": \"void bo()\"\n }\n ],\n \"old_code\": \"\\n\\n this.g(this.aP());\\nthis.entity = new CanaryWither(this); // CanaryMod: Wrap Entity\\n nbttagcompound.a(\\\"Invul\\\", this.bQ());\\n protected String aK() {\\n protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {}\\n public int aM() {\\n if (this.ap()) {\\n } else if (this.bQ() > 0) {\\n if (this.bR()) {\\n if (entity != null && !(entity instanceof EntityPlayer) && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).aU() == this.aU()) {\\n protected void bk() {\\n public void d(PotionEffect potioneffect) {}\\n protected boolean bb() {\\n protected void ax() {\\n super.ax();\\n public int bQ() {\\n public boolean bR() {\\n return this.aJ() <= this.aP() / 2.0F;\\n public EnumCreatureAttribute aU() {\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWither.java\",\n \"implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"signature\": \"String aK()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWither.java\",\n \"implementation\": \"if (this.ap()) {\",\n \"signature\": \"int aM()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWither.java\",\n \"implementation\": \"public void d(PotionEffect potioneffect) {\",\n \"signature\": \"void bk()\"\n }\n ],\n \"patch\": \"@@ -1,10 +1,8 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.List;\\n import net.canarymod.api.entity.living.monster.CanaryWither;\\n \\n-\\n public class EntityWither extends EntityMob implements IRangedAttackMob {\\n \\n private float[] bp = new float[2];\\n@@ -18,7 +16,7 @@ public class EntityWither extends EntityMob implements IRangedAttackMob {\\n \\n public EntityWither(World world) {\\n super(world);\\n- this.g(this.aP());\\n+ this.g(this.aS());\\n this.a(0.9F, 4.0F);\\n this.ag = true;\\n this.k().e(true);\\n@@ -30,7 +28,7 @@ public EntityWither(World world) {\\n this.d.a(1, new EntityAIHurtByTarget(this, false));\\n this.d.a(2, new EntityAINearestAttackableTarget(this, EntityLiving.class, 0, false, false, bw));\\n this.b = 50;\\n-this.entity = new CanaryWither(this); // CanaryMod: Wrap Entity\\n+ this.entity = new CanaryWither(this); // CanaryMod: Wrap Entity\\n }\\n \\n protected void a() {\\n@@ -43,7 +41,7 @@ protected void a() {\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n super.b(nbttagcompound);\\n- nbttagcompound.a(\\\"Invul\\\", this.bQ());\\n+ nbttagcompound.a(\\\"Invul\\\", this.bU());\\n }\\n \\n public void a(NBTTagCompound nbttagcompound) {\\n@@ -55,11 +53,11 @@ protected String r() {\\n return \\\"mob.wither.idle\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.wither.hurt\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.wither.death\\\";\\n }\\n \\n@@ -73,7 +71,7 @@ public void c() {\\n Entity entity = this.q.a(this.q(0));\\n \\n if (entity != null) {\\n- if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n+ if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n if (this.y < 0.0D) {\\n this.y = 0.0D;\\n }\\n@@ -134,7 +132,7 @@ public void c() {\\n }\\n }\\n \\n- boolean flag0 = this.bR();\\n+ boolean flag0 = this.bV();\\n \\n for (i1 = 0; i1 < 3; ++i1) {\\n double d8 = this.r(i1);\\n@@ -147,18 +145,18 @@ public void c() {\\n }\\n }\\n \\n- if (this.bQ() > 0) {\\n+ if (this.bU() > 0) {\\n for (i1 = 0; i1 < 3; ++i1) {\\n this.q.a(\\\"mobSpell\\\", this.u + this.ab.nextGaussian() * 1.0D, this.v + (double) (this.ab.nextFloat() * 3.3F), this.w + this.ab.nextGaussian() * 1.0D, 0.699999988079071D, 0.699999988079071D, 0.8999999761581421D);\\n }\\n }\\n }\\n \\n- protected void be() {\\n+ protected void bh() {\\n int i0;\\n \\n- if (this.bQ() > 0) {\\n- i0 = this.bQ() - 1;\\n+ if (this.bU() > 0) {\\n+ i0 = this.bU() - 1;\\n if (i0 <= 0) {\\n this.q.a(this, this.u, this.v + (double) this.f(), this.w, 7.0F, false, this.q.O().b(\\\"mobGriefing\\\"));\\n this.q.d(1013, (int) this.u, (int) this.v, (int) this.w, 0);\\n@@ -169,7 +167,7 @@ protected void be() {\\n this.f(10.0F);\\n }\\n } else {\\n- super.be();\\n+ super.bh();\\n \\n int i1;\\n \\n@@ -197,7 +195,7 @@ protected void be() {\\n if (i1 > 0) {\\n Entity entity = this.q.a(i1);\\n \\n- if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n+ if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n this.a(i0 + 1, (EntityLivingBase) entity);\\n this.bt[i0 - 1] = this.ac + 40 + this.ab.nextInt(20);\\n this.bu[i0 - 1] = 0;\\n@@ -210,7 +208,7 @@ protected void be() {\\n for (int i4 = 0; i4 < 10 && !list.isEmpty(); ++i4) {\\n EntityLivingBase entitylivingbase = (EntityLivingBase) list.get(this.ab.nextInt(list.size()));\\n \\n- if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n+ if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n if (entitylivingbase instanceof EntityPlayer) {\\n if (!((EntityPlayer) entitylivingbase).bG.a) {\\n this.c(i0, entitylivingbase.k);\\n@@ -268,14 +266,14 @@ protected void be() {\\n }\\n }\\n \\n- public void bP() {\\n+ public void bT() {\\n this.p(220);\\n- this.g(this.aP() / 3.0F);\\n+ this.g(this.aS() / 3.0F);\\n }\\n \\n- public void ak() {}\\n+ public void al() {}\\n \\n- public int aM() {\\n+ public int aP() {\\n return 4;\\n }\\n \\n@@ -348,24 +346,24 @@ public void a(EntityLivingBase entitylivingbase, float f0) {\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else if (damagesource == DamageSource.e) {\\n return false;\\n- } else if (this.bQ() > 0) {\\n+ } else if (this.bU() > 0) {\\n return false;\\n } else {\\n Entity entity;\\n \\n- if (this.bR()) {\\n+ if (this.bV()) {\\n entity = damagesource.h();\\n if (entity instanceof EntityArrow) {\\n return false;\\n }\\n }\\n \\n entity = damagesource.i();\\n- if (entity != null && !(entity instanceof EntityPlayer) && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).aU() == this.aU()) {\\n+ if (entity != null && !(entity instanceof EntityPlayer) && entity instanceof EntityLivingBase && ((EntityLivingBase) entity).aX() == this.aX()) {\\n return false;\\n } else {\\n if (this.bv <= 0) {\\n@@ -385,7 +383,7 @@ protected void b(boolean flag0, int i0) {\\n this.b(Item.bU.cv, 1);\\n }\\n \\n- protected void bk() {\\n+ protected void bo() {\\n this.aV = 0;\\n }\\n \\n@@ -395,20 +393,20 @@ public boolean K() {\\n \\n protected void b(float f0) {}\\n \\n- public void d(PotionEffect potioneffect) {}\\n+ public void c(PotionEffect potioneffect) {}\\n \\n- protected boolean bb() {\\n+ protected boolean be() {\\n return true;\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.a).a(300.0D);\\n this.a(SharedMonsterAttributes.d).a(0.6000000238418579D);\\n this.a(SharedMonsterAttributes.b).a(40.0D);\\n }\\n \\n- public int bQ() {\\n+ public int bU() {\\n return this.ah.c(20);\\n }\\n \\n@@ -424,11 +422,11 @@ public void c(int i0, int i1) {\\n this.ah.b(17 + i0, Integer.valueOf(i1));\\n }\\n \\n- public boolean bR() {\\n- return this.aJ() <= this.aP() / 2.0F;\\n+ public boolean bV() {\\n+ return this.aM() <= this.aS() / 2.0F;\\n }\\n \\n- public EnumCreatureAttribute aU() {\\n+ public EnumCreatureAttribute aX() {\\n return EnumCreatureAttribute.b;\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWither.java\",\n \"sha\": \"5ab1823477cb703ae7649effb70e145153148726\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitherSkull.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitherSkull.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/EntityWitherSkull.java\",\n \"new_code\": \" public boolean ae() {\\n if (movingobjectposition.g.a(DamageSource.a(this.a), 8.0F) && !movingobjectposition.g.S()) {\\n ((EntityLivingBase) movingobjectposition.g).c(new PotionEffect(Potion.v.H, 20 * b0, 1));\",\n \"new_methods\": [],\n \"old_code\": \" public boolean ad() {\\n if (movingobjectposition.g.a(DamageSource.a(this.a), 8.0F) && !movingobjectposition.g.R()) {\\n ((EntityLivingBase) movingobjectposition.g).d(new PotionEffect(Potion.v.H, 20 * b0, 1));\",\n \"old_methods\": [],\n \"patch\": \"@@ -20,7 +20,7 @@ public float c() {\\n return /* this.d() ? 0.73F : */super.c(); // CanaryMod: Motion Factor was made configurable\\n }\\n \\n- public boolean ad() {\\n+ public boolean ae() {\\n return false;\\n }\\n \\n@@ -38,7 +38,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\\n if (!this.q.I) {\\n if (movingobjectposition.g != null) {\\n if (this.a != null) {\\n- if (movingobjectposition.g.a(DamageSource.a(this.a), 8.0F) && !movingobjectposition.g.R()) {\\n+ if (movingobjectposition.g.a(DamageSource.a(this.a), 8.0F) && !movingobjectposition.g.S()) {\\n this.a.f(5.0F);\\n }\\n } else {\\n@@ -57,7 +57,7 @@ protected void a(MovingObjectPosition movingobjectposition) {\\n }\\n \\n if (b0 > 0) {\\n- ((EntityLivingBase) movingobjectposition.g).d(new PotionEffect(Potion.v.H, 20 * b0, 1));\\n+ ((EntityLivingBase) movingobjectposition.g).c(new PotionEffect(Potion.v.H, 20 * b0, 1));\\n }\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWitherSkull.java\",\n \"sha\": \"b2024c83cdc6f2f23621fb612c62b3e834f08bbd\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 66,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWolf.java\",\n \"changes\": 129,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWolf.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 63,\n \"filename\": \"src/main/java/net/minecraft/server/EntityWolf.java\",\n \"new_code\": \" this.j(false);\\n protected void ay() {\\n super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\\n } else if (!this.bT()) {\\n this.l(true);\\n protected void bj() {\\n this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\\n } else if (itemstack != null && itemstack.d == Item.aZ.cv && !this.cc()) {\\n this.j(true);\\n this.d((EntityLivingBase) null);\\n this.i(true);\\n this.i(false);\\n public int bv() {\\n public boolean cc() {\\n public void l(boolean flag0) {\\n public int cd() {\\n entitywolf.j(true);\\n public void m(boolean flag0) {\\n } else if (!this.bT()) {\\n return !entitywolf.bT() ? false : (entitywolf.bU() ? false : this.bY() && entitywolf.bY());\\n public boolean ce() {\\n return !this.bT() && this.ac > 2400;\\n }\\n\\n public boolean a(EntityLivingBase entitylivingbase, EntityLivingBase entitylivingbase1) {\\n if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\\n if (entitylivingbase instanceof EntityWolf) {\\n EntityWolf entitywolf = (EntityWolf) entitylivingbase;\\n\\n if (entitywolf.bT() && entitywolf.bV() == entitylivingbase1) {\\n return false;\\n }\\n }\\n\\n return entitylivingbase instanceof EntityPlayer && entitylivingbase1 instanceof EntityPlayer && !((EntityPlayer) entitylivingbase1).a((EntityPlayer) entitylivingbase) ? false : !(entitylivingbase instanceof EntityHorse) || !((EntityHorse) entitylivingbase).bW();\\n } else {\\n return false;\\n }\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWolf.java\",\n \"implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"signature\": \"void ay()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWolf.java\",\n \"implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"signature\": \"void bj()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWolf.java\",\n \"implementation\": \"public boolean cc() {\\n public void l(boolean flag0) {\\n public int cd() {\\n entitywolf.j(true);\\n public void m(boolean flag0) {\",\n \"signature\": \"int bv()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWolf.java\",\n \"implementation\": \"return !this.bT() && this.ac > 2400;\",\n \"signature\": \"boolean ce()\"\n },\n {\n \"arguments\": [\n \"EntityLivingBase entitylivingbase\",\n \" EntityLivingBase entitylivingbase1\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWolf.java\",\n \"implementation\": \"if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\\n if (entitylivingbase instanceof EntityWolf) {\\n EntityWolf entitywolf = (EntityWolf) entitylivingbase;\\n\\n if (entitywolf.bT() && entitywolf.bV() == entitylivingbase1) {\\n return false;\",\n \"signature\": \"boolean a(EntityLivingBase entitylivingbase, EntityLivingBase entitylivingbase1)\"\n }\n ],\n \"old_code\": \"\\n this.k(false);\\n protected void ax() {\\n super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\\n }\\n\\n this.m(false);\\n List list = this.q.a(this.getClass(), AxisAlignedBB.a().a(this.u, this.v, this.w, this.u + 1.0D, this.v + 1.0D, this.w + 1.0D).b(16.0D, 10.0D, 16.0D));\\n Iterator iterator = list.iterator();\\n\\n while (iterator.hasNext()) {\\n EntityWolf entitywolf = (EntityWolf) iterator.next();\\n\\n if (this != entitywolf) {\\n entitywolf.m(false);\\n }\\n }\\n } else {\\n this.m(true);\\n protected void bg() {\\n this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\\n } else if (itemstack != null && itemstack.d == Item.aZ.cv && !this.bY()) {\\n this.k(true);\\n this.c((EntityLivingBase) null);\\n this.j(true);\\n this.j(false);\\n public int br() {\\n public boolean bY() {\\n public void m(boolean flag0) {\\n public int bZ() {\\n entitywolf.k(true);\\n public void n(boolean flag0) {\\n } else if (!this.bP()) {\\n return !entitywolf.bP() ? false : (entitywolf.bQ() ? false : this.bU() && entitywolf.bU());\\n public boolean ca() {\\n return !this.bP() && this.ac > 2400;\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWolf.java\",\n \"implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"signature\": \"void ax()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWolf.java\",\n \"implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"signature\": \"void bg()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityWolf.java\",\n \"implementation\": \"public boolean bY() {\\n public void m(boolean flag0) {\\n public int bZ() {\\n entitywolf.k(true);\\n public void n(boolean flag0) {\",\n \"signature\": \"int br()\"\n }\n ],\n \"patch\": \"@@ -5,7 +5,6 @@\\n import net.canarymod.api.entity.living.animal.CanaryWolf;\\n import net.canarymod.hook.entity.EntityTameHook;\\n \\n-\\n public class EntityWolf extends EntityTameable {\\n \\n private float bq;\\n@@ -33,54 +32,40 @@ public EntityWolf(World world) {\\n this.d.a(2, new EntityAIOwnerHurtTarget(this));\\n this.d.a(3, new EntityAIHurtByTarget(this, true));\\n this.d.a(4, new EntityAITargetNonTamed(this, EntitySheep.class, 200, false));\\n- this.k(false);\\n+ this.j(false);\\n this.entity = new CanaryWolf(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.d).a(0.30000001192092896D);\\n- if (this.bP()) {\\n+ if (this.bT()) {\\n this.a(SharedMonsterAttributes.a).a(20.0D);\\n } else {\\n this.a(SharedMonsterAttributes.a).a(8.0D);\\n }\\n }\\n \\n- public boolean bb() {\\n+ public boolean be() {\\n return true;\\n }\\n \\n- public void c(EntityLivingBase entitylivingbase) {\\n- super.c(entitylivingbase);\\n+ public void d(EntityLivingBase entitylivingbase) {\\n+ super.d(entitylivingbase);\\n if (entitylivingbase == null) {\\n- if (!this.bY()) {\\n- return;\\n- }\\n-\\n- this.m(false);\\n- List list = this.q.a(this.getClass(), AxisAlignedBB.a().a(this.u, this.v, this.w, this.u + 1.0D, this.v + 1.0D, this.w + 1.0D).b(16.0D, 10.0D, 16.0D));\\n- Iterator iterator = list.iterator();\\n-\\n- while (iterator.hasNext()) {\\n- EntityWolf entitywolf = (EntityWolf) iterator.next();\\n-\\n- if (this != entitywolf) {\\n- entitywolf.m(false);\\n- }\\n- }\\n- } else {\\n- this.m(true);\\n+ this.l(false);\\n+ } else if (!this.bT()) {\\n+ this.l(true);\\n }\\n }\\n \\n- protected void bg() {\\n- this.ah.b(18, Float.valueOf(this.aJ()));\\n+ protected void bj() {\\n+ this.ah.b(18, Float.valueOf(this.aM()));\\n }\\n \\n protected void a() {\\n super.a();\\n- this.ah.a(18, new Float(this.aJ()));\\n+ this.ah.a(18, new Float(this.aM()));\\n this.ah.a(19, new Byte((byte) 0));\\n this.ah.a(20, new Byte((byte) BlockColored.j_(1)));\\n }\\n@@ -91,31 +76,31 @@ protected void a(int i0, int i1, int i2, int i3) {\\n \\n public void b(NBTTagCompound nbttagcompound) {\\n super.b(nbttagcompound);\\n- nbttagcompound.a(\\\"Angry\\\", this.bY());\\n- nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n+ nbttagcompound.a(\\\"Angry\\\", this.cc());\\n+ nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n }\\n \\n public void a(NBTTagCompound nbttagcompound) {\\n super.a(nbttagcompound);\\n- this.m(nbttagcompound.n(\\\"Angry\\\"));\\n+ this.l(nbttagcompound.n(\\\"Angry\\\"));\\n if (nbttagcompound.b(\\\"CollarColor\\\")) {\\n this.p(nbttagcompound.c(\\\"CollarColor\\\"));\\n }\\n }\\n \\n protected String r() {\\n- return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n+ return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.wolf.hurt\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.wolf.death\\\";\\n }\\n \\n- protected float aW() {\\n+ protected float aZ() {\\n return 0.4F;\\n }\\n \\n@@ -125,7 +110,7 @@ protected int s() {\\n \\n public void c() {\\n super.c();\\n- if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n+ if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n this.bt = true;\\n this.bu = 0.0F;\\n this.bv = 0.0F;\\n@@ -136,13 +121,13 @@ public void c() {\\n public void l_() {\\n super.l_();\\n this.br = this.bq;\\n- if (this.ca()) {\\n+ if (this.ce()) {\\n this.bq += (1.0F - this.bq) * 0.4F;\\n } else {\\n this.bq += (0.0F - this.bq) * 0.4F;\\n }\\n \\n- if (this.ca()) {\\n+ if (this.ce()) {\\n this.g = 10;\\n }\\n \\n@@ -153,7 +138,7 @@ public void l_() {\\n this.bv = 0.0F;\\n } else if ((this.bs || this.bt) && this.bt) {\\n if (this.bu == 0.0F) {\\n- this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n+ this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n }\\n \\n this.bv = this.bu;\\n@@ -183,12 +168,12 @@ public float f() {\\n return this.P * 0.8F;\\n }\\n \\n- public int bl() {\\n- return this.bQ() ? 20 : super.bl();\\n+ public int bp() {\\n+ return this.bU() ? 20 : super.bp();\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n Entity entity = damagesource.i();\\n@@ -203,13 +188,13 @@ public boolean a(DamageSource damagesource, float f0) {\\n }\\n \\n public boolean m(Entity entity) {\\n- int i0 = this.bP() ? 4 : 2;\\n+ int i0 = this.bT() ? 4 : 2;\\n \\n return entity.a(DamageSource.a((EntityLivingBase) this), (float) i0);\\n }\\n \\n- public void k(boolean flag0) {\\n- super.k(flag0);\\n+ public void j(boolean flag0) {\\n+ super.j(flag0);\\n if (flag0) {\\n this.a(SharedMonsterAttributes.a).a(20.0D);\\n } else {\\n@@ -220,7 +205,7 @@ public void k(boolean flag0) {\\n public boolean a(EntityPlayer entityplayer) {\\n ItemStack itemstack = entityplayer.bn.h();\\n \\n- if (this.bP()) {\\n+ if (this.bT()) {\\n if (itemstack != null) {\\n if (Item.g[itemstack.d] instanceof ItemFood) {\\n ItemFood itemfood = (ItemFood) Item.g[itemstack.d];\\n@@ -240,7 +225,7 @@ public boolean a(EntityPlayer entityplayer) {\\n } else if (itemstack.d == Item.aY.cv) {\\n int i0 = BlockColored.j_(itemstack.k());\\n \\n- if (i0 != this.bZ()) {\\n+ if (i0 != this.cd()) {\\n this.p(i0);\\n if (!entityplayer.bG.d && --itemstack.b <= 0) {\\n entityplayer.bn.a(entityplayer.bn.c, (ItemStack) null);\\n@@ -252,11 +237,13 @@ public boolean a(EntityPlayer entityplayer) {\\n }\\n \\n if (entityplayer.c_().equalsIgnoreCase(this.h_()) && !this.q.I && !this.c(itemstack)) {\\n- this.bp.a(!this.bQ());\\n+ this.bp.a(!this.bU());\\n this.bd = false;\\n this.a((PathEntity) null);\\n+ this.b((Entity) null);\\n+ this.d((EntityLivingBase) null);\\n }\\n- } else if (itemstack != null && itemstack.d == Item.aZ.cv && !this.bY()) {\\n+ } else if (itemstack != null && itemstack.d == Item.aZ.cv && !this.cc()) {\\n if (!entityplayer.bG.d) {\\n --itemstack.b;\\n }\\n@@ -271,16 +258,16 @@ public boolean a(EntityPlayer entityplayer) {\\n \\n if (hook.isTamed() && !hook.isCanceled()) {\\n //\\n- this.k(true);\\n+ this.j(true);\\n this.a((PathEntity) null);\\n- this.c((EntityLivingBase) null);\\n+ this.d((EntityLivingBase) null);\\n this.bp.a(true);\\n this.g(20.0F);\\n this.b(entityplayer.c_());\\n- this.j(true);\\n+ this.i(true);\\n this.q.a((Entity) this, (byte) 7);\\n } else {\\n- this.j(false);\\n+ this.i(false);\\n this.q.a((Entity) this, (byte) 6);\\n }\\n }\\n@@ -295,15 +282,15 @@ public boolean c(ItemStack itemstack) {\\n return itemstack == null ? false : (!(Item.g[itemstack.d] instanceof ItemFood) ? false : ((ItemFood) Item.g[itemstack.d]).j());\\n }\\n \\n- public int br() {\\n+ public int bv() {\\n return 8;\\n }\\n \\n- public boolean bY() {\\n+ public boolean cc() {\\n return (this.ah.a(16) & 2) != 0;\\n }\\n \\n- public void m(boolean flag0) {\\n+ public void l(boolean flag0) {\\n byte b0 = this.ah.a(16);\\n \\n if (flag0) {\\n@@ -313,7 +300,7 @@ public void m(boolean flag0) {\\n }\\n }\\n \\n- public int bZ() {\\n+ public int cd() {\\n return this.ah.a(20) & 15;\\n }\\n \\n@@ -327,13 +314,13 @@ public EntityWolf b(EntityAgeable entityageable) {\\n \\n if (s0 != null && s0.trim().length() > 0) {\\n entitywolf.b(s0);\\n- entitywolf.k(true);\\n+ entitywolf.j(true);\\n }\\n \\n return entitywolf;\\n }\\n \\n- public void n(boolean flag0) {\\n+ public void m(boolean flag0) {\\n if (flag0) {\\n this.ah.b(19, Byte.valueOf((byte) 1));\\n } else {\\n@@ -344,23 +331,39 @@ public void n(boolean flag0) {\\n public boolean a(EntityAnimal entityanimal) {\\n if (entityanimal == this) {\\n return false;\\n- } else if (!this.bP()) {\\n+ } else if (!this.bT()) {\\n return false;\\n } else if (!(entityanimal instanceof EntityWolf)) {\\n return false;\\n } else {\\n EntityWolf entitywolf = (EntityWolf) entityanimal;\\n \\n- return !entitywolf.bP() ? false : (entitywolf.bQ() ? false : this.bU() && entitywolf.bU());\\n+ return !entitywolf.bT() ? false : (entitywolf.bU() ? false : this.bY() && entitywolf.bY());\\n }\\n }\\n \\n- public boolean ca() {\\n+ public boolean ce() {\\n return this.ah.a(19) == 1;\\n }\\n \\n protected boolean t() {\\n- return !this.bP() && this.ac > 2400;\\n+ return !this.bT() && this.ac > 2400;\\n+ }\\n+\\n+ public boolean a(EntityLivingBase entitylivingbase, EntityLivingBase entitylivingbase1) {\\n+ if (!(entitylivingbase instanceof EntityCreeper) && !(entitylivingbase instanceof EntityGhast)) {\\n+ if (entitylivingbase instanceof EntityWolf) {\\n+ EntityWolf entitywolf = (EntityWolf) entitylivingbase;\\n+\\n+ if (entitywolf.bT() && entitywolf.bV() == entitylivingbase1) {\\n+ return false;\\n+ }\\n+ }\\n+\\n+ return entitylivingbase instanceof EntityPlayer && entitylivingbase1 instanceof EntityPlayer && !((EntityPlayer) entitylivingbase1).a((EntityPlayer) entitylivingbase) ? false : !(entitylivingbase instanceof EntityHorse) || !((EntityHorse) entitylivingbase).bW();\\n+ } else {\\n+ return false;\\n+ }\\n }\\n \\n public EntityAgeable a(EntityAgeable entityageable) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityWolf.java\",\n \"sha\": \"ab5b2b5bc74ff968b9be22abbbbbc5c61025180d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityXPOrb.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityXPOrb.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/EntityXPOrb.java\",\n \"new_code\": \" if (this.aq()) {\\n public boolean ap() {\",\n \"new_methods\": [],\n \"old_code\": \" if (this.ap()) {\\n public boolean ao() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -116,7 +116,7 @@ protected void e(int i0) {\\n }\\n \\n public boolean a(DamageSource damagesource, float f0) {\\n- if (this.ap()) {\\n+ if (this.aq()) {\\n return false;\\n } else {\\n this.J();\\n@@ -161,7 +161,7 @@ public static int a(int i0) {\\n return i0 >= 2477 ? 2477 : (i0 >= 1237 ? 1237 : (i0 >= 617 ? 617 : (i0 >= 307 ? 307 : (i0 >= 149 ? 149 : (i0 >= 73 ? 73 : (i0 >= 37 ? 37 : (i0 >= 17 ? 17 : (i0 >= 7 ? 7 : (i0 >= 3 ? 3 : 1)))))))));\\n }\\n \\n- public boolean ao() {\\n+ public boolean ap() {\\n return false;\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityXPOrb.java\",\n \"sha\": \"e3450cbf1a977056f8669d577978bc25086f4ac1\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 54,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityZombie.java\",\n \"changes\": 96,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityZombie.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 42,\n \"filename\": \"src/main/java/net/minecraft/server/EntityZombie.java\",\n \"new_code\": \" private static final AttributeModifier br = new AttributeModifier(bq, \\\"Baby speed boost\\\", 0.5D, 1);\\n this.c.a(4, new EntityAIMoveTowardsRestriction(this, 1.0D));\\n protected void ay() {\\n super.ay();\\n this.aW().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\\n public int aP() {\\n int i0 = super.aP() + 2;\\n protected boolean be() {\\n public boolean bT() {\\n public void i(boolean flag0) {\\n if (entitylivingbase == null && this.bN() instanceof EntityLivingBase) {\\n entitylivingbase = (EntityLivingBase) this.bN();\\n entityzombie.d(entitylivingbase);\\n if (!this.q.I && this.bV()) {\\n int i0 = this.bX();\\n this.bW();\\n if (flag0 && this.aY() == null && this.ae() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\\n protected String aN() {\\n protected String aO() {\\n public EnumCreatureAttribute aX() {\\n protected void bw() {\\n super.bw();\\n if (this.bT()) {\\n nbttagcompound.a(\\\"ConversionTime\\\", this.bV() ? this.bs : -1);\\n this.i(true);\\n entityzombie.i(true);\\n Object object = super.a(entitylivingdata);\\n if (object == null) {\\n object = new EntityZombieGroupData(this, this.q.s.nextFloat() < 0.05F, this.q.s.nextFloat() < 0.05F, (EntityZombieINNER1) null);\\n if (object instanceof EntityZombieGroupData) {\\n EntityZombieGroupData entityzombiegroupdata = (EntityZombieGroupData) object;\\n\\n if (entityzombiegroupdata.b) {\\n this.i(true);\\n }\\n\\n if (entityzombiegroupdata.a) {\\n this.a(true);\\n }\\n }\\n\\n this.bw();\\n this.bx();\\n return (EntityLivingData) object;\\n ItemStack itemstack = entityplayer.bx();\\n if (itemstack != null && itemstack.b() == Item.av && itemstack.k() == 0 && this.bT() && this.a(Potion.t)) {\\n protected void a(int i0) {\\n this.c(new PotionEffect(Potion.g.H, i0, Math.min(this.q.r - 1, 0)));\\n return !this.bV();\\n public boolean bV() {\\n public void bW() { // CanaryMod: protected => public\\n entityvillager.bX();\\n entityvillager.c(new PotionEffect(Potion.k.H, 200, 0));\\n protected int bX() {\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/EntityZombie.java\",\n \"implementation\": \"super.ay();\\n this.aW().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\\n public int aP() {\\n int i0 = super.aP() + 2;\\n protected boolean be() {\\n public boolean bT() {\\n public void i(boolean flag0) {\\n if (entitylivingbase == null && this.bN() instanceof EntityLivingBase) {\\n entitylivingbase = (EntityLivingBase) this.bN();\\n entityzombie.d(entitylivingbase);\\n if (!this.q.I && this.bV()) {\\n int i0 = this.bX();\\n this.bW();\\n if (flag0 && this.aY() == null && this.ae() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\\n protected String aN() {\\n protected String aO() {\\n public EnumCreatureAttribute aX() {\\n protected void bw() {\\n super.bw();\\n if (this.bT()) {\\n nbttagcompound.a(\\\"ConversionTime\\\", this.bV() ? this.bs : -1);\\n this.i(true);\\n entityzombie.i(true);\\n Object object = super.a(entitylivingdata);\\n if (object == null) {\\n object = new EntityZombieGroupData(this, this.q.s.nextFloat() < 0.05F, this.q.s.nextFloat() < 0.05F, (EntityZombieINNER1) null);\\n if (object instanceof EntityZombieGroupData) {\\n EntityZombieGroupData entityzombiegroupdata = (EntityZombieGroupData) object;\\n\\n if (entityzombiegroupdata.b) {\\n this.i(true);\",\n \"signature\": \"void ay()\"\n }\n ],\n \"old_code\": \" private static final AttributeModifier br = new AttributeModifier(bq, \\\"Baby speed boost\\\", 0.5D, 0);\\n this.c.a(4, new EntityAIMoveTwardsRestriction(this, 1.0D));\\n protected void ax() {\\n super.ax();\\n this.aT().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\\n public int aM() {\\n int i0 = super.aM() + 2;\\n protected boolean bb() {\\n public boolean bP() {\\n public void j(boolean flag0) {\\n if (entitylivingbase == null && this.bJ() instanceof EntityLivingBase) {\\n entitylivingbase = (EntityLivingBase) this.bJ();\\n entityzombie.c(entitylivingbase);\\n if (!this.q.I && this.bR()) {\\n int i0 = this.bT();\\n this.bS();\\n if (flag0 && this.aV() == null && this.ad() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\\n protected String aK() {\\n protected String aL() {\\n public EnumCreatureAttribute aU() {\\n protected void bs() {\\n super.bs();\\n if (this.bP()) {\\n nbttagcompound.a(\\\"ConversionTime\\\", this.bR() ? this.bs : -1);\\n this.j(true);\\n entityzombie.j(true);\\n entitylivingdata = super.a(entitylivingdata);\\n if (this.q.s.nextFloat() < 0.05F) {\\n this.j(true);\\n this.bs();\\n this.bt();\\n return entitylivingdata;\\n ItemStack itemstack = entityplayer.bt();\\n if (itemstack != null && itemstack.b() == Item.av && itemstack.k() == 0 && this.bP() && this.a(Potion.t)) {\\n public void a(int i0) { // CanaryMod: protected => public\\n this.d(new PotionEffect(Potion.g.H, i0, Math.min(this.q.r - 1, 0)));\\n return !this.bR();\\n public boolean bR() {\\n public void bS() { // CanaryMod: protected => public\\n entityvillager.bT();\\n entityvillager.d(new PotionEffect(Potion.k.H, 200, 0));\\n protected int bT() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -8,7 +8,7 @@ public class EntityZombie extends EntityMob {\\n \\n protected static final Attribute bp = (new RangedAttribute(\\\"zombie.spawnReinforcements\\\", 0.0D, 0.0D, 1.0D)).a(\\\"Spawn Reinforcements Chance\\\");\\n private static final UUID bq = UUID.fromString(\\\"B9766B59-9566-4402-BC1F-2EE2A276D836\\\");\\n- private static final AttributeModifier br = new AttributeModifier(bq, \\\"Baby speed boost\\\", 0.5D, 0);\\n+ private static final AttributeModifier br = new AttributeModifier(bq, \\\"Baby speed boost\\\", 0.5D, 1);\\n private int bs;\\n \\n public EntityZombie(World world) {\\n@@ -18,7 +18,7 @@ public EntityZombie(World world) {\\n this.c.a(1, new EntityAIBreakDoor(this));\\n this.c.a(2, new EntityAIAttackOnCollide(this, EntityPlayer.class, 1.0D, false));\\n this.c.a(3, new EntityAIAttackOnCollide(this, EntityVillager.class, 1.0D, true));\\n- this.c.a(4, new EntityAIMoveTwardsRestriction(this, 1.0D));\\n+ this.c.a(4, new EntityAIMoveTowardsRestriction(this, 1.0D));\\n this.c.a(5, new EntityAIMoveThroughVillage(this, 1.0D, false));\\n this.c.a(6, new EntityAIWander(this, 1.0D));\\n this.c.a(7, new EntityAIWatchClosest(this, EntityPlayer.class, 8.0F));\\n@@ -29,12 +29,12 @@ public EntityZombie(World world) {\\n this.entity = new CanaryZombie(this); // CanaryMod: Wrap Entity\\n }\\n \\n- protected void ax() {\\n- super.ax();\\n+ protected void ay() {\\n+ super.ay();\\n this.a(SharedMonsterAttributes.b).a(40.0D);\\n this.a(SharedMonsterAttributes.d).a(0.23000000417232513D);\\n this.a(SharedMonsterAttributes.e).a(3.0D);\\n- this.aT().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\\n+ this.aW().b(bp).a(this.ab.nextDouble() * 0.10000000149011612D);\\n }\\n \\n protected void a() {\\n@@ -44,8 +44,8 @@ protected void a() {\\n this.u().a(14, Byte.valueOf((byte) 0));\\n }\\n \\n- public int aM() {\\n- int i0 = super.aM() + 2;\\n+ public int aP() {\\n+ int i0 = super.aP() + 2;\\n \\n if (i0 > 20) {\\n i0 = 20;\\n@@ -54,7 +54,7 @@ public int aM() {\\n return i0;\\n }\\n \\n- protected boolean bb() {\\n+ protected boolean be() {\\n return true;\\n }\\n \\n@@ -74,11 +74,11 @@ public void a(boolean flag0) {\\n }\\n }\\n \\n- public boolean bP() {\\n+ public boolean bT() {\\n return this.u().a(13) == 1;\\n }\\n \\n- public void j(boolean flag0) {\\n+ public void i(boolean flag0) {\\n this.u().b(13, Byte.valueOf((byte) (flag0 ? 1 : 0)));\\n }\\n \\n@@ -117,8 +117,8 @@ public boolean a(DamageSource damagesource, float f0) {\\n } else {\\n EntityLivingBase entitylivingbase = this.m();\\n \\n- if (entitylivingbase == null && this.bJ() instanceof EntityLivingBase) {\\n- entitylivingbase = (EntityLivingBase) this.bJ();\\n+ if (entitylivingbase == null && this.bN() instanceof EntityLivingBase) {\\n+ entitylivingbase = (EntityLivingBase) this.bN();\\n }\\n \\n if (entitylivingbase == null && damagesource.i() instanceof EntityLivingBase) {\\n@@ -140,7 +140,7 @@ public boolean a(DamageSource damagesource, float f0) {\\n entityzombie.b((double) i4, (double) i5, (double) i6);\\n if (this.q.b(entityzombie.E) && this.q.a((Entity) entityzombie, entityzombie.E).isEmpty() && !this.q.d(entityzombie.E)) {\\n this.q.d((Entity) entityzombie);\\n- entityzombie.c(entitylivingbase);\\n+ entityzombie.d(entitylivingbase);\\n entityzombie.a((EntityLivingData) null);\\n this.a(bp).a(new AttributeModifier(\\\"Zombie reinforcement caller charge\\\", -0.05000000074505806D, 0));\\n entityzombie.a(bp).a(new AttributeModifier(\\\"Zombie reinforcement callee charge\\\", -0.05000000074505806D, 0));\\n@@ -155,12 +155,12 @@ public boolean a(DamageSource damagesource, float f0) {\\n }\\n \\n public void l_() {\\n- if (!this.q.I && this.bR()) {\\n- int i0 = this.bT();\\n+ if (!this.q.I && this.bV()) {\\n+ int i0 = this.bX();\\n \\n this.bs -= i0;\\n if (this.bs <= 0) {\\n- this.bS();\\n+ this.bW();\\n }\\n }\\n \\n@@ -170,7 +170,7 @@ public void l_() {\\n public boolean m(Entity entity) {\\n boolean flag0 = super.m(entity);\\n \\n- if (flag0 && this.aV() == null && this.ad() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\\n+ if (flag0 && this.aY() == null && this.ae() && this.ab.nextFloat() < (float) this.q.r * 0.3F) {\\n entity.d(2 * this.q.r);\\n }\\n \\n@@ -181,11 +181,11 @@ protected String r() {\\n return \\\"mob.zombie.say\\\";\\n }\\n \\n- protected String aK() {\\n+ protected String aN() {\\n return \\\"mob.zombie.hurt\\\";\\n }\\n \\n- protected String aL() {\\n+ protected String aO() {\\n return \\\"mob.zombie.death\\\";\\n }\\n \\n@@ -197,7 +197,7 @@ protected int s() {\\n return Item.bo.cv;\\n }\\n \\n- public EnumCreatureAttribute aU() {\\n+ public EnumCreatureAttribute aX() {\\n return EnumCreatureAttribute.b;\\n }\\n \\n@@ -216,8 +216,8 @@ protected void l(int i0) {\\n }\\n }\\n \\n- protected void bs() {\\n- super.bs();\\n+ protected void bw() {\\n+ super.bw();\\n if (this.ab.nextFloat() < (this.q.r == 3 ? 0.05F : 0.01F)) {\\n int i0 = this.ab.nextInt(3);\\n \\n@@ -235,11 +235,11 @@ public void b(NBTTagCompound nbttagcompound) {\\n nbttagcompound.a(\\\"IsBaby\\\", true);\\n }\\n \\n- if (this.bP()) {\\n+ if (this.bT()) {\\n nbttagcompound.a(\\\"IsVillager\\\", true);\\n }\\n \\n- nbttagcompound.a(\\\"ConversionTime\\\", this.bR() ? this.bs : -1);\\n+ nbttagcompound.a(\\\"ConversionTime\\\", this.bV() ? this.bs : -1);\\n }\\n \\n public void a(NBTTagCompound nbttagcompound) {\\n@@ -249,7 +249,7 @@ public void a(NBTTagCompound nbttagcompound) {\\n }\\n \\n if (nbttagcompound.n(\\\"IsVillager\\\")) {\\n- this.j(true);\\n+ this.i(true);\\n }\\n \\n if (nbttagcompound.b(\\\"ConversionTime\\\") && nbttagcompound.e(\\\"ConversionTime\\\") > -1) {\\n@@ -269,7 +269,7 @@ public void a(EntityLivingBase entitylivingbase) {\\n entityzombie.j(entitylivingbase);\\n this.q.e((Entity) entitylivingbase);\\n entityzombie.a((EntityLivingData) null);\\n- entityzombie.j(true);\\n+ entityzombie.i(true);\\n if (entitylivingbase.g_()) {\\n entityzombie.a(true);\\n }\\n@@ -280,16 +280,28 @@ public void a(EntityLivingBase entitylivingbase) {\\n }\\n \\n public EntityLivingData a(EntityLivingData entitylivingdata) {\\n- entitylivingdata = super.a(entitylivingdata);\\n+ Object object = super.a(entitylivingdata);\\n float f0 = this.q.b(this.u, this.v, this.w);\\n \\n this.h(this.ab.nextFloat() < 0.55F * f0);\\n- if (this.q.s.nextFloat() < 0.05F) {\\n- this.j(true);\\n+ if (object == null) {\\n+ object = new EntityZombieGroupData(this, this.q.s.nextFloat() < 0.05F, this.q.s.nextFloat() < 0.05F, (EntityZombieINNER1) null);\\n }\\n \\n- this.bs();\\n- this.bt();\\n+ if (object instanceof EntityZombieGroupData) {\\n+ EntityZombieGroupData entityzombiegroupdata = (EntityZombieGroupData) object;\\n+\\n+ if (entityzombiegroupdata.b) {\\n+ this.i(true);\\n+ }\\n+\\n+ if (entityzombiegroupdata.a) {\\n+ this.a(true);\\n+ }\\n+ }\\n+\\n+ this.bw();\\n+ this.bx();\\n if (this.n(4) == null) {\\n Calendar calendar = this.q.W();\\n \\n@@ -306,13 +318,13 @@ public EntityLivingData a(EntityLivingData entitylivingdata) {\\n this.a(SharedMonsterAttributes.a).a(new AttributeModifier(\\\"Leader zombie bonus\\\", this.ab.nextDouble() * 3.0D + 1.0D, 2));\\n }\\n \\n- return entitylivingdata;\\n+ return (EntityLivingData) object;\\n }\\n \\n public boolean a(EntityPlayer entityplayer) {\\n- ItemStack itemstack = entityplayer.bt();\\n+ ItemStack itemstack = entityplayer.bx();\\n \\n- if (itemstack != null && itemstack.b() == Item.av && itemstack.k() == 0 && this.bP() && this.a(Potion.t)) {\\n+ if (itemstack != null && itemstack.b() == Item.av && itemstack.k() == 0 && this.bT() && this.a(Potion.t)) {\\n if (!entityplayer.bG.d) {\\n --itemstack.b;\\n }\\n@@ -331,39 +343,39 @@ public boolean a(EntityPlayer entityplayer) {\\n }\\n }\\n \\n- public void a(int i0) { // CanaryMod: protected => public\\n+ protected void a(int i0) {\\n this.bs = i0;\\n this.u().b(14, Byte.valueOf((byte) 1));\\n this.k(Potion.t.H);\\n- this.d(new PotionEffect(Potion.g.H, i0, Math.min(this.q.r - 1, 0)));\\n+ this.c(new PotionEffect(Potion.g.H, i0, Math.min(this.q.r - 1, 0)));\\n this.q.a((Entity) this, (byte) 16);\\n }\\n \\n protected boolean t() {\\n- return !this.bR();\\n+ return !this.bV();\\n }\\n \\n- public boolean bR() {\\n+ public boolean bV() {\\n return this.u().a(14) == 1;\\n }\\n \\n- public void bS() { // CanaryMod: protected => public\\n+ public void bW() { // CanaryMod: protected => public\\n EntityVillager entityvillager = new EntityVillager(this.q);\\n \\n entityvillager.j(this);\\n entityvillager.a((EntityLivingData) null);\\n- entityvillager.bT();\\n+ entityvillager.bX();\\n if (this.g_()) {\\n entityvillager.c(-24000);\\n }\\n \\n this.q.e((Entity) this);\\n this.q.d((Entity) entityvillager);\\n- entityvillager.d(new PotionEffect(Potion.k.H, 200, 0));\\n+ entityvillager.c(new PotionEffect(Potion.k.H, 200, 0));\\n this.q.a((EntityPlayer) null, 1017, (int) this.u, (int) this.v, (int) this.w, 0);\\n }\\n \\n- protected int bT() {\\n+ protected int bX() {\\n int i0 = 1;\\n \\n if (this.ab.nextFloat() < 0.01F) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FEntityZombie.java\",\n \"sha\": \"7a578c42957ec52504f6ffa04d2fe25bb21ff8f4\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FFoodStats.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FFoodStats.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/FoodStats.java\",\n \"new_code\": \" if (entityplayer.q.O().b(\\\"naturalRegeneration\\\") && this.a >= 18 && entityplayer.bI()) {\\n if (entityplayer.aM() > 10.0F || i0 >= 3 || entityplayer.aM() > 1.0F && i0 >= 2) {\\n DamageHook dmg = (DamageHook) new DamageHook(null, entityplayer.getCanaryEntity(), new CanaryDamageSource(DamageSource.f), 1.0F).call();\",\n \"new_methods\": [],\n \"old_code\": \" if (entityplayer.q.O().b(\\\"naturalRegeneration\\\") && this.a >= 18 && entityplayer.bE()) {\\n if (entityplayer.aJ() > 10.0F || i0 >= 3 || entityplayer.aJ() > 1.0F && i0 >= 2) {\\n DamageHook dmg = (DamageHook) new DamageHook(null, entityplayer.getCanaryEntity(), new CanaryDamageSource(DamageSource.f), 1).call();\",\n \"old_methods\": [],\n \"patch\": \"@@ -58,7 +58,7 @@ public void a(EntityPlayer entityplayer) {\\n }\\n }\\n \\n- if (entityplayer.q.O().b(\\\"naturalRegeneration\\\") && this.a >= 18 && entityplayer.bE()) {\\n+ if (entityplayer.q.O().b(\\\"naturalRegeneration\\\") && this.a >= 18 && entityplayer.bI()) {\\n ++this.d;\\n if (this.d >= 80) {\\n entityplayer.f(1.0F);\\n@@ -68,9 +68,9 @@ public void a(EntityPlayer entityplayer) {\\n } else if (this.a <= 0) {\\n ++this.d;\\n if (this.d >= 80) {\\n- if (entityplayer.aJ() > 10.0F || i0 >= 3 || entityplayer.aJ() > 1.0F && i0 >= 2) {\\n+ if (entityplayer.aM() > 10.0F || i0 >= 3 || entityplayer.aM() > 1.0F && i0 >= 2) {\\n // CanaryMod: DamageHook (starve)\\n- DamageHook dmg = (DamageHook) new DamageHook(null, entityplayer.getCanaryEntity(), new CanaryDamageSource(DamageSource.f), 1).call();\\n+ DamageHook dmg = (DamageHook) new DamageHook(null, entityplayer.getCanaryEntity(), new CanaryDamageSource(DamageSource.f), 1.0F).call();\\n if (!dmg.isCanceled()) {\\n entityplayer.a((((CanaryDamageSource) dmg.getDamageSource()).getHandle()), dmg.getDamageDealt());\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FFoodStats.java\",\n \"sha\": \"2d7b7f3814dfefceda950d04100da3fba19621d5\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCraftResult.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCraftResult.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/InventoryCraftResult.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n public class InventoryCraftResult implements IInventory {\\n \\n public ItemStack[] a = new ItemStack[1]; // CanaryMod: private -> public\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCraftResult.java\",\n \"sha\": \"3989e313980236c142dc7414ccfd683c53d7fe25\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCrafting.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCrafting.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/InventoryCrafting.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n public class InventoryCrafting implements IInventory {\\n \\n public ItemStack[] a; // CanaryMod: private -> public\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryCrafting.java\",\n \"sha\": \"51e2b05785ce90add3dc06a239906079af694018\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryLargeChest.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryLargeChest.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/InventoryLargeChest.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n public class InventoryLargeChest implements IInventory {\\n \\n private String a;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryLargeChest.java\",\n \"sha\": \"22736828a424534ed3bff6e210702545321d960c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryMerchant.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryMerchant.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/InventoryMerchant.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n public class InventoryMerchant implements IInventory {\\n \\n private final IMerchant a;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FInventoryMerchant.java\",\n \"sha\": \"a82d502077ac78dd658042de461c15d5b2eb9dd0\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemBucketMilk.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemBucketMilk.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/ItemBucketMilk.java\",\n \"new_code\": \" entityplayer.aJ();\",\n \"new_methods\": [],\n \"old_code\": \" entityplayer.aG();\",\n \"old_methods\": [],\n \"patch\": \"@@ -25,7 +25,7 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\\n }\\n \\n if (!world.I) {\\n- entityplayer.aG();\\n+ entityplayer.aJ();\\n }\\n \\n return itemstack.b <= 0 ? new ItemStack(Item.ay) : itemstack;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemBucketMilk.java\",\n \"sha\": \"9dd9796b8c108a955bbf6b84dda5f70e99416505\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemFood.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemFood.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/ItemFood.java\",\n \"new_code\": \" entityplayer.bH().a(hook.getLevelGain(), hook.getSaturationGain());\\n entityplayer.c(((CanaryPotionEffect) effect).getHandle());\\n entityplayer.c(new PotionEffect(this.cC, this.cD * 20, this.cE));\",\n \"new_methods\": [],\n \"old_code\": \" entityplayer.bD().a(hook.getLevelGain(), hook.getSaturationGain());\\n entityplayer.d(((CanaryPotionEffect) effect).getHandle());\\n entityplayer.d(new PotionEffect(this.cC, this.cD * 20, this.cE));\",\n \"old_methods\": [],\n \"patch\": \"@@ -47,13 +47,13 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\\n EatHook hook = (EatHook) new EatHook(((EntityPlayerMP) entityplayer).getPlayer(), itemstack.getCanaryItem(), this.g(), this.i(), effects).call();\\n if (!hook.isCanceled()) {\\n --itemstack.b;\\n- entityplayer.bD().a(hook.getLevelGain(), hook.getSaturationGain());\\n+ entityplayer.bH().a(hook.getLevelGain(), hook.getSaturationGain());\\n world.a((Entity) entityplayer, \\\"random.burp\\\", 0.5F, world.s.nextFloat() * 0.1F + 0.9F);\\n // this.c(itemstack, world, entityplayer); moved above and below\\n if (hook.getPotionEffects() != null) {\\n for (net.canarymod.api.potion.PotionEffect effect : hook.getPotionEffects()) {\\n if (effect != null) {\\n- entityplayer.d(((CanaryPotionEffect) effect).getHandle());\\n+ entityplayer.c(((CanaryPotionEffect) effect).getHandle());\\n }\\n }\\n }\\n@@ -64,7 +64,7 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\\n \\n protected void c(ItemStack itemstack, World world, EntityPlayer entityplayer) {\\n if (!world.I && this.cC > 0 && world.s.nextFloat() < this.cF) {\\n- entityplayer.d(new PotionEffect(this.cC, this.cD * 20, this.cE));\\n+ entityplayer.c(new PotionEffect(this.cC, this.cD * 20, this.cE));\\n }\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemFood.java\",\n \"sha\": \"1ee10e17bdaa7aa08b949aea75f47b303dbb64ef\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 5,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemInWorldManager.java\",\n \"changes\": 10,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemInWorldManager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 5,\n \"filename\": \"src/main/java/net/minecraft/server/ItemInWorldManager.java\",\n \"new_code\": \" } else if (this.c.d() && this.b.aY() != null && this.b.aY().b() instanceof ItemSword) {\\n ItemStack itemstack = this.b.bx();\\n this.b.by();\\n if (!entityplayer.bq()) {\\n if (!entityplayer.ag() || entityplayer.aY() == null) {\",\n \"new_methods\": [],\n \"old_code\": \" } else if (this.c.d() && this.b.aV() != null && this.b.aV().b() instanceof ItemSword) {\\n ItemStack itemstack = this.b.bt();\\n this.b.bu();\\n if (!entityplayer.bm()) {\\n if (!entityplayer.af() || entityplayer.aV() == null) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -182,7 +182,7 @@ private boolean d(int i0, int i1, int i2) {\\n public boolean b(int i0, int i1, int i2) {\\n if (this.c.c() && !this.b.d(i0, i1, i2)) {\\n return false;\\n- } else if (this.c.d() && this.b.aV() != null && this.b.aV().b() instanceof ItemSword) {\\n+ } else if (this.c.d() && this.b.aY() != null && this.b.aY().b() instanceof ItemSword) {\\n return false;\\n } else {\\n // CanaryMod: BlockDestroyHook\\n@@ -204,13 +204,13 @@ public boolean b(int i0, int i1, int i2) {\\n if (this.d()) {\\n this.b.a.b(new Packet53BlockChange(i0, i1, i2, this.a));\\n } else {\\n- ItemStack itemstack = this.b.bt();\\n+ ItemStack itemstack = this.b.bx();\\n boolean flag1 = this.b.a(Block.s[i3]);\\n \\n if (itemstack != null) {\\n itemstack.a(this.a, i3, i0, i1, i2, this.b);\\n if (itemstack.b == 0) {\\n- this.b.bu();\\n+ this.b.by();\\n }\\n }\\n \\n@@ -254,7 +254,7 @@ public boolean a(EntityPlayer entityplayer, World world, ItemStack itemstack) {\\n entityplayer.bn.a[entityplayer.bn.c] = null;\\n }\\n \\n- if (!entityplayer.bm()) {\\n+ if (!entityplayer.bq()) {\\n ((EntityPlayerMP) entityplayer).a(entityplayer.bo);\\n }\\n \\n@@ -265,7 +265,7 @@ public boolean a(EntityPlayer entityplayer, World world, ItemStack itemstack) {\\n public boolean a(EntityPlayer entityplayer, World world, ItemStack itemstack, int i0, int i1, int i2, int i3, float f0, float f1, float f2) {\\n int i4;\\n \\n- if (!entityplayer.af() || entityplayer.aV() == null) {\\n+ if (!entityplayer.ag() || entityplayer.aY() == null) {\\n i4 = world.a(i0, i1, i2);\\n if (i4 > 0 && Block.s[i4].a(world, i0, i1, i2, entityplayer, i3, f0, f1, f2)) {\\n return true;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemInWorldManager.java\",\n \"sha\": \"d5174e04b6c58707939f46b5c6cdb96a6b910527\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemPotion.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemPotion.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/ItemPotion.java\",\n \"new_code\": \" // entityplayer.c(new PotionEffect(potioneffect));\\n entityplayer.bH().a(hook.getLevelGain(), hook.getSaturationGain());\\n entityplayer.c(((CanaryPotionEffect) effect).getHandle());\",\n \"new_methods\": [],\n \"old_code\": \" // entityplayer.d(new PotionEffect(potioneffect));\\n entityplayer.bD().a(hook.getLevelGain(), hook.getSaturationGain());\\n entityplayer.d(((CanaryPotionEffect) effect).getHandle());\",\n \"old_methods\": [],\n \"patch\": \"@@ -73,7 +73,7 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\\n while (iterator.hasNext()) {\\n PotionEffect potioneffect = (PotionEffect) iterator.next();\\n \\n- // entityplayer.d(new PotionEffect(potioneffect));\\n+ // entityplayer.c(new PotionEffect(potioneffect));\\n // add to the array first\\n effects[index] = new CanaryPotionEffect(potioneffect);\\n index++;\\n@@ -88,12 +88,12 @@ public ItemStack b(ItemStack itemstack, World world, EntityPlayer entityplayer)\\n return itemstack;\\n }\\n // Apply food changes\\n- entityplayer.bD().a(hook.getLevelGain(), hook.getSaturationGain());\\n+ entityplayer.bH().a(hook.getLevelGain(), hook.getSaturationGain());\\n // And finally add the effects\\n if (hook.getPotionEffects() != null) {\\n for (net.canarymod.api.potion.PotionEffect effect : hook.getPotionEffects()) {\\n if (effect != null) {\\n- entityplayer.d(((CanaryPotionEffect) effect).getHandle());\\n+ entityplayer.c(((CanaryPotionEffect) effect).getHandle());\\n }\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemPotion.java\",\n \"sha\": \"30cbd44078343d61e60f59e04b86633f950a3ef7\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemSign.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemSign.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/ItemSign.java\",\n \"new_code\": \" world.f(i0, i1, i2, Block.aI.cF, i4, 3);\\n world.f(i0, i1, i2, Block.aN.cF, i3, 3);\",\n \"new_methods\": [],\n \"old_code\": \" world.f(i0, i1, i2, Block.aI.cF, i4, 2);\\n world.f(i0, i1, i2, Block.aN.cF, i3, 2);\",\n \"old_methods\": [],\n \"patch\": \"@@ -59,9 +59,9 @@ public boolean a(ItemStack itemstack, EntityPlayer entityplayer, World world, in\\n if (i3 == 1) {\\n int i4 = MathHelper.c((double) ((entityplayer.A + 180.0F) * 16.0F / 360.0F) + 0.5D) & 15;\\n \\n- world.f(i0, i1, i2, Block.aI.cF, i4, 2);\\n+ world.f(i0, i1, i2, Block.aI.cF, i4, 3);\\n } else {\\n- world.f(i0, i1, i2, Block.aN.cF, i3, 2);\\n+ world.f(i0, i1, i2, Block.aN.cF, i3, 3);\\n }\\n \\n --itemstack.b;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemSign.java\",\n \"sha\": \"427faae1c882d824772f86dcb97d288b6fe1367f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemStack.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemStack.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/ItemStack.java\",\n \"new_code\": \" if (this.a(i0, entitylivingbase.aC())) {\\n entityplayer.by();\",\n \"new_methods\": [],\n \"old_code\": \" if (this.a(i0, entitylivingbase.aB())) {\\n entityplayer.bu();\",\n \"old_methods\": [],\n \"patch\": \"@@ -187,15 +187,15 @@ public boolean a(int i0, Random random) {\\n public void a(int i0, EntityLivingBase entitylivingbase) {\\n if (!(entitylivingbase instanceof EntityPlayer) || !((EntityPlayer) entitylivingbase).bG.d) {\\n if (this.g()) {\\n- if (this.a(i0, entitylivingbase.aB())) {\\n+ if (this.a(i0, entitylivingbase.aC())) {\\n entitylivingbase.a(this);\\n --this.b;\\n if (entitylivingbase instanceof EntityPlayer) {\\n EntityPlayer entityplayer = (EntityPlayer) entitylivingbase;\\n \\n entityplayer.a(StatList.F[this.d], 1);\\n if (this.b == 0 && this.b() instanceof ItemBow) {\\n- entityplayer.bu();\\n+ entityplayer.by();\\n }\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FItemStack.java\",\n \"sha\": \"357f687abdfd81a43a159e325aae47207f4222e5\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMerchantRecipe.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMerchantRecipe.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/MerchantRecipe.java\",\n \"new_code\": \" return this.a.d == merchantrecipe.a.d && this.c.d == merchantrecipe.c.d ? this.b == null && merchantrecipe.b == null || this.b != null && merchantrecipe.b != null && this.b.d == merchantrecipe.b.d : false;\",\n \"new_methods\": [],\n \"old_code\": \" return this.a.c == merchantrecipe.a.c && this.c.c == merchantrecipe.c.c ? this.b == null && merchantrecipe.b == null || this.b != null && merchantrecipe.b != null && this.b.c == merchantrecipe.b.c : false;\",\n \"old_methods\": [],\n \"patch\": \"@@ -46,7 +46,7 @@ public ItemStack d() {\\n }\\n \\n public boolean a(MerchantRecipe merchantrecipe) {\\n- return this.a.c == merchantrecipe.a.c && this.c.c == merchantrecipe.c.c ? this.b == null && merchantrecipe.b == null || this.b != null && merchantrecipe.b != null && this.b.c == merchantrecipe.b.c : false;\\n+ return this.a.d == merchantrecipe.a.d && this.c.d == merchantrecipe.c.d ? this.b == null && merchantrecipe.b == null || this.b != null && merchantrecipe.b != null && this.b.d == merchantrecipe.b.d : false;\\n }\\n \\n public boolean b(MerchantRecipe merchantrecipe) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMerchantRecipe.java\",\n \"sha\": \"18d0e7ba1d5d5f6efe0b8c036c80fbfe8f2288c0\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMinecraftServer.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMinecraftServer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/MinecraftServer.java\",\n \"new_code\": \" return \\\"1.6.2\\\";\",\n \"new_methods\": [],\n \"old_code\": \" return \\\"1.6.1\\\";\",\n \"old_methods\": [],\n \"patch\": \"@@ -652,7 +652,7 @@ public String y() {\\n }\\n \\n public String z() {\\n- return \\\"1.6.1\\\";\\n+ return \\\"1.6.2\\\";\\n }\\n \\n public int A() {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMinecraftServer.java\",\n \"sha\": \"db1000bf9b1baf33ad16f261e24bb1b05f9c5dbe\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMobSpawnerBaseLogic.java\",\n \"changes\": 5,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMobSpawnerBaseLogic.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/MobSpawnerBaseLogic.java\",\n \"new_code\": \"\\n if (entityliving == null || entityliving.bs()) {\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n if (entityliving == null || entityliving.bo()) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,14 +1,12 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.ArrayList;\\n import java.util.Collection;\\n import java.util.Iterator;\\n import java.util.List;\\n import net.canarymod.api.CanaryMobSpawnerLogic;\\n import net.canarymod.api.MobSpawnerLogic;\\n \\n-\\n public abstract class MobSpawnerBaseLogic {\\n \\n public int b = 20;\\n@@ -27,6 +25,7 @@ public abstract class MobSpawnerBaseLogic {\\n \\n // CanaryMod: Variable Declaration\\n public MobSpawnerLogic logic = (MobSpawnerLogic) new CanaryMobSpawnerLogic(this);\\n+\\n // CanaryMod: End\\n \\n public MobSpawnerBaseLogic() {}\\n@@ -100,7 +99,7 @@ public void g() {\\n EntityLiving entityliving = entity instanceof EntityLiving ? (EntityLiving) entity : null;\\n \\n entity.b(d0, d3, d4, this.a().s.nextFloat() * 360.0F, 0.0F);\\n- if (entityliving == null || entityliving.bo()) {\\n+ if (entityliving == null || entityliving.bs()) {\\n this.a(entity);\\n this.a().e(2004, this.b(), this.c(), this.d(), 0);\\n if (entityliving != null) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FMobSpawnerBaseLogic.java\",\n \"sha\": \"00750d227b15489369542f8d92d90767683a5853\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNBTTagList.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNBTTagList.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/NBTTagList.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,14 +1,12 @@\\n package net.minecraft.server;\\n \\n-\\n import java.io.DataInput;\\n import java.io.DataOutput;\\n import java.io.IOException;\\n import java.util.ArrayList;\\n import java.util.Iterator;\\n import java.util.List;\\n \\n-\\n public class NBTTagList extends NBTBase {\\n \\n public List a = new ArrayList(); // CanaryMod: private -> public\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNBTTagList.java\",\n \"sha\": \"3a2c934c53e1750567b206e1f00134280336e3c5\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 12,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetLoginHandler.java\",\n \"changes\": 20,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetLoginHandler.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 8,\n \"filename\": \"src/main/java/net/minecraft/server/NetLoginHandler.java\",\n \"new_code\": \" public void d() {\\n this.e();\\n this.e.an().a(\\\"Disconnecting \\\" + this.f() + \\\": \\\" + s0);\\n if (packet2clientprotocol.d() != 74) {\\n if (packet2clientprotocol.d() > 74) {\\n public void e() {\\n this.e.an().a(this.f() + \\\" lost connection\\\");\\n public String f() {\\n public boolean c() {\\n return this.b;\\n }\\n\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/NetLoginHandler.java\",\n \"implementation\": \"this.e();\\n this.e.an().a(\\\"Disconnecting \\\" + this.f() + \\\": \\\" + s0);\\n if (packet2clientprotocol.d() != 74) {\\n if (packet2clientprotocol.d() > 74) {\\n public void e() {\\n this.e.an().a(this.f() + \\\" lost connection\\\");\\n public String f() {\\n public boolean c() {\\n return this.b;\",\n \"signature\": \"void d()\"\n }\n ],\n \"old_code\": \" public void c() {\\n this.d();\\n this.e.an().a(\\\"Disconnecting \\\" + this.e() + \\\": \\\" + s0);\\n if (packet2clientprotocol.d() != 73) {\\n if (packet2clientprotocol.d() > 73) {\\n public void d() {\\n this.e.an().a(this.e() + \\\" lost connection\\\");\\n public String e() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -33,9 +33,9 @@ public NetLoginHandler(MinecraftServer minecraftserver, Socket socket, String s0\\n this.a.e = 0;\\n }\\n \\n- public void c() {\\n+ public void d() {\\n if (this.h) {\\n- this.d();\\n+ this.e();\\n }\\n \\n if (this.f++ == 600) {\\n@@ -47,7 +47,7 @@ public void c() {\\n \\n public void a(String s0) {\\n try {\\n- this.e.an().a(\\\"Disconnecting \\\" + this.e() + \\\": \\\" + s0);\\n+ this.e.an().a(\\\"Disconnecting \\\" + this.f() + \\\": \\\" + s0);\\n this.a.a((Packet) (new Packet255KickDisconnect(s0)));\\n this.a.d();\\n this.b = true;\\n@@ -63,8 +63,8 @@ public void a(Packet2ClientProtocol packet2clientprotocol) {\\n } else {\\n PublicKey publickey = this.e.H().getPublic();\\n \\n- if (packet2clientprotocol.d() != 73) {\\n- if (packet2clientprotocol.d() > 73) {\\n+ if (packet2clientprotocol.d() != 74) {\\n+ if (packet2clientprotocol.d() > 74) {\\n this.a(\\\"Outdated server!\\\");\\n } else {\\n this.a(\\\"Outdated client!\\\");\\n@@ -107,7 +107,7 @@ public void a(Packet205ClientCommand packet205clientcommand) {\\n \\n public void a(Packet1Login packet1login) {}\\n \\n- public void d() {\\n+ public void e() {\\n String s0 = this.e.af().a(this.a.c(), this.g);\\n \\n if (s0 != null) {\\n@@ -124,7 +124,7 @@ public void d() {\\n }\\n \\n public void a(String s0, Object[] aobject) {\\n- this.e.an().a(this.e() + \\\" lost connection\\\");\\n+ this.e.an().a(this.f() + \\\" lost connection\\\");\\n this.b = true;\\n }\\n \\n@@ -177,14 +177,18 @@ public void a(Packet packet) {\\n this.a(\\\"Protocol error\\\");\\n }\\n \\n- public String e() {\\n+ public String f() {\\n return this.g != null ? this.g + \\\" [\\\" + this.a.c().toString() + \\\"]\\\" : this.a.c().toString();\\n }\\n \\n public boolean a() {\\n return true;\\n }\\n \\n+ public boolean c() {\\n+ return this.b;\\n+ }\\n+\\n static String a(NetLoginHandler netloginhandler) {\\n return netloginhandler.i;\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetLoginHandler.java\",\n \"sha\": \"e057bd03060d80334bca973c2ed5bdd717c9a732\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 39,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetServerHandler.java\",\n \"changes\": 93,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetServerHandler.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 54,\n \"filename\": \"src/main/java/net/minecraft/server/NetServerHandler.java\",\n \"new_code\": \" public void e() {\\n this.c.o.V();\\n this.c.X = 0.0F;\\n this.c.o.V();\\n if (this.c.bg()) {\\n double d4;\\n\\n if (!this.c.bg() && (d4 > 1.65D || d4 < 0.1D)) {\\n double d5 = d2 - this.c.v;\\n double d6 = d3 - this.c.w;\\n double d7 = Math.min(Math.abs(d4), Math.abs(this.c.x));\\n double d8 = Math.min(Math.abs(d5), Math.abs(this.c.y));\\n double d9 = Math.min(Math.abs(d6), Math.abs(this.c.z));\\n double d10 = d7 * d7 + d8 * d8 + d9 * d9;\\n\\n if (d10 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\\n this.d.an().b(this.c.c_() + \\\" moved too quickly! \\\" + d4 + \\\",\\\" + d5 + \\\",\\\" + d6 + \\\" (\\\" + d7 + \\\", \\\" + d8 + \\\", \\\" + d9 + \\\")\\\");\\n if (this.c.F && !packet10flying.g && d5 > 0.0D) {\\n this.c.d(d4, d5, d6);\\n this.c.j(d4, d5, d6);\\n double d11 = d5;\\n d5 = d2 - this.c.v;\\n if (d5 > -0.5D || d5 < 0.5D) {\\n d5 = 0.0D;\\n d6 = d3 - this.c.w;\\n d10 = d4 * d4 + d5 * d5 + d6 * d6;\\n if (d10 > 0.0625D && !this.c.bg() && !this.c.c.d()) {\\n if (flag0 && (flag1 || !flag2) && !this.c.bg()) {\\n if (d11 >= -0.03125D) {\\n this.c.bs();\\n ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\\\"chat.type.text\\\", new Object[] { this.c.ax(), s0});\\n this.c.aU();\\n public int f() {\\n if (this.c.aM() > 0.0F) {\\n if (!tileentitysign.a() || tileentitysign.b() != this.c) {\\n public boolean c() {\\n return this.b;\\n }\\n\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/NetServerHandler.java\",\n \"implementation\": \"this.c.o.V();\\n this.c.X = 0.0F;\\n this.c.o.V();\\n if (this.c.bg()) {\\n double d4;\\n\\n if (!this.c.bg() && (d4 > 1.65D || d4 < 0.1D)) {\\n double d5 = d2 - this.c.v;\\n double d6 = d3 - this.c.w;\\n double d7 = Math.min(Math.abs(d4), Math.abs(this.c.x));\\n double d8 = Math.min(Math.abs(d5), Math.abs(this.c.y));\\n double d9 = Math.min(Math.abs(d6), Math.abs(this.c.z));\\n double d10 = d7 * d7 + d8 * d8 + d9 * d9;\\n\\n if (d10 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\\n this.d.an().b(this.c.c_() + \\\" moved too quickly! \\\" + d4 + \\\",\\\" + d5 + \\\",\\\" + d6 + \\\" (\\\" + d7 + \\\", \\\" + d8 + \\\", \\\" + d9 + \\\")\\\");\\n if (this.c.F && !packet10flying.g && d5 > 0.0D) {\\n this.c.d(d4, d5, d6);\\n this.c.j(d4, d5, d6);\\n double d11 = d5;\\n d5 = d2 - this.c.v;\\n if (d5 > -0.5D || d5 < 0.5D) {\\n d5 = 0.0D;\\n d6 = d3 - this.c.w;\\n d10 = d4 * d4 + d5 * d5 + d6 * d6;\\n if (d10 > 0.0625D && !this.c.bg() && !this.c.c.d()) {\\n if (flag0 && (flag1 || !flag2) && !this.c.bg()) {\\n if (d11 >= -0.03125D) {\\n this.c.bs();\\n ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\\\"chat.type.text\\\", new Object[] { this.c.ax(), s0\",\n \"signature\": \"void e()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/NetServerHandler.java\",\n \"implementation\": \"if (this.c.aM() > 0.0F) {\\n if (!tileentitysign.a() || tileentitysign.b() != this.c) {\\n public boolean c() {\\n return this.b;\",\n \"signature\": \"int f()\"\n }\n ],\n \"old_code\": \" public void d() {\\n double d4;\\n this.c.o.U();\\n double d5 = 0.0D;\\n\\n d4 = 0.0D;\\n if (packet10flying.h && packet10flying.b == -999.0D && packet10flying.d == -999.0D) {\\n if (Math.abs(packet10flying.a) > 1.0D || Math.abs(packet10flying.c) > 1.0D) {\\n System.err.println(this.c.c_() + \\\" was caught trying to crash the server with an invalid position.\\\");\\n this.c(\\\"Nope!\\\");\\n return;\\n }\\n\\n d5 = packet10flying.a;\\n d4 = packet10flying.c;\\n }\\n\\n this.c.d(d5, 0.0D, d4);\\n this.c.x = d5;\\n this.c.z = d4;\\n worldserver.b(this.c.o, true);\\n }\\n\\n if (this.c.o != null) {\\n this.c.o.U();\\n if (this.c.bd()) {\\n if (!this.c.bd() && (d4 > 1.65D || d4 < 0.1D)) {\\n double d6 = d2 - this.c.v;\\n double d7 = d3 - this.c.w;\\n double d8 = Math.min(Math.abs(d4), Math.abs(this.c.x));\\n double d9 = Math.min(Math.abs(d6), Math.abs(this.c.y));\\n double d10 = Math.min(Math.abs(d7), Math.abs(this.c.z));\\n double d11 = d8 * d8 + d9 * d9 + d10 * d10;\\n\\n if (d11 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\\n this.d.an().b(this.c.c_() + \\\" moved too quickly! \\\" + d4 + \\\",\\\" + d6 + \\\",\\\" + d7 + \\\" (\\\" + d8 + \\\", \\\" + d9 + \\\", \\\" + d10 + \\\")\\\");\\n if (this.c.F && !packet10flying.g && d6 > 0.0D) {\\n this.c.d(d4, d6, d7);\\n this.c.j(d4, d6, d7);\\n double d12 = d6;\\n d6 = d2 - this.c.v;\\n if (d6 > -0.5D || d6 < 0.5D) {\\n d6 = 0.0D;\\n d7 = d3 - this.c.w;\\n d11 = d4 * d4 + d6 * d6 + d7 * d7;\\n if (d11 > 0.0625D && !this.c.bd() && !this.c.c.d()) {\\n if (flag0 && (flag1 || !flag2) && !this.c.bd()) {\\n if (d12 >= -0.03125D) {\\n this.c.bo();\\n ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\\\"chat.type.text\\\", new Object[]{ this.c.aw(), s0 });\\n this.c.aR();\\n public int e() {\\n if (this.c.aJ() > 0.0F) {\\n if (!tileentitysign.a()) {\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/NetServerHandler.java\",\n \"implementation\": \"double d4;\\n this.c.o.U();\\n double d5 = 0.0D;\\n\\n d4 = 0.0D;\\n if (packet10flying.h && packet10flying.b == -999.0D && packet10flying.d == -999.0D) {\\n if (Math.abs(packet10flying.a) > 1.0D || Math.abs(packet10flying.c) > 1.0D) {\\n System.err.println(this.c.c_() + \\\" was caught trying to crash the server with an invalid position.\\\");\\n this.c(\\\"Nope!\\\");\\n return;\",\n \"signature\": \"void d()\"\n }\n ],\n \"patch\": \"@@ -69,7 +69,7 @@ public NetServerHandler(MinecraftServer minecraftserver, INetworkManager inetwor\\n serverHandler = new CanaryNetServerHandler(this);\\n }\\n \\n- public void d() {\\n+ public void e() {\\n this.g = false;\\n ++this.e;\\n this.d.a.a(\\\"packetflow\\\");\\n@@ -150,47 +150,26 @@ public void a(Packet10Flying packet10flying) {\\n double d1;\\n double d2;\\n double d3;\\n- double d4;\\n \\n if (this.c.o != null) {\\n float f0 = this.c.A;\\n float f1 = this.c.B;\\n \\n- this.c.o.U();\\n+ this.c.o.V();\\n d1 = this.c.u;\\n d2 = this.c.v;\\n d3 = this.c.w;\\n- double d5 = 0.0D;\\n-\\n- d4 = 0.0D;\\n if (packet10flying.i) {\\n f0 = packet10flying.e;\\n f1 = packet10flying.f;\\n }\\n \\n- if (packet10flying.h && packet10flying.b == -999.0D && packet10flying.d == -999.0D) {\\n- if (Math.abs(packet10flying.a) > 1.0D || Math.abs(packet10flying.c) > 1.0D) {\\n- System.err.println(this.c.c_() + \\\" was caught trying to crash the server with an invalid position.\\\");\\n- this.c(\\\"Nope!\\\");\\n- return;\\n- }\\n-\\n- d5 = packet10flying.a;\\n- d4 = packet10flying.c;\\n- }\\n-\\n this.c.F = packet10flying.g;\\n this.c.h();\\n- this.c.d(d5, 0.0D, d4);\\n+ this.c.X = 0.0F;\\n this.c.a(d1, d2, d3, f0, f1);\\n- this.c.x = d5;\\n- this.c.z = d4;\\n if (this.c.o != null) {\\n- worldserver.b(this.c.o, true);\\n- }\\n-\\n- if (this.c.o != null) {\\n- this.c.o.U();\\n+ this.c.o.V();\\n }\\n \\n this.d.af().d(this.c);\\n@@ -204,7 +183,7 @@ public void a(Packet10Flying packet10flying) {\\n return;\\n }\\n \\n- if (this.c.bd()) {\\n+ if (this.c.bg()) {\\n this.c.h();\\n this.c.a(this.n, this.o, this.p, this.c.A, this.c.B);\\n worldserver.g(this.c);\\n@@ -225,12 +204,14 @@ public void a(Packet10Flying packet10flying) {\\n packet10flying.h = false;\\n }\\n \\n+ double d4;\\n+\\n if (packet10flying.h) {\\n d1 = packet10flying.a;\\n d2 = packet10flying.b;\\n d3 = packet10flying.c;\\n d4 = packet10flying.d - packet10flying.b;\\n- if (!this.c.bd() && (d4 > 1.65D || d4 < 0.1D)) {\\n+ if (!this.c.bg() && (d4 > 1.65D || d4 < 0.1D)) {\\n this.c(\\\"Illegal stance\\\");\\n this.d.an().b(this.c.c_() + \\\" had an illegal stance: \\\" + d4);\\n return;\\n@@ -255,50 +236,50 @@ public void a(Packet10Flying packet10flying) {\\n }\\n \\n d4 = d1 - this.c.u;\\n- double d6 = d2 - this.c.v;\\n- double d7 = d3 - this.c.w;\\n- double d8 = Math.min(Math.abs(d4), Math.abs(this.c.x));\\n- double d9 = Math.min(Math.abs(d6), Math.abs(this.c.y));\\n- double d10 = Math.min(Math.abs(d7), Math.abs(this.c.z));\\n- double d11 = d8 * d8 + d9 * d9 + d10 * d10;\\n-\\n- if (d11 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\\n- this.d.an().b(this.c.c_() + \\\" moved too quickly! \\\" + d4 + \\\",\\\" + d6 + \\\",\\\" + d7 + \\\" (\\\" + d8 + \\\", \\\" + d9 + \\\", \\\" + d10 + \\\")\\\");\\n+ double d5 = d2 - this.c.v;\\n+ double d6 = d3 - this.c.w;\\n+ double d7 = Math.min(Math.abs(d4), Math.abs(this.c.x));\\n+ double d8 = Math.min(Math.abs(d5), Math.abs(this.c.y));\\n+ double d9 = Math.min(Math.abs(d6), Math.abs(this.c.z));\\n+ double d10 = d7 * d7 + d8 * d8 + d9 * d9;\\n+\\n+ if (d10 > 100.0D && (!this.d.K() || !this.d.J().equals(this.c.c_()))) {\\n+ this.d.an().b(this.c.c_() + \\\" moved too quickly! \\\" + d4 + \\\",\\\" + d5 + \\\",\\\" + d6 + \\\" (\\\" + d7 + \\\", \\\" + d8 + \\\", \\\" + d9 + \\\")\\\");\\n this.a(this.n, this.o, this.p, this.c.A, this.c.B, this.c.q.getCanaryWorld().getType().getId(), this.c.q.getCanaryWorld().getName(), TeleportHook.TeleportCause.MOVEMENT);\\n return;\\n }\\n \\n float f4 = 0.0625F;\\n boolean flag0 = worldserver.a(this.c, this.c.E.c().e((double) f4, (double) f4, (double) f4)).isEmpty();\\n \\n- if (this.c.F && !packet10flying.g && d6 > 0.0D) {\\n+ if (this.c.F && !packet10flying.g && d5 > 0.0D) {\\n this.c.a(0.2F);\\n }\\n \\n- this.c.d(d4, d6, d7);\\n+ this.c.d(d4, d5, d6);\\n this.c.F = packet10flying.g;\\n- this.c.j(d4, d6, d7);\\n- double d12 = d6;\\n+ this.c.j(d4, d5, d6);\\n+ double d11 = d5;\\n \\n d4 = d1 - this.c.u;\\n- d6 = d2 - this.c.v;\\n- if (d6 > -0.5D || d6 < 0.5D) {\\n- d6 = 0.0D;\\n+ d5 = d2 - this.c.v;\\n+ if (d5 > -0.5D || d5 < 0.5D) {\\n+ d5 = 0.0D;\\n }\\n \\n- d7 = d3 - this.c.w;\\n- d11 = d4 * d4 + d6 * d6 + d7 * d7;\\n+ d6 = d3 - this.c.w;\\n+ d10 = d4 * d4 + d5 * d5 + d6 * d6;\\n boolean flag1 = false;\\n \\n- if (d11 > 0.0625D && !this.c.bd() && !this.c.c.d()) {\\n+ if (d10 > 0.0625D && !this.c.bg() && !this.c.c.d()) {\\n flag1 = true;\\n this.d.an().b(this.c.c_() + \\\" moved wrongly!\\\");\\n }\\n \\n this.c.a(d1, d2, d3, f2, f3);\\n boolean flag2 = worldserver.a(this.c, this.c.E.c().e((double) f4, (double) f4, (double) f4)).isEmpty();\\n \\n- if (flag0 && (flag1 || !flag2) && !this.c.bd()) {\\n+ if (flag0 && (flag1 || !flag2) && !this.c.bg()) {\\n this.a(this.n, this.o, this.p, f2, f3, c.getCanaryWorld().getType().getId(), c.getCanaryWorld().getName(), TeleportHook.TeleportCause.MOVEMENT);\\n return;\\n }\\n@@ -308,7 +289,7 @@ public void a(Packet10Flying packet10flying) {\\n // CanaryMod: check on flying capability instead of mode\\n // moved allow-flight to per-world config\\n if (!Configuration.getWorldConfig(c.getCanaryWorld().getFqName()).isFlightAllowed() && !this.c.bG.c && !worldserver.c(axisalignedbb)) {\\n- if (d12 >= -0.03125D) {\\n+ if (d11 >= -0.03125D) {\\n ++this.f;\\n if (this.f > 80) {\\n this.d.an().b(this.c.c_() + \\\" was kicked for floating too long!\\\");\\n@@ -356,7 +337,7 @@ public void a(Packet14BlockDig packet14blockdig) {\\n } else if (packet14blockdig.e == 3) {\\n this.c.a(true);\\n } else if (packet14blockdig.e == 5) {\\n- this.c.bo();\\n+ this.c.bs();\\n } else {\\n boolean flag0 = false;\\n \\n@@ -598,7 +579,7 @@ public void a(Packet3Chat packet3chat) {\\n return;\\n }\\n \\n- ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\\\"chat.type.text\\\", new Object[]{ this.c.aw(), s0 });\\n+ ChatMessageComponent chatmessagecomponent = ChatMessageComponent.b(\\\"chat.type.text\\\", new Object[] { this.c.ax(), s0});\\n \\n this.d.af().a(chatmessagecomponent, false);\\n }\\n@@ -622,7 +603,7 @@ public void a(Packet18Animation packet18animation) {\\n if (packet18animation.b == 1) {\\n // CanaryMod: PlayerLeftClick\\n new PlayerLeftClickHook(this.c.getPlayer()).call();\\n- this.c.aR();\\n+ this.c.aU();\\n }\\n }\\n \\n@@ -653,7 +634,7 @@ public void a(Packet255KickDisconnect packet255kickdisconnect) {\\n this.a.a(\\\"disconnect.quitting\\\", new Object[0]);\\n }\\n \\n- public int e() {\\n+ public int f() {\\n return this.a.e();\\n }\\n \\n@@ -695,7 +676,7 @@ public void a(Packet205ClientCommand packet205clientcommand) {\\n this.c.a.c(\\\"You have died. Game over, man, it\\\\'s game over!\\\");\\n }\\n } else {\\n- if (this.c.aJ() > 0.0F) {\\n+ if (this.c.aM() > 0.0F) {\\n return;\\n }\\n \\n@@ -825,7 +806,7 @@ public void a(Packet130UpdateSign packet130updatesign) {\\n if (tileentity instanceof TileEntitySign) {\\n TileEntitySign tileentitysign = (TileEntitySign) tileentity;\\n \\n- if (!tileentitysign.a()) {\\n+ if (!tileentitysign.a() || tileentitysign.b() != this.c) {\\n this.d.f(\\\"Player \\\" + this.c.c_() + \\\" just tried to change non-editable sign\\\");\\n return;\\n }\\n@@ -1081,6 +1062,10 @@ public void a(Packet250CustomPayload packet250custompayload) {\\n \\n }\\n \\n+ public boolean c() {\\n+ return this.b;\\n+ }\\n+\\n /**\\n * gets the CanaryNetServerHandler wrapper\\n * \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FNetServerHandler.java\",\n \"sha\": \"2514183a8023a6aef4990b91d0f829394d218f6d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/Packet.java\",\n \"new_code\": \" public boolean s;\\n eofexception.printStackTrace();\\n a(133, true, false, Packet133TileEditorOpen.class);\",\n \"new_methods\": [],\n \"old_code\": \" public boolean s = false;\\n\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -22,7 +22,7 @@ public abstract class Packet {\\n public static long p;\\n public static long q;\\n public static long r;\\n- public boolean s = false;\\n+ public boolean s;\\n \\n public Packet() {}\\n \\n@@ -82,9 +82,7 @@ public static Packet a(ILogAgent ilogagent, DataInput datainput, boolean flag0,\\n boolean flag1 = false;\\n Packet packet = null;\\n int i0 = socket.getSoTimeout();\\n-\\n int i1;\\n-\\n try {\\n i1 = datainput.readUnsignedByte();\\n if (flag0 && !c.contains(Integer.valueOf(i1)) || !flag0 && !b.contains(Integer.valueOf(i1))) {\\n@@ -106,6 +104,7 @@ public static Packet a(ILogAgent ilogagent, DataInput datainput, boolean flag0,\\n p += (long) packet.a();\\n } catch (EOFException eofexception) {\\n ilogagent.c(\\\"Reached end of stream for \\\" + socket.getInetAddress());\\n+ eofexception.printStackTrace();\\n return null;\\n }\\n \\n@@ -299,6 +298,7 @@ protected static void a(NBTTagCompound nbttagcompound, DataOutput dataoutput) th\\n a(130, true, true, Packet130UpdateSign.class);\\n a(131, true, false, Packet131MapData.class);\\n a(132, true, false, Packet132TileEntityData.class);\\n+ a(133, true, false, Packet133TileEditorOpen.class);\\n a(200, true, false, Packet200Statistic.class);\\n a(201, true, false, Packet201PlayerInfo.class);\\n a(202, true, true, Packet202PlayerAbilities.class);\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket.java\",\n \"sha\": \"bdcc929f955aff7e713fcfb1fcf907a5bc74ef22\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 21,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket63WorldParticles.java\",\n \"changes\": 42,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket63WorldParticles.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 21,\n \"filename\": \"src/main/java/net/minecraft/server/Packet63WorldParticles.java\",\n \"new_code\": \" public void a(DataInput datainput) throws IOException {\\n this.a = a(datainput, 64);\\n this.b = datainput.readFloat();\\n this.c = datainput.readFloat();\\n this.d = datainput.readFloat();\\n this.e = datainput.readFloat();\\n this.f = datainput.readFloat();\\n this.g = datainput.readFloat();\\n this.h = datainput.readFloat();\\n this.i = datainput.readInt();\\n public void a(DataOutput dataoutput) throws IOException {\\n a(this.a, dataoutput);\\n dataoutput.writeFloat(this.b);\\n dataoutput.writeFloat(this.c);\\n dataoutput.writeFloat(this.d);\\n dataoutput.writeFloat(this.e);\\n dataoutput.writeFloat(this.f);\\n dataoutput.writeFloat(this.g);\\n dataoutput.writeFloat(this.h);\\n dataoutput.writeInt(this.i);\\n}\",\n \"new_methods\": [],\n \"old_code\": \" public void a(DataInput datainputstream) throws IOException {\\n this.a = a(datainputstream, 64);\\n this.b = datainputstream.readFloat();\\n this.c = datainputstream.readFloat();\\n this.d = datainputstream.readFloat();\\n this.e = datainputstream.readFloat();\\n this.f = datainputstream.readFloat();\\n this.g = datainputstream.readFloat();\\n this.h = datainputstream.readFloat();\\n this.i = datainputstream.readInt();\\n public void a(DataOutput dataoutputstream) throws IOException {\\n a(this.a, dataoutputstream);\\n dataoutputstream.writeFloat(this.b);\\n dataoutputstream.writeFloat(this.c);\\n dataoutputstream.writeFloat(this.d);\\n dataoutputstream.writeFloat(this.e);\\n dataoutputstream.writeFloat(this.f);\\n dataoutputstream.writeFloat(this.g);\\n dataoutputstream.writeFloat(this.h);\\n dataoutputstream.writeInt(this.i);\\n}\",\n \"old_methods\": [],\n \"patch\": \"@@ -32,28 +32,28 @@ public Packet63WorldParticles(Particle particle) {\\n this.i = particle.quantity;\\n }//\\n \\n- public void a(DataInput datainputstream) throws IOException {\\n- this.a = a(datainputstream, 64);\\n- this.b = datainputstream.readFloat();\\n- this.c = datainputstream.readFloat();\\n- this.d = datainputstream.readFloat();\\n- this.e = datainputstream.readFloat();\\n- this.f = datainputstream.readFloat();\\n- this.g = datainputstream.readFloat();\\n- this.h = datainputstream.readFloat();\\n- this.i = datainputstream.readInt();\\n+ public void a(DataInput datainput) throws IOException {\\n+ this.a = a(datainput, 64);\\n+ this.b = datainput.readFloat();\\n+ this.c = datainput.readFloat();\\n+ this.d = datainput.readFloat();\\n+ this.e = datainput.readFloat();\\n+ this.f = datainput.readFloat();\\n+ this.g = datainput.readFloat();\\n+ this.h = datainput.readFloat();\\n+ this.i = datainput.readInt();\\n }\\n \\n- public void a(DataOutput dataoutputstream) throws IOException {\\n- a(this.a, dataoutputstream);\\n- dataoutputstream.writeFloat(this.b);\\n- dataoutputstream.writeFloat(this.c);\\n- dataoutputstream.writeFloat(this.d);\\n- dataoutputstream.writeFloat(this.e);\\n- dataoutputstream.writeFloat(this.f);\\n- dataoutputstream.writeFloat(this.g);\\n- dataoutputstream.writeFloat(this.h);\\n- dataoutputstream.writeInt(this.i);\\n+ public void a(DataOutput dataoutput) throws IOException {\\n+ a(this.a, dataoutput);\\n+ dataoutput.writeFloat(this.b);\\n+ dataoutput.writeFloat(this.c);\\n+ dataoutput.writeFloat(this.d);\\n+ dataoutput.writeFloat(this.e);\\n+ dataoutput.writeFloat(this.f);\\n+ dataoutput.writeFloat(this.g);\\n+ dataoutput.writeFloat(this.h);\\n+ dataoutput.writeInt(this.i);\\n }\\n \\n public void a(NetHandler nethandler) {\\n@@ -63,4 +63,4 @@ public void a(NetHandler nethandler) {\\n public int a() {\\n return 64;\\n }\\n-}\\n\\\\ No newline at end of file\\n+}\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPacket63WorldParticles.java\",\n \"sha\": \"7b5818d8c3e542ecd03312f18ea6218cfdbda0d4\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPlayerInstance.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPlayerInstance.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/PlayerInstance.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,10 +1,8 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.ArrayList;\\n import java.util.List;\\n \\n-\\n class PlayerInstance {\\n \\n private final List b;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPlayerInstance.java\",\n \"sha\": \"d119b8b8367db9af0f370fcaf8beda86ff076c29\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 7,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotion.java\",\n \"changes\": 14,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotion.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 7,\n \"filename\": \"src/main/java/net/minecraft/server/Potion.java\",\n \"new_code\": \" if (entitylivingbase.aM() < entitylivingbase.aS()) {\\n if (entitylivingbase.aM() > 1.0F) {\\n ((EntityPlayer) entitylivingbase).bH().a(i0 + 1, 1.0F);\\n } else if ((this.H != h.H || entitylivingbase.aL()) && (this.H != i.H || !entitylivingbase.aL())) {\\n if (this.H == i.H && !entitylivingbase.aL() || this.H == h.H && entitylivingbase.aL()) {\\n if ((this.H != h.H || entitylivingbase1.aL()) && (this.H != i.H || !entitylivingbase1.aL())) {\\n if (this.H == i.H && !entitylivingbase1.aL() || this.H == h.H && entitylivingbase1.aL()) {\",\n \"new_methods\": [],\n \"old_code\": \" if (entitylivingbase.aJ() < entitylivingbase.aP()) {\\n if (entitylivingbase.aJ() > 1.0F) {\\n ((EntityPlayer) entitylivingbase).bD().a(i0 + 1, 1.0F);\\n } else if ((this.H != h.H || entitylivingbase.aI()) && (this.H != i.H || !entitylivingbase.aI())) {\\n if (this.H == i.H && !entitylivingbase.aI() || this.H == h.H && entitylivingbase.aI()) {\\n if ((this.H != h.H || entitylivingbase1.aI()) && (this.H != i.H || !entitylivingbase1.aI())) {\\n if (this.H == i.H && !entitylivingbase1.aI() || this.H == h.H && entitylivingbase1.aI()) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -80,11 +80,11 @@ public int c() {\\n \\n public void a(EntityLivingBase entitylivingbase, int i0) {\\n if (this.H == l.H) {\\n- if (entitylivingbase.aJ() < entitylivingbase.aP()) {\\n+ if (entitylivingbase.aM() < entitylivingbase.aS()) {\\n entitylivingbase.f(1.0F);\\n }\\n } else if (this.H == u.H) {\\n- if (entitylivingbase.aJ() > 1.0F) {\\n+ if (entitylivingbase.aM() > 1.0F) {\\n entitylivingbase.a(DamageSource.k, 1.0F);\\n }\\n } else if (this.H == v.H) {\\n@@ -93,10 +93,10 @@ public void a(EntityLivingBase entitylivingbase, int i0) {\\n ((EntityPlayer) entitylivingbase).a(0.025F * (float) (i0 + 1));\\n } else if (this.H == y.H && entitylivingbase instanceof EntityPlayer) {\\n if (!entitylivingbase.q.I) {\\n- ((EntityPlayer) entitylivingbase).bD().a(i0 + 1, 1.0F);\\n+ ((EntityPlayer) entitylivingbase).bH().a(i0 + 1, 1.0F);\\n }\\n- } else if ((this.H != h.H || entitylivingbase.aI()) && (this.H != i.H || !entitylivingbase.aI())) {\\n- if (this.H == i.H && !entitylivingbase.aI() || this.H == h.H && entitylivingbase.aI()) {\\n+ } else if ((this.H != h.H || entitylivingbase.aL()) && (this.H != i.H || !entitylivingbase.aL())) {\\n+ if (this.H == i.H && !entitylivingbase.aL() || this.H == h.H && entitylivingbase.aL()) {\\n entitylivingbase.a(DamageSource.k, (float) (6 << i0));\\n }\\n } else {\\n@@ -114,8 +114,8 @@ public void a(EntityLivingBase entitylivingbase, EntityLivingBase entitylivingba\\n //\\n int i1;\\n \\n- if ((this.H != h.H || entitylivingbase1.aI()) && (this.H != i.H || !entitylivingbase1.aI())) {\\n- if (this.H == i.H && !entitylivingbase1.aI() || this.H == h.H && entitylivingbase1.aI()) {\\n+ if ((this.H != h.H || entitylivingbase1.aL()) && (this.H != i.H || !entitylivingbase1.aL())) {\\n+ if (this.H == i.H && !entitylivingbase1.aL() || this.H == h.H && entitylivingbase1.aL()) {\\n i1 = (int) (d0 * (double) (6 << i0) + 0.5D);\\n if (entitylivingbase == null) {\\n entitylivingbase1.a(DamageSource.k, (float) i1);\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotion.java\",\n \"sha\": \"f743fda33fc006c2ebe362ccbaa60a84e7f2a71a\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotionEffect.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotionEffect.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/PotionEffect.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n public class PotionEffect {\\n \\n private int a;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FPotionEffect.java\",\n \"sha\": \"ee40ae8c24e6f84378247ba42f5de1af60ea0725\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveFormatOld.java\",\n \"changes\": 3,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveFormatOld.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/SaveFormatOld.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,15 +1,14 @@\\n package net.minecraft.server;\\n \\n-\\n import java.io.File;\\n import java.io.FileInputStream;\\n import java.io.InputStream;\\n \\n-\\n public class SaveFormatOld implements ISaveFormat {\\n \\n protected final File a;\\n protected net.canarymod.api.world.DimensionType type;\\n+\\n // CanaryMod changed constructor\\n \\n public SaveFormatOld(File file1, net.canarymod.api.world.DimensionType type) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveFormatOld.java\",\n \"sha\": \"acc6085981a6afa4820457d36d70d14cf5512803\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 8,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveHandler.java\",\n \"changes\": 15,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveHandler.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 7,\n \"filename\": \"src/main/java/net/minecraft/server/SaveHandler.java\",\n \"new_code\": \" * \\n * \\n }\\n finally {\\n }\\n finally {\\n // CanaryMod enable writing dat files from player name and a given base tag\\n // This is a copy of this.a(EntityPlayer and might need adjustments accordingly!)\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n\\n } finally {\\n } finally {\\n //CanaryMod enable writing dat files from player name and a given base tag\\n //This is a copy of this.a(EntityPlayer and might need adjustments accordingly!)\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n import java.io.DataInputStream;\\n import java.io.DataOutputStream;\\n import java.io.File;\\n@@ -9,10 +8,8 @@\\n import java.io.IOException;\\n import java.io.InputStream;\\n import java.io.OutputStream;\\n-\\n import net.canarymod.api.nbt.CanaryCompoundTag;\\n \\n-\\n public class SaveHandler implements ISaveHandler, IPlayerFileData {\\n \\n private final File a;\\n@@ -44,6 +41,7 @@ public SaveHandler(File file1, String s0, boolean flag0, net.canarymod.api.world\\n // CanaryMod added getname\\n /**\\n * get the base name of this world saver (only world name, without dimension appendix)\\n+ * \\n * @return\\n */\\n public String getBaseName() {\\n@@ -53,6 +51,7 @@ public String getBaseName() {\\n // CanaryMod\\n /**\\n * get the dir folder (worlds/)\\n+ * \\n * @return\\n */\\n public File getWorldBaseDir() {\\n@@ -66,7 +65,8 @@ private void h() {\\n \\n try {\\n dataoutputstream.writeLong(this.d);\\n- } finally {\\n+ }\\n+ finally {\\n dataoutputstream.close();\\n }\\n } catch (IOException ioexception) {\\n@@ -89,7 +89,8 @@ public void c() throws MinecraftException {\\n if (datainputstream.readLong() != this.d) {\\n throw new MinecraftException(\\\"The save is being accessed from another location, aborting\\\");\\n }\\n- } finally {\\n+ }\\n+ finally {\\n datainputstream.close();\\n }\\n } catch (IOException ioexception) {\\n@@ -272,8 +273,8 @@ public String g() {\\n return this.e;\\n }\\n \\n- //CanaryMod enable writing dat files from player name and a given base tag\\n- //This is a copy of this.a(EntityPlayer and might need adjustments accordingly!)\\n+ // CanaryMod enable writing dat files from player name and a given base tag\\n+ // This is a copy of this.a(EntityPlayer and might need adjustments accordingly!)\\n public void writePlayerNbt(String player, CanaryCompoundTag tag) {\\n try {\\n NBTTagCompound nbttagcompound = tag.getHandle();\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FSaveHandler.java\",\n \"sha\": \"3c1740763e22b7e020333546f8c2aa48e730b5f5\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScore.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScore.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/Score.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \" \",\n \"old_methods\": [],\n \"patch\": \"@@ -77,5 +77,5 @@ public void a(List list) {\\n public CanaryScore getCanaryScore() {\\n return this.score;\\n }\\n- \\n+\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScore.java\",\n \"sha\": \"67a8bb4afd68d95e717e2a1c52d9ba37a2528912\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreDummyCriteria.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreDummyCriteria.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/ScoreDummyCriteria.java\",\n \"new_code\": \" // CanaryMod: Set Variable\",\n \"new_methods\": [],\n \"old_code\": \" // CanaryMod: Set Variable\",\n \"old_methods\": [],\n \"patch\": \"@@ -15,7 +15,7 @@ public ScoreDummyCriteria(String s0) {\\n if (!ScoreObjectiveCriteria.a.containsKey(s0)) {\\n ScoreObjectiveCriteria.a.put(s0, this);\\n }//\\n- // CanaryMod: Set Variable\\n+ // CanaryMod: Set Variable\\n if (!(this instanceof ScoreHealthCriteria)) {\\n criteria = new CanaryScoreDummyCriteria(this);\\n }//\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreDummyCriteria.java\",\n \"sha\": \"41a0c583c579a769a223a81c87ff9cfb430c3f4e\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreHealthCriteria.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreHealthCriteria.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/ScoreHealthCriteria.java\",\n \"new_code\": \" for (Iterator iterator = list.iterator(); iterator.hasNext(); f0 += entityplayer.aM() + entityplayer.bm()) {\",\n \"new_methods\": [],\n \"old_code\": \" for (Iterator iterator = list.iterator(); iterator.hasNext(); f0 += entityplayer.aJ() + entityplayer.bj()) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -17,7 +17,7 @@ public int a(List list) {\\n \\n EntityPlayer entityplayer;\\n \\n- for (Iterator iterator = list.iterator(); iterator.hasNext(); f0 += entityplayer.aJ() + entityplayer.bj()) {\\n+ for (Iterator iterator = list.iterator(); iterator.hasNext(); f0 += entityplayer.aM() + entityplayer.bm()) {\\n entityplayer = (EntityPlayer) iterator.next();\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScoreHealthCriteria.java\",\n \"sha\": \"e31fa9cef7fd7597cdf30d6e8a56ed094fe7cd2d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 8,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScorePlayerTeam.java\",\n \"changes\": 12,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScorePlayerTeam.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 4,\n \"filename\": \"src/main/java/net/minecraft/server/ScorePlayerTeam.java\",\n \"new_code\": \"public class ScorePlayerTeam extends Team {\\n public final Scoreboard a; // CanaryMod: private to public\\n public String d(String s0) {\\n return this.e() + s0 + this.f();\\n }\\n\\n public static String a(Team team, String s0) {\\n return team == null ? s0 : team.d(s0);\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"String s0\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/ScorePlayerTeam.java\",\n \"implementation\": \"return this.e() + s0 + this.f();\",\n \"signature\": \"String d(String s0)\"\n }\n ],\n \"old_code\": \"public class ScorePlayerTeam {\\n public final Scoreboard a; //CanaryMod: private to public\\n public static String a(ScorePlayerTeam scoreplayerteam, String s0) {\\n return scoreplayerteam == null ? s0 : scoreplayerteam.e() + s0 + scoreplayerteam.f();\",\n \"old_methods\": [],\n \"patch\": \"@@ -5,9 +5,9 @@\\n import java.util.Set;\\n import net.canarymod.api.scoreboard.CanaryTeam;\\n \\n-public class ScorePlayerTeam {\\n+public class ScorePlayerTeam extends Team {\\n \\n- public final Scoreboard a; //CanaryMod: private to public\\n+ public final Scoreboard a; // CanaryMod: private to public\\n private final String b;\\n private final Set c = new HashSet();\\n private String d;\\n@@ -71,8 +71,12 @@ public void c(String s0) {\\n }\\n }\\n \\n- public static String a(ScorePlayerTeam scoreplayerteam, String s0) {\\n- return scoreplayerteam == null ? s0 : scoreplayerteam.e() + s0 + scoreplayerteam.f();\\n+ public String d(String s0) {\\n+ return this.e() + s0 + this.f();\\n+ }\\n+\\n+ public static String a(Team team, String s0) {\\n+ return team == null ? s0 : team.d(s0);\\n }\\n \\n public boolean g() {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FScorePlayerTeam.java\",\n \"sha\": \"3848beb60ef8f03f30b20752b141963bfc7b38be\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerBlockEventList.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerBlockEventList.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/ServerBlockEventList.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.ArrayList;\\n \\n-\\n class ServerBlockEventList extends ArrayList {\\n \\n private ServerBlockEventList() {}\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerBlockEventList.java\",\n \"sha\": \"0f76c5648598bbbf3792543104e27e0702ebdc11\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandManager.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandManager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/ServerCommandManager.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,11 +1,9 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.Iterator;\\n import net.canarymod.Canary;\\n import net.canarymod.api.world.CanaryWorld;\\n \\n-\\n public class ServerCommandManager extends CommandHandler implements IAdminCommand {\\n \\n public ServerCommandManager() {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandManager.java\",\n \"sha\": \"6668074ef444b6daf0838f3557c237dac64d1b46\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 5,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandScoreboard.java\",\n \"changes\": 9,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandScoreboard.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 4,\n \"filename\": \"src/main/java/net/minecraft/server/ServerCommandScoreboard.java\",\n \"new_code\": \" return ((CanaryWorld) Canary.getServer().getDefaultWorld()).getHandle().D;\\n\\n return ((CanaryWorld) Canary.getServer().getDefaultWorld()).getHandle().D;\\n s0 = b(icommandsender).am();\\n s0 = b(icommandsender).am();\",\n \"new_methods\": [],\n \"old_code\": \" return ((CanaryWorld)Canary.getServer().getDefaultWorld()).getHandle().D;\\n return ((CanaryWorld)Canary.getServer().getDefaultWorld()).getHandle().D;\\n s0 = b(icommandsender).al();\\n s0 = b(icommandsender).al();\",\n \"old_methods\": [],\n \"patch\": \"@@ -168,11 +168,12 @@ public void b(ICommandSender icommandsender, String[] astring) {\\n \\n protected Scoreboard d() {\\n // CanaryMod: This here returns the default world to get the default scoreboard.\\n- return ((CanaryWorld)Canary.getServer().getDefaultWorld()).getHandle().D;\\n+ return ((CanaryWorld) Canary.getServer().getDefaultWorld()).getHandle().D;\\n }\\n+\\n protected Scoreboard getScoreboard(World world) {\\n // CanaryMod: This here returns the default world to get the default scoreboard.\\n- return ((CanaryWorld)Canary.getServer().getDefaultWorld()).getHandle().D;\\n+ return ((CanaryWorld) Canary.getServer().getDefaultWorld()).getHandle().D;\\n }\\n \\n protected ScoreObjective a(String s0, boolean flag0) {\\n@@ -357,7 +358,7 @@ protected void g(ICommandSender icommandsender, String[] astring, int i0) {\\n String s0;\\n \\n if (icommandsender instanceof EntityPlayer && i0 == astring.length) {\\n- s0 = b(icommandsender).al();\\n+ s0 = b(icommandsender).am();\\n scoreboard.a(s0, scoreplayerteam);\\n hashset.add(s0);\\n } else {\\n@@ -380,7 +381,7 @@ protected void h(ICommandSender icommandsender, String[] astring, int i0) {\\n String s0;\\n \\n if (icommandsender instanceof EntityPlayer && i0 == astring.length) {\\n- s0 = b(icommandsender).al();\\n+ s0 = b(icommandsender).am();\\n if (scoreboard.g(s0)) {\\n hashset.add(s0);\\n } else {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerCommandScoreboard.java\",\n \"sha\": \"fb3208db7f8d5503ea1caf98301e0f38e71e350f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 19,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerConfigurationManager.java\",\n \"changes\": 38,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerConfigurationManager.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 19,\n \"filename\": \"src/main/java/net/minecraft/server/ServerConfigurationManager.java\",\n \"new_code\": \" ConnectionHook hook = (ConnectionHook) new ConnectionHook(entityplayermp.getPlayer(), ChatMessageComponent.b(\\\"multiplayer.player.joined\\\", new Object[]{ entityplayermp.ax() }).a(EnumChatFormatting.o).toString(), firstTime).call();\\n Iterator iterator = entityplayermp.aK().iterator();\\n // ChunkCoordinates chunkcoordinates = entityplayermp.bE(); //CanaryMod removed in favor of a real location\\n boolean flag1 = entityplayermp.bF();\\n entityplayermp1.g(entityplayermp1.aM());\\n Iterator iterator = entityplayermp.aK().iterator();\\n if (entity.S()) {\\n if (entity.S()) {\\n if (entity.S()) {\\n if (entity.S()) {\\n if ((world == null || entityplayermp.q == world) && (s0 == null || flag1 != s0.equalsIgnoreCase(entityplayermp.am()))) {\\n Team team = entityplayermp.bn();\\n String s2 = team == null ? \\\"\\\" : team.b();\\n Scoreboard scoreboard = entityplayer.bL();\\n Score score = entityplayer.bL().a(entityplayer.am(), scoreobjective);\\n public void a(ChatMessageComponent chatmessagecomponent) {\\n this.a(chatmessagecomponent, true);\\n }\\n\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"ChatMessageComponent chatmessagecomponent\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/ServerConfigurationManager.java\",\n \"implementation\": \"this.a(chatmessagecomponent, true);\",\n \"signature\": \"void a(ChatMessageComponent chatmessagecomponent)\"\n }\n ],\n \"old_code\": \" ConnectionHook hook = (ConnectionHook) new ConnectionHook(entityplayermp.getPlayer(), ChatMessageComponent.b(\\\"multiplayer.player.joined\\\", new Object[]{ entityplayermp.aw() }).a(EnumChatFormatting.o).toString(), firstTime).call();\\n Iterator iterator = entityplayermp.aH().iterator();\\n // ChunkCoordinates chunkcoordinates = entityplayermp.bA(); //CanaryMod removed in favor of a real location\\n boolean flag1 = entityplayermp.bB();\\n entityplayermp1.g(entityplayermp1.aJ());\\n Iterator iterator = entityplayermp.aH().iterator();\\n if (entity.R()) {\\n if (entity.R()) {\\n if (entity.R()) {\\n if (entity.R()) {\\n if ((world == null || entityplayermp.q == world) && (s0 == null || flag1 != s0.equalsIgnoreCase(entityplayermp.al()))) {\\n ScorePlayerTeam scoreplayerteam = entityplayermp.bI();\\n String s2 = scoreplayerteam == null ? \\\"\\\" : scoreplayerteam.b();\\n Scoreboard scoreboard = entityplayer.bH();\\n Score score = entityplayer.bH().a(entityplayer.al(), scoreobjective);\\n public void a(ChatMessageComponent chatmessagecomponent) {\\n this.a(chatmessagecomponent, true);\\n }\\n\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"ChatMessageComponent chatmessagecomponent\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/ServerConfigurationManager.java\",\n \"implementation\": \"this.a(chatmessagecomponent, true);\",\n \"signature\": \"void a(ChatMessageComponent chatmessagecomponent)\"\n }\n ],\n \"patch\": \"@@ -94,7 +94,7 @@ public void a(INetworkManager inetworkmanager, EntityPlayerMP entityplayermp) {\\n this.a((ServerScoreboard) worldserver.X(), entityplayermp);\\n this.b(entityplayermp, worldserver);\\n // CanaryMod Connection hook\\n- ConnectionHook hook = (ConnectionHook) new ConnectionHook(entityplayermp.getPlayer(), ChatMessageComponent.b(\\\"multiplayer.player.joined\\\", new Object[]{ entityplayermp.aw() }).a(EnumChatFormatting.o).toString(), firstTime).call();\\n+ ConnectionHook hook = (ConnectionHook) new ConnectionHook(entityplayermp.getPlayer(), ChatMessageComponent.b(\\\"multiplayer.player.joined\\\", new Object[]{ entityplayermp.ax() }).a(EnumChatFormatting.o).toString(), firstTime).call();\\n if (!hook.isHidden()) {\\n this.a((Packet) (new Packet3Chat(ChatMessageComponent.e(hook.getMessage()))));\\n }\\n@@ -107,7 +107,7 @@ public void a(INetworkManager inetworkmanager, EntityPlayerMP entityplayermp) {\\n entityplayermp.a(this.e.S(), this.e.U());\\n }\\n \\n- Iterator iterator = entityplayermp.aH().iterator();\\n+ Iterator iterator = entityplayermp.aK().iterator();\\n \\n while (iterator.hasNext()) {\\n PotionEffect potioneffect = (PotionEffect) iterator.next();\\n@@ -411,9 +411,9 @@ public EntityPlayerMP a(EntityPlayerMP entityplayermp, int i0, boolean flag0, Lo\\n entityplayermp.p().s().c(entityplayermp);\\n this.a.remove(entityplayermp);\\n this.e.getWorld(entityplayermp.getCanaryWorld().getName(), entityplayermp.ar).f(entityplayermp); // CanaryMod: added multiworld support\\n- // ChunkCoordinates chunkcoordinates = entityplayermp.bA(); //CanaryMod removed in favor of a real location\\n+ // ChunkCoordinates chunkcoordinates = entityplayermp.bE(); //CanaryMod removed in favor of a real location\\n Location respawnLocation = entityplayermp.getRespawnLocation();\\n- boolean flag1 = entityplayermp.bB();\\n+ boolean flag1 = entityplayermp.bF();\\n boolean isBedSpawn = respawnLocation != null;\\n entityplayermp.ar = i0;\\n Object object;\\n@@ -486,7 +486,7 @@ public EntityPlayerMP a(EntityPlayerMP entityplayermp, int i0, boolean flag0, Lo\\n worldserver.d(entityplayermp1);\\n this.a.add(entityplayermp1);\\n entityplayermp1.d();\\n- entityplayermp1.g(entityplayermp1.aJ());\\n+ entityplayermp1.g(entityplayermp1.aM());\\n //\\n return entityplayermp1;\\n }\\n@@ -518,7 +518,7 @@ public void a(EntityPlayerMP entityplayermp, String worldName, int i0) {\\n entityplayermp.c.a(worldserver1);\\n this.b(entityplayermp, worldserver1);\\n this.f(entityplayermp);\\n- Iterator iterator = entityplayermp.aH().iterator();\\n+ Iterator iterator = entityplayermp.aK().iterator();\\n \\n while (iterator.hasNext()) {\\n PotionEffect potioneffect = (PotionEffect) iterator.next();\\n@@ -541,14 +541,14 @@ public void a(Entity entity, int i0, WorldServer worldserver, WorldServer worlds\\n d0 /= d2;\\n d1 /= d2;\\n entity.b(d0, entity.v, d1, entity.A, entity.B);\\n- if (entity.R()) {\\n+ if (entity.S()) {\\n worldserver.a(entity, false);\\n }\\n } else if (entity.ar == 0) {\\n d0 *= d2;\\n d1 *= d2;\\n entity.b(d0, entity.v, d1, entity.A, entity.B);\\n- if (entity.R()) {\\n+ if (entity.S()) {\\n worldserver.a(entity, false);\\n }\\n } else {\\n@@ -564,7 +564,7 @@ public void a(Entity entity, int i0, WorldServer worldserver, WorldServer worlds\\n entity.v = (double) chunkcoordinates.b;\\n d1 = (double) chunkcoordinates.c;\\n entity.b(d0, entity.v, d1, 90.0F, 0.0F);\\n- if (entity.R()) {\\n+ if (entity.S()) {\\n worldserver.a(entity, false);\\n }\\n }\\n@@ -574,7 +574,7 @@ public void a(Entity entity, int i0, WorldServer worldserver, WorldServer worlds\\n worldserver.C.a(\\\"placing\\\");\\n d0 = (double) MathHelper.a((int) d0, -29999872, 29999872);\\n d1 = (double) MathHelper.a((int) d1, -29999872, 29999872);\\n- if (entity.R()) {\\n+ if (entity.S()) {\\n worldserver1.d(entity);\\n entity.b(d0, entity.v, d1, entity.A, entity.B);\\n worldserver1.a(entity, false);\\n@@ -729,10 +729,10 @@ public List a(ChunkCoordinates chunkcoordinates, int i0, int i1, int i2, int i3,\\n for (int i8 = 0; i8 < this.a.size(); ++i8) {\\n EntityPlayerMP entityplayermp = (EntityPlayerMP) this.a.get(i8);\\n \\n- if ((world == null || entityplayermp.q == world) && (s0 == null || flag1 != s0.equalsIgnoreCase(entityplayermp.al()))) {\\n+ if ((world == null || entityplayermp.q == world) && (s0 == null || flag1 != s0.equalsIgnoreCase(entityplayermp.am()))) {\\n if (s1 != null) {\\n- ScorePlayerTeam scoreplayerteam = entityplayermp.bI();\\n- String s2 = scoreplayerteam == null ? \\\"\\\" : scoreplayerteam.b();\\n+ Team team = entityplayermp.bn();\\n+ String s2 = team == null ? \\\"\\\" : team.b();\\n \\n if (flag2 == s1.equalsIgnoreCase(s2)) {\\n continue;\\n@@ -791,14 +791,14 @@ private boolean a(EntityPlayer entityplayer, Map map) {\\n s0 = s0.substring(0, s0.length() - 4);\\n }\\n \\n- Scoreboard scoreboard = entityplayer.bH();\\n+ Scoreboard scoreboard = entityplayer.bL();\\n ScoreObjective scoreobjective = scoreboard.b(s0);\\n \\n if (scoreobjective == null) {\\n return false;\\n }\\n \\n- Score score = entityplayer.bH().a(entityplayer.al(), scoreobjective);\\n+ Score score = entityplayer.bL().a(entityplayer.am(), scoreobjective);\\n \\n i0 = score.c();\\n if (i0 < ((Integer) entry.getValue()).intValue() && flag0) {\\n@@ -930,10 +930,6 @@ private void a(EntityPlayerMP entityplayermp, EntityPlayerMP entityplayermp1, Wo\\n entityplayermp.c.b(world.N().r());\\n }\\n \\n- public void a(ChatMessageComponent chatmessagecomponent) {\\n- this.a(chatmessagecomponent, true);\\n- }\\n-\\n public void r() {\\n // CanaryMod shutdown hook\\n ServerShutdownHook hook = (ServerShutdownHook) new ServerShutdownHook(\\\"Server closed\\\").call();\\n@@ -943,6 +939,10 @@ public void r() {\\n }\\n }\\n \\n+ public void a(ChatMessageComponent chatmessagecomponent) {\\n+ this.a(chatmessagecomponent, true);\\n+ }\\n+\\n public void a(ChatMessageComponent chatmessagecomponent, boolean flag0) {\\n this.e.a(chatmessagecomponent);\\n this.a((Packet) (new Packet3Chat(chatmessagecomponent, flag0)));\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerConfigurationManager.java\",\n \"sha\": \"f7b98c1a7bc8d02023020ae4cfebb056b26a609f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerListenThread.java\",\n \"changes\": 7,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerListenThread.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 5,\n \"filename\": \"src/main/java/net/minecraft/server/ServerListenThread.java\",\n \"new_code\": \" netloginhandler.d();\\n this.e.d().an().b(\\\"Failed to handle packet for \\\" + netloginhandler.f() + \\\": \\\" + exception, (Throwable) exception);\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n\\n netloginhandler.c();\\n this.e.d().an().b(\\\"Failed to handle packet for \\\" + netloginhandler.e() + \\\": \\\" + exception, (Throwable) exception);\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n import java.io.IOException;\\n import java.net.InetAddress;\\n import java.net.ServerSocket;\\n@@ -9,10 +8,8 @@\\n import java.util.Collections;\\n import java.util.HashMap;\\n import java.util.List;\\n-\\n import net.canarymod.Canary;\\n \\n-\\n public class ServerListenThread extends Thread {\\n \\n private final List a = Collections.synchronizedList(new ArrayList());\\n@@ -40,10 +37,10 @@ public void a() {\\n NetLoginHandler netloginhandler = (NetLoginHandler) this.a.get(i0);\\n \\n try {\\n- netloginhandler.c();\\n+ netloginhandler.d();\\n } catch (Exception exception) {\\n netloginhandler.a(\\\"Internal server error\\\");\\n- this.e.d().an().b(\\\"Failed to handle packet for \\\" + netloginhandler.e() + \\\": \\\" + exception, (Throwable) exception);\\n+ this.e.d().an().b(\\\"Failed to handle packet for \\\" + netloginhandler.f() + \\\": \\\" + exception, (Throwable) exception);\\n }\\n \\n if (netloginhandler.b) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FServerListenThread.java\",\n \"sha\": \"65dcde73e93e9b798fc5952af0ffc5f3c0001ad3\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdPieces.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdPieces.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/StructureStrongholdPieces.java\",\n \"new_code\": \" private static final StructureStrongholdPieceWeight[] b = new StructureStrongholdPieceWeight[]{ new StructureStrongholdPieceWeight(ComponentStrongholdStraight.class, 40, 0), new StructureStrongholdPieceWeight(ComponentStrongholdPrison.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdLeftTurn.class, 20, 0),\\n new StructureStrongholdPieceWeight(ComponentStrongholdRightTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRoomCrossing.class, 10, 6), new StructureStrongholdPieceWeight(ComponentStrongholdStairsStraight.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdStairs.class, 5, 5),\\n new StructureStrongholdPieceWeight(ComponentStrongholdCrossing.class, 5, 4), new StructureStrongholdPieceWeight(ComponentStrongholdChestCorridor.class, 5, 4), new StructureStrongholdPieceWeight2(ComponentStrongholdLibrary.class, 10, 2), new StructureStrongholdPieceWeight3(ComponentStrongholdPortalRoom.class, 20, 1) };\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n private static final StructureStrongholdPieceWeight[] b = new StructureStrongholdPieceWeight[]{ new StructureStrongholdPieceWeight(ComponentStrongholdStraight.class, 40, 0), new StructureStrongholdPieceWeight(ComponentStrongholdPrison.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdLeftTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRightTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRoomCrossing.class, 10, 6), new StructureStrongholdPieceWeight(ComponentStrongholdStairsStraight.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdStairs.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdCrossing.class, 5, 4), new StructureStrongholdPieceWeight(ComponentStrongholdChestCorridor.class, 5, 4), new StructureStrongholdPieceWeight2(ComponentStrongholdLibrary.class, 10, 2), new StructureStrongholdPieceWeight3(ComponentStrongholdPortalRoom.class, 20, 1) };\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,15 +1,15 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.ArrayList;\\n import java.util.Iterator;\\n import java.util.List;\\n import java.util.Random;\\n \\n-\\n public class StructureStrongholdPieces {\\n \\n- private static final StructureStrongholdPieceWeight[] b = new StructureStrongholdPieceWeight[]{ new StructureStrongholdPieceWeight(ComponentStrongholdStraight.class, 40, 0), new StructureStrongholdPieceWeight(ComponentStrongholdPrison.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdLeftTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRightTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRoomCrossing.class, 10, 6), new StructureStrongholdPieceWeight(ComponentStrongholdStairsStraight.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdStairs.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdCrossing.class, 5, 4), new StructureStrongholdPieceWeight(ComponentStrongholdChestCorridor.class, 5, 4), new StructureStrongholdPieceWeight2(ComponentStrongholdLibrary.class, 10, 2), new StructureStrongholdPieceWeight3(ComponentStrongholdPortalRoom.class, 20, 1) };\\n+ private static final StructureStrongholdPieceWeight[] b = new StructureStrongholdPieceWeight[]{ new StructureStrongholdPieceWeight(ComponentStrongholdStraight.class, 40, 0), new StructureStrongholdPieceWeight(ComponentStrongholdPrison.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdLeftTurn.class, 20, 0),\\n+ new StructureStrongholdPieceWeight(ComponentStrongholdRightTurn.class, 20, 0), new StructureStrongholdPieceWeight(ComponentStrongholdRoomCrossing.class, 10, 6), new StructureStrongholdPieceWeight(ComponentStrongholdStairsStraight.class, 5, 5), new StructureStrongholdPieceWeight(ComponentStrongholdStairs.class, 5, 5),\\n+ new StructureStrongholdPieceWeight(ComponentStrongholdCrossing.class, 5, 4), new StructureStrongholdPieceWeight(ComponentStrongholdChestCorridor.class, 5, 4), new StructureStrongholdPieceWeight2(ComponentStrongholdLibrary.class, 10, 2), new StructureStrongholdPieceWeight3(ComponentStrongholdPortalRoom.class, 20, 1) };\\n private static List c;\\n private static Class d;\\n static int a = 0;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdPieces.java\",\n \"sha\": \"9860ffe43c1e928a73e247949f51aa39b497c766\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdStones.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdStones.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/StructureStrongholdStones.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.Random;\\n \\n-\\n class StructureStrongholdStones extends StructurePieceBlockSelector {\\n \\n private StructureStrongholdStones() {}\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FStructureStrongholdStones.java\",\n \"sha\": \"7cbdb6999a72deca9c1a5ce24cee60ca85ecdce0\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntity.java\",\n \"changes\": 5,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntity.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntity.java\",\n \"new_code\": \"\\n public World az() {\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n public World ay() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,13 +1,11 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.HashMap;\\n import java.util.Map;\\n import java.util.concurrent.Callable;\\n import net.canarymod.api.nbt.CanaryCompoundTag;\\n import net.canarymod.api.world.blocks.ComplexBlock;\\n \\n-\\n public class TileEntity {\\n \\n private static Map a = new HashMap();\\n@@ -23,6 +21,7 @@ public class TileEntity {\\n // CanaryMod: Variable Declaration\\n public ComplexBlock complexBlock;\\n private CanaryCompoundTag meta = new CanaryCompoundTag(\\\"Canary\\\"); // hold it for extra data\\n+\\n // CanaryMod: End\\n \\n public TileEntity() {}\\n@@ -36,7 +35,7 @@ private static void a(Class oclass0, String s0) {\\n }\\n }\\n \\n- public World ay() {\\n+ public World az() {\\n return this.k;\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntity.java\",\n \"sha\": \"44d815001c91f60a8146d824da2aea3b68429dd1\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBeacon.java\",\n \"changes\": 8,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBeacon.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 5,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntityBeacon.java\",\n \"new_code\": \" public static final Potion[][] a = new Potion[][]{ { Potion.c, Potion.e }, { Potion.m, Potion.j }, { Potion.g }, { Potion.l } };\\n entityplayer.c(new PotionEffect(this.f, 180, b0, true));\\n entityplayer.c(new PotionEffect(this.g, 180, 0, true));\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n public static final Potion[][] a = new Potion[][] { { Potion.c, Potion.e}, { Potion.m, Potion.j}, { Potion.g}, { Potion.l}};\\n entityplayer.d(new PotionEffect(this.f, 180, b0, true));\\n entityplayer.d(new PotionEffect(this.g, 180, 0, true));\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,14 +1,12 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.Iterator;\\n import java.util.List;\\n import net.canarymod.api.world.blocks.CanaryBeacon;\\n \\n-\\n public class TileEntityBeacon extends TileEntity implements IInventory {\\n \\n- public static final Potion[][] a = new Potion[][] { { Potion.c, Potion.e}, { Potion.m, Potion.j}, { Potion.g}, { Potion.l}};\\n+ public static final Potion[][] a = new Potion[][]{ { Potion.c, Potion.e }, { Potion.m, Potion.j }, { Potion.g }, { Potion.l } };\\n private boolean d;\\n private int e = -1;\\n private int f;\\n@@ -46,15 +44,15 @@ private void u() {\\n \\n while (iterator.hasNext()) {\\n entityplayer = (EntityPlayer) iterator.next();\\n- entityplayer.d(new PotionEffect(this.f, 180, b0, true));\\n+ entityplayer.c(new PotionEffect(this.f, 180, b0, true));\\n }\\n \\n if (this.e >= 4 && this.f != this.g && this.g > 0) {\\n iterator = list.iterator();\\n \\n while (iterator.hasNext()) {\\n entityplayer = (EntityPlayer) iterator.next();\\n- entityplayer.d(new PotionEffect(this.g, 180, 0, true));\\n+ entityplayer.c(new PotionEffect(this.g, 180, 0, true));\\n }\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBeacon.java\",\n \"sha\": \"f1b102cf4f5f9878f735dcfb8692f2b499ee644b\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBrewingStand.java\",\n \"changes\": 6,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBrewingStand.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 4,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntityBrewingStand.java\",\n \"new_code\": \" private static final int[] a = new int[]{ 3 };\\n private static final int[] b = new int[]{ 0, 1, 2 };\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n private static final int[] a = new int[] { 3};\\n private static final int[] b = new int[] { 0, 1, 2};\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,14 +1,12 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.List;\\n import net.canarymod.api.world.blocks.CanaryBrewingStand;\\n \\n-\\n public class TileEntityBrewingStand extends TileEntity implements ISidedInventory {\\n \\n- private static final int[] a = new int[] { 3};\\n- private static final int[] b = new int[] { 0, 1, 2};\\n+ private static final int[] a = new int[]{ 3 };\\n+ private static final int[] b = new int[]{ 0, 1, 2 };\\n public ItemStack[] c = new ItemStack[4]; // CanaryMod: private => public\\n private int d;\\n private int e;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityBrewingStand.java\",\n \"sha\": \"324e198ec68c11176db85014e9e4abe3079152ec\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityChest.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityChest.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntityChest.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,11 +1,9 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.Iterator;\\n import java.util.List;\\n import net.canarymod.api.world.blocks.CanaryChest;\\n \\n-\\n public class TileEntityChest extends TileEntity implements IInventory {\\n \\n public ItemStack[] i = new ItemStack[36]; // CanaryMod: private => public\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityChest.java\",\n \"sha\": \"17c91226e9be44275dfb77ec1061e5bce2b8b923\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityCommandBlock.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityCommandBlock.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntityCommandBlock.java\",\n \"new_code\": \" return this.az();\",\n \"new_methods\": [],\n \"old_code\": \" return this.ay();\",\n \"old_methods\": [],\n \"patch\": \"@@ -74,7 +74,7 @@ public ChunkCoordinates b() {\\n }\\n \\n public World f_() {\\n- return this.ay();\\n+ return this.az();\\n }\\n \\n public Packet m() {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityCommandBlock.java\",\n \"sha\": \"de83634386b8b4f8b9c52cd3387456de6f2c2e74\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityComparator.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityComparator.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntityComparator.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.world.blocks.CanaryComparator;\\n \\n-\\n public class TileEntityComparator extends TileEntity {\\n \\n private int a = 0;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityComparator.java\",\n \"sha\": \"a7ee0583b9746aae8fbc18a4e5631fba0ab46c44\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDaylightDetector.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDaylightDetector.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntityDaylightDetector.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.world.blocks.CanaryDaylightDetector;\\n \\n-\\n public class TileEntityDaylightDetector extends TileEntity {\\n \\n public TileEntityDaylightDetector() {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDaylightDetector.java\",\n \"sha\": \"e5ec583b91e9c44c9a270b49ba98aeffbf659dab\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDispenser.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDispenser.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntityDispenser.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,10 +1,8 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.Random;\\n import net.canarymod.api.world.blocks.CanaryDispenser;\\n \\n-\\n public class TileEntityDispenser extends TileEntity implements IInventory {\\n \\n public ItemStack[] b = new ItemStack[9]; // CanaryMod: private => public\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDispenser.java\",\n \"sha\": \"8c9bc7a691c835536113bd97343f6624c4078565\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDropper.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDropper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntityDropper.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.world.blocks.CanaryDropper;\\n \\n-\\n public class TileEntityDropper extends TileEntityDispenser {\\n \\n public TileEntityDropper() {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityDropper.java\",\n \"sha\": \"5b51ee58c72cb1162b136a81c55b26085030aeef\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 6,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityHopper.java\",\n \"changes\": 12,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityHopper.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 6,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntityHopper.java\",\n \"new_code\": \" EntityItem entityitem = a(hopper.az(), hopper.aA(), hopper.aB() + 1.0D, hopper.aC());\\n return b(this.az(), (double) (this.l + Facing.b[i0]), (double) (this.m + Facing.c[i0]), (double) (this.n + Facing.d[i0]));\\n return b(hopper.az(), hopper.aA(), hopper.aB() + 1.0D, hopper.aC());\\n public double aA() {\\n public double aB() {\\n public double aC() {\",\n \"new_methods\": [],\n \"old_code\": \" EntityItem entityitem = a(hopper.ay(), hopper.az(), hopper.aA() + 1.0D, hopper.aB());\\n return b(this.ay(), (double) (this.l + Facing.b[i0]), (double) (this.m + Facing.c[i0]), (double) (this.n + Facing.d[i0]));\\n return b(hopper.ay(), hopper.az(), hopper.aA() + 1.0D, hopper.aB());\\n public double az() {\\n public double aA() {\\n public double aB() {\",\n \"old_methods\": [],\n \"patch\": \"@@ -219,7 +219,7 @@ public static boolean a(Hopper hopper) {\\n }\\n }\\n } else {\\n- EntityItem entityitem = a(hopper.ay(), hopper.az(), hopper.aA() + 1.0D, hopper.aB());\\n+ EntityItem entityitem = a(hopper.az(), hopper.aA(), hopper.aB() + 1.0D, hopper.aC());\\n \\n if (entityitem != null) {\\n return a((IInventory) hopper, entityitem);\\n@@ -346,11 +346,11 @@ private static ItemStack c(IInventory iinventory, ItemStack itemstack, int i0, i\\n private IInventory v() {\\n int i0 = BlockHopper.c(this.p());\\n \\n- return b(this.ay(), (double) (this.l + Facing.b[i0]), (double) (this.m + Facing.c[i0]), (double) (this.n + Facing.d[i0]));\\n+ return b(this.az(), (double) (this.l + Facing.b[i0]), (double) (this.m + Facing.c[i0]), (double) (this.n + Facing.d[i0]));\\n }\\n \\n public static IInventory b(Hopper hopper) {\\n- return b(hopper.ay(), hopper.az(), hopper.aA() + 1.0D, hopper.aB());\\n+ return b(hopper.az(), hopper.aA(), hopper.aB() + 1.0D, hopper.aC());\\n }\\n \\n public static EntityItem a(World world, double d0, double d1, double d2) {\\n@@ -393,15 +393,15 @@ private static boolean a(ItemStack itemstack, ItemStack itemstack1) {\\n return itemstack.d != itemstack1.d ? false : (itemstack.k() != itemstack1.k() ? false : (itemstack.b > itemstack.e() ? false : ItemStack.a(itemstack, itemstack1)));\\n }\\n \\n- public double az() {\\n+ public double aA() {\\n return (double) this.l;\\n }\\n \\n- public double aA() {\\n+ public double aB() {\\n return (double) this.m;\\n }\\n \\n- public double aB() {\\n+ public double aC() {\\n return (double) this.n;\\n }\\n \",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityHopper.java\",\n \"sha\": \"eabdce1b3a547f1682a3230e16235d5c65a9a0fd\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityMobSpawner.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityMobSpawner.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntityMobSpawner.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.world.blocks.CanaryMobSpawner;\\n \\n-\\n public class TileEntityMobSpawner extends TileEntity {\\n \\n private final MobSpawnerBaseLogic a = new TileEntityMobSpawnerLogic(this);\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityMobSpawner.java\",\n \"sha\": \"e914ddf7e6a3a3b708b4cd985952f7dcac15ec33\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityNote.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityNote.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntityNote.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.world.blocks.CanaryNoteBlock;\\n \\n-\\n public class TileEntityNote extends TileEntity {\\n \\n public byte a = 0;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityNote.java\",\n \"sha\": \"235f09619b5db538a35ede5dff6e33c83562a23a\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityRecordPlayer.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityRecordPlayer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntityRecordPlayer.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.world.blocks.CanaryJukebox;\\n \\n-\\n public class TileEntityRecordPlayer extends TileEntity {\\n \\n private ItemStack a;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntityRecordPlayer.java\",\n \"sha\": \"b33d89ec241a5efbdeeaa27bf5532c4b645bdeb2\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 10,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySign.java\",\n \"changes\": 13,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySign.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 3,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntitySign.java\",\n \"new_code\": \" public String[] a = new String[]{ \\\"\\\", \\\"\\\", \\\"\\\", \\\"\\\" };\\n private EntityPlayer d;\\n public void a(EntityPlayer entityplayer) {\\n this.d = entityplayer;\\n }\\n\\n public EntityPlayer b() {\\n return this.d;\\n }\\n\",\n \"new_methods\": [\n {\n \"arguments\": [\n \"EntityPlayer entityplayer\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/TileEntitySign.java\",\n \"implementation\": \"this.d = entityplayer;\",\n \"signature\": \"void a(EntityPlayer entityplayer)\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/main/java/net/minecraft/server/TileEntitySign.java\",\n \"implementation\": \"return this.d;\",\n \"signature\": \"EntityPlayer b()\"\n }\n ],\n \"old_code\": \"\\n\\n public String[] a = new String[] { \\\"\\\", \\\"\\\", \\\"\\\", \\\"\\\"};\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,14 +1,13 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.world.blocks.CanarySign;\\n \\n-\\n public class TileEntitySign extends TileEntity {\\n \\n- public String[] a = new String[] { \\\"\\\", \\\"\\\", \\\"\\\", \\\"\\\"};\\n+ public String[] a = new String[]{ \\\"\\\", \\\"\\\", \\\"\\\", \\\"\\\" };\\n public int b = -1;\\n private boolean c = true;\\n+ private EntityPlayer d;\\n \\n public TileEntitySign() {\\n this.complexBlock = new CanarySign(this); // CanaryMod: wrap sign\\n@@ -45,6 +44,14 @@ public boolean a() {\\n return this.c;\\n }\\n \\n+ public void a(EntityPlayer entityplayer) {\\n+ this.d = entityplayer;\\n+ }\\n+\\n+ public EntityPlayer b() {\\n+ return this.d;\\n+ }\\n+\\n // CanaryMod\\n public CanarySign getCanarySign() {\\n return (CanarySign) complexBlock;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySign.java\",\n \"sha\": \"9daa8eb3cdc6417195fe1d1af1005d26dcbb36b5\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySkull.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySkull.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/TileEntitySkull.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import net.canarymod.api.world.blocks.CanarySkull;\\n \\n-\\n public class TileEntitySkull extends TileEntity {\\n \\n private int a;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FTileEntitySkull.java\",\n \"sha\": \"269500b10d09c49ad033ff3d188c101d2169191c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 3,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FVillage.java\",\n \"changes\": 7,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FVillage.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 4,\n \"filename\": \"src/main/java/net/minecraft/server/Village.java\",\n \"new_code\": \" }\\n while (villagedoorinfo.a != i0 || villagedoorinfo.c != i2 || Math.abs(villagedoorinfo.b - i1) > 1);\\n if (!villageagressor.a.S() || Math.abs(this.g - villageagressor.b) > 300) {\",\n \"new_methods\": [],\n \"old_code\": \"\\n\\n } while (villagedoorinfo.a != i0 || villagedoorinfo.c != i2 || Math.abs(villagedoorinfo.b - i1) > 1);\\n if (!villageagressor.a.R() || Math.abs(this.g - villageagressor.b) > 300) {\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,13 +1,11 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.ArrayList;\\n import java.util.Iterator;\\n import java.util.List;\\n import java.util.TreeMap;\\n import net.canarymod.api.world.CanaryVillage;\\n \\n-\\n public class Village {\\n \\n private World a;\\n@@ -202,7 +200,8 @@ public VillageDoorInfo e(int i0, int i1, int i2) {\\n }\\n \\n villagedoorinfo = (VillageDoorInfo) iterator.next();\\n- } while (villagedoorinfo.a != i0 || villagedoorinfo.c != i2 || Math.abs(villagedoorinfo.b - i1) > 1);\\n+ }\\n+ while (villagedoorinfo.a != i0 || villagedoorinfo.c != i2 || Math.abs(villagedoorinfo.b - i1) > 1);\\n \\n return villagedoorinfo;\\n }\\n@@ -287,7 +286,7 @@ private void l() {\\n while (iterator.hasNext()) {\\n VillageAgressor villageagressor = (VillageAgressor) iterator.next();\\n \\n- if (!villageagressor.a.R() || Math.abs(this.g - villageagressor.b) > 300) {\\n+ if (!villageagressor.a.S() || Math.abs(this.g - villageagressor.b) > 300) {\\n iterator.remove();\\n }\\n }\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FVillage.java\",\n \"sha\": \"a99feb182034bfecf5a62aec254c69fe4ce7264e\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWatchableObject.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWatchableObject.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/WatchableObject.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n public class WatchableObject {\\n \\n private final int a;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWatchableObject.java\",\n \"sha\": \"463fdb6cf23eb9eec86e09e431533d5cf25d7644\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWeightedRandomChestContent.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWeightedRandomChestContent.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 2,\n \"filename\": \"src/main/java/net/minecraft/server/WeightedRandomChestContent.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\\n\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,9 +1,7 @@\\n package net.minecraft.server;\\n \\n-\\n import java.util.Random;\\n \\n-\\n public class WeightedRandomChestContent extends WeightedRandomItem {\\n \\n private ItemStack b = null;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWeightedRandomChestContent.java\",\n \"sha\": \"20bd5111fc24c2fc24ff24afcc984b1b8c70e213\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 8,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorld.java\",\n \"changes\": 16,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorld.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 8,\n \"filename\": \"src/main/java/net/minecraft/server/World.java\",\n \"new_code\": \" ++entity.ac;\\n entity.U();\\n if (vec3.b() > 0.0D && entity.aw()) {\\n if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).bE()) && oclass0.isAssignableFrom(entity.getClass())) {\\n if (!entityplayer1.bG.a && entityplayer1.S()) {\\n if (entityplayer1.ag()) {\\n if (entityplayer1.ai()) {\\n float f0 = entityplayer1.bw();\",\n \"new_methods\": [],\n \"old_code\": \" entity.T();\\n ++entity.ac;\\n if (vec3.b() > 0.0D && entity.av()) {\\n if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).bA()) && oclass0.isAssignableFrom(entity.getClass())) {\\n if (!entityplayer1.bG.a && entityplayer1.R()) {\\n if (entityplayer1.af()) {\\n if (entityplayer1.ah()) {\\n float f0 = entityplayer1.bs();\",\n \"old_methods\": [],\n \"patch\": \"@@ -1269,10 +1269,10 @@ public void a(Entity entity, boolean flag0) {\\n entity.C = entity.A;\\n entity.D = entity.B;\\n if (flag0 && entity.ai) {\\n+ ++entity.ac;\\n if (entity.o != null) {\\n- entity.T();\\n+ entity.U();\\n } else {\\n- ++entity.ac;\\n entity.l_();\\n }\\n }\\n@@ -1471,7 +1471,7 @@ public boolean a(AxisAlignedBB axisalignedbb, Material material, Entity entity)\\n }\\n }\\n \\n- if (vec3.b() > 0.0D && entity.av()) {\\n+ if (vec3.b() > 0.0D && entity.aw()) {\\n vec3 = vec3.a();\\n double d1 = 0.014D;\\n \\n@@ -2245,7 +2245,7 @@ public int a(Class oclass0) {\\n for (int i1 = 0; i1 < this.e.size(); ++i1) {\\n Entity entity = (Entity) this.e.get(i1);\\n \\n- if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).bA()) && oclass0.isAssignableFrom(entity.getClass())) {\\n+ if ((!(entity instanceof EntityLiving) || !((EntityLiving) entity).bE()) && oclass0.isAssignableFrom(entity.getClass())) {\\n ++i0;\\n }\\n }\\n@@ -2430,16 +2430,16 @@ public EntityPlayer b(double d0, double d1, double d2, double d3) {\\n for (int i0 = 0; i0 < this.h.size(); ++i0) {\\n EntityPlayer entityplayer1 = (EntityPlayer) this.h.get(i0);\\n \\n- if (!entityplayer1.bG.a && entityplayer1.R()) {\\n+ if (!entityplayer1.bG.a && entityplayer1.S()) {\\n double d5 = entityplayer1.e(d0, d1, d2);\\n double d6 = d3;\\n \\n- if (entityplayer1.af()) {\\n+ if (entityplayer1.ag()) {\\n d6 = d3 * 0.800000011920929D;\\n }\\n \\n- if (entityplayer1.ah()) {\\n- float f0 = entityplayer1.bs();\\n+ if (entityplayer1.ai()) {\\n+ float f0 = entityplayer1.bw();\\n \\n if (f0 < 0.1F) {\\n f0 = 0.1F;\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorld.java\",\n \"sha\": \"fb823ba886343fcfab7bade80dee395b25ad4275\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 9,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServer.java\",\n \"changes\": 27,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServer.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 18,\n \"filename\": \"src/main/java/net/minecraft/server/WorldServer.java\",\n \"new_code\": \" if (!entityplayer.bg()) {\\n if (entityplayer.bg()) {\\n while (entityplayer.bC());\\n if (!this.a.Y() && entity instanceof INpc) {\\n entity.w();\\n\\n super.a(entity, flag0);\\n Entity[] aentity = entity.an();\\n Entity[] aentity = entity.an();\",\n \"new_methods\": [],\n \"old_code\": \" if (!entityplayer.bd()) {\\n if (entityplayer.bd()) {\\n while (entityplayer.by());\\n if (!(entity.n instanceof EntityPlayer)) {\\n super.a(entity, flag0);\\n }\\n }\\n\\n public void b(Entity entity, boolean flag0) {\\n try {\\n super.a(entity, flag0);\\n } catch (Throwable throwable) {\\n CrashReport crashreport = CrashReport.a(throwable, \\\"Forcefully ticking entity\\\");\\n CrashReportCategory crashreportcategory = crashreport.a(\\\"Entity being force ticked\\\");\\n entity.a(crashreportcategory);\\n throw new ReportedException(crashreport);\\n Entity[] aentity = entity.am();\\n Entity[] aentity = entity.am();\",\n \"old_methods\": [\n {\n \"arguments\": [\n \"Entity entity\",\n \" boolean flag0\"\n ],\n \"filename\": \"src/main/java/net/minecraft/server/WorldServer.java\",\n \"implementation\": \"try {\\n super.a(entity, flag0);\",\n \"signature\": \"void b(Entity entity, boolean flag0)\"\n }\n ],\n \"patch\": \"@@ -140,7 +140,7 @@ public void c() {\\n while (iterator.hasNext()) {\\n EntityPlayer entityplayer = (EntityPlayer) iterator.next();\\n \\n- if (!entityplayer.bd()) {\\n+ if (!entityplayer.bg()) {\\n this.N = false;\\n break;\\n }\\n@@ -154,7 +154,7 @@ protected void d() {\\n while (iterator.hasNext()) {\\n EntityPlayer entityplayer = (EntityPlayer) iterator.next();\\n \\n- if (entityplayer.bd()) {\\n+ if (entityplayer.bg()) {\\n entityplayer.a(false, false, true);\\n }\\n }\\n@@ -190,7 +190,7 @@ public boolean e() {\\n \\n entityplayer = (EntityPlayer) iterator.next();\\n }\\n- while (entityplayer.by());\\n+ while (entityplayer.bC());\\n \\n return false;\\n } else {\\n@@ -480,21 +480,12 @@ public void a(Entity entity, boolean flag0) {\\n if (!canSpawn(entity)) {\\n entity.w();\\n }\\n- if (!(entity.n instanceof EntityPlayer)) {\\n- super.a(entity, flag0);\\n- }\\n- }\\n-\\n- public void b(Entity entity, boolean flag0) {\\n- try {\\n- super.a(entity, flag0);\\n- } catch (Throwable throwable) {\\n- CrashReport crashreport = CrashReport.a(throwable, \\\"Forcefully ticking entity\\\");\\n- CrashReportCategory crashreportcategory = crashreport.a(\\\"Entity being force ticked\\\");\\n \\n- entity.a(crashreportcategory);\\n- throw new ReportedException(crashreport);\\n+ if (!this.a.Y() && entity instanceof INpc) {\\n+ entity.w();\\n }\\n+\\n+ super.a(entity, flag0);\\n }\\n \\n protected IChunkProvider j() {\\n@@ -627,7 +618,7 @@ protected void a() throws MinecraftException {\\n protected void a(Entity entity) {\\n super.a(entity);\\n this.V.a(entity.k, entity);\\n- Entity[] aentity = entity.am();\\n+ Entity[] aentity = entity.an();\\n \\n if (aentity != null) {\\n for (int i0 = 0; i0 < aentity.length; ++i0) {\\n@@ -639,7 +630,7 @@ protected void a(Entity entity) {\\n protected void b(Entity entity) {\\n super.b(entity);\\n this.V.d(entity.k);\\n- Entity[] aentity = entity.am();\\n+ Entity[] aentity = entity.an();\\n \\n if (aentity != null) {\\n for (int i0 = 0; i0 < aentity.length; ++i0) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServer.java\",\n \"sha\": \"0c72905083bf42806cc1dbf15cc7816eb30d2305\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/blob/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServerMulti.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/FallenMoonNetwork/CanaryRecode/contents/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServerMulti.java?ref=4249b9b8e406cfef551c36071a4c42528d0fe8a5\",\n \"deletions\": 1,\n \"filename\": \"src/main/java/net/minecraft/server/WorldServerMulti.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,6 +1,5 @@\\n package net.minecraft.server;\\n \\n-\\n public class WorldServerMulti extends WorldServer {\\n \\n public WorldServerMulti(MinecraftServer minecraftserver, ISaveHandler isavehandler, String s0, int i0, WorldSettings worldsettings, WorldServer worldserver, Profiler profiler, ILogAgent ilogagent) {\",\n \"raw_url\": \"https://github.com/FallenMoonNetwork/CanaryRecode/raw/4249b9b8e406cfef551c36071a4c42528d0fe8a5/src%2Fmain%2Fjava%2Fnet%2Fminecraft%2Fserver%2FWorldServerMulti.java\",\n \"sha\": \"80262d21709a43c9bd2e44d037aeca4901f7302e\",\n \"status\": \"modified\"\n }\n]"},"file_patch_count":{"kind":"number","value":183,"string":"183"},"enhanced_diffs":{"kind":"list like","value":[{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public boolean T() {\n public void U() {\n this.o.V();\n public void V() {\n this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\n public double W() {\n public double X() {\n public float Y() {\n public Vec3 Z() {\n public void aa() {\n this.ao = this.ab();\n public int ab() {\n public ItemStack[] ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public boolean ai() {\n public int ak() {\n public void al() {\n public String am() {\n public Entity[] an() {\n public float ao() {\n public boolean ap() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)","new_return_type":"boolean","new_signature":"boolean S()","old_args":"","old_implementation":"public boolean S() {\n public void T() {\n this.o.U();\n this.A = (float) ((double) this.A + d0);\n this.B = (float) ((double) this.B + d1);\n public void U() {\n this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\n public double V() {\n public double W() {\n public float X() {\n public Vec3 Y() {\n public void Z() {\n this.ao = this.aa();\n public int aa() {\n public ItemStack[] ac() {\n public boolean ad() {\n public boolean ae() {\n public boolean af() {\n public boolean ag() {\n public boolean ah() {\n public int aj() {\n public void ak() {\n public String al() {\n public Entity[] am() {\n public float an() {\n public boolean ao() {\n return String.format(\"%s[\\'%s\\'/%d, l=\\'%s\\', x=%.2f, y=%.2f, z=%.2f]\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \"~NULL~\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)","old_return_type":"boolean","old_signature":"boolean R()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void aA() {\n protected void bo() {","new_return_type":"void","new_signature":"void bK()","old_args":"","old_implementation":"protected void az() {\n protected void bk() {","old_return_type":"void","old_signature":"void bG()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void aA() {\n protected void bo() {","new_return_type":"void","new_signature":"void bK()","old_args":"","old_implementation":"protected void az() {\n protected void bk() {","old_return_type":"void","old_signature":"void bG()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void bk() {\n this.bn = this.bJ();\n Entity entity = this.bL();","new_return_type":"boolean","new_signature":"boolean bJ()","old_args":"","old_implementation":"protected void bh() {\n this.bn = this.bF();\n Entity entity = this.bH();","old_return_type":"boolean","old_signature":"boolean bF()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void aA() {\n protected void bo() {","new_return_type":"void","new_signature":"void bK()","old_args":"","old_implementation":"protected void az() {\n protected void bk() {","old_return_type":"void","old_signature":"void bG()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void aA() {\n protected void bo() {","new_return_type":"void","new_signature":"void bK()","old_args":"","old_implementation":"protected void az() {\n protected void bk() {","old_return_type":"void","old_signature":"void bG()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.cJ();\n public int bU() {\n public String am() {\n if (this.bB()) {\n return this.bA();\n int i0 = this.bT();\n public boolean bV() {\n public boolean bW() {\n public boolean ca() {\n return this.bV();","new_return_type":"int","new_signature":"int bT()","old_args":"","old_implementation":"this.cF();\n public int bQ() {\n public String al() {\n if (this.bx()) {\n return this.bw();\n int i0 = this.bP();\n public boolean bR() {\n public boolean bS() {\n public boolean bW() {\n return this.bR();\n public float bY() {\n this.a(this.bY());\n public boolean bZ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bC() {\n return !this.cu() && super.bC();\n public boolean ca() {\n public int cb() {\n public boolean cc() {\n public boolean cd() {\n public boolean ce() {\n public boolean cf() {\n this.cF();\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public void o(boolean flag0) {\n public int cg() {\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n if (this.n != null && this.n.equals(entity)) {\n return false;","old_return_type":"int","old_signature":"int bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.cJ();\n public int bU() {\n public String am() {\n if (this.bB()) {\n return this.bA();\n int i0 = this.bT();\n public boolean bV() {\n public boolean bW() {\n public boolean ca() {\n return this.bV();","new_return_type":"int","new_signature":"int bT()","old_args":"","old_implementation":"this.cF();\n public int bQ() {\n public String al() {\n if (this.bx()) {\n return this.bw();\n int i0 = this.bP();\n public boolean bR() {\n public boolean bS() {\n public boolean bW() {\n return this.bR();\n public float bY() {\n this.a(this.bY());\n public boolean bZ() {\n public void j(boolean flag0) {\n public void k(boolean flag0) {\n public boolean bC() {\n return !this.cu() && super.bC();\n public boolean ca() {\n public int cb() {\n public boolean cc() {\n public boolean cd() {\n public boolean ce() {\n public boolean cf() {\n this.cF();\n public void l(boolean flag0) {\n public void m(boolean flag0) {\n public void n(boolean flag0) {\n public void o(boolean flag0) {\n public int cg() {\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\n if (this.n != null && this.n.equals(entity)) {\n return false;","old_return_type":"int","old_signature":"int bP()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected float ba() {\n protected boolean bb() {\n return this.aM() <= 0.0F;\n protected void bd() {\n if (this.ah()) {\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\n f4 = this.bf() * f3;\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\n protected boolean be() {\n public float bf() {\n return this.be() ? this.bp : 0.1F;\n this.bp = f0;\n public boolean bg() {\n int i0 = this.aT();\n if (this.bq > 0) {\n --this.bq;","new_return_type":"float","new_signature":"float aZ()","old_args":"","old_implementation":"protected float aX() {\n protected boolean aY() {\n return this.aJ() <= 0.0F;\n protected void ba() {\n if (this.ag()) {\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\n f4 = this.bc() * f3;\n boolean flag0 = this.af() && this instanceof EntityPlayer;\n protected boolean bb() {\n public float bc() {\n return this.bb() ? this.bo : 0.1F;\n this.bo = f0;\n public boolean bd() {\n int i0 = this.aQ();\n if (this.bp > 0) {\n --this.bp;","old_return_type":"float","old_signature":"float aW()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"","new_return_type":"void","new_signature":"void bh()","old_args":"","old_implementation":"","old_return_type":"void","old_signature":"void be()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"","new_return_type":"void","new_signature":"void bh()","old_args":"","old_implementation":"","old_return_type":"void","old_signature":"void be()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public void U() {\n super.U();\n protected void bj() {","new_return_type":"void","new_signature":"void bi()","old_args":"","old_implementation":"public void T() {\n super.T();\n protected void bg() {","old_return_type":"void","old_signature":"void bf()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","new_return_type":"void","new_signature":"void bj()","old_args":"","old_implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","old_return_type":"void","old_signature":"void bg()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","new_return_type":"void","new_signature":"void bj()","old_args":"","old_implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","old_return_type":"void","old_signature":"void bg()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","new_return_type":"void","new_signature":"void bj()","old_args":"","old_implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","old_return_type":"void","old_signature":"void bg()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","new_return_type":"void","new_signature":"void bj()","old_args":"","old_implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","old_return_type":"void","old_signature":"void bg()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected void ay() {\n super.ay();\n protected void bh() {\n super.bh();\n public boolean by() {\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\n nbttagcompound.a(\"Saddle\", this.bT());\n this.i(nbttagcompound.n(\"Saddle\"));\n protected String aN() {\n protected String aO() {","new_return_type":"boolean","new_signature":"boolean be()","old_args":"","old_implementation":"protected void ax() {\n super.ax();\n protected void be() {\n super.be();\n public boolean bu() {\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\n nbttagcompound.a(\"Saddle\", this.bP());\n this.j(nbttagcompound.n(\"Saddle\"));\n protected String aK() {\n protected String aL() {","old_return_type":"boolean","old_signature":"boolean bb()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"protected String aO() {\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bV();\n if (this.bU() > 0) {\n protected void bh() {\n if (this.bU() > 0) {\n i0 = this.bU() - 1;\n super.bh();\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\n public void bT() {\n this.g(this.aS() / 3.0F);\n public void al() {","new_return_type":"String","new_signature":"String aN()","old_args":"","old_implementation":"protected String aL() {\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\n boolean flag0 = this.bR();\n if (this.bQ() > 0) {\n protected void be() {\n if (this.bQ() > 0) {\n i0 = this.bQ() - 1;\n super.be();\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\n public void bP() {\n this.g(this.aP() / 3.0F);\n public void ak() {","old_return_type":"String","old_signature":"String aK()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public void c(PotionEffect potioneffect) {","new_return_type":"void","new_signature":"void bo()","old_args":"","old_implementation":"public void d(PotionEffect potioneffect) {","old_return_type":"void","old_signature":"void bk()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"if (this.aq()) {","new_return_type":"int","new_signature":"int aP()","old_args":"","old_implementation":"if (this.ap()) {","old_return_type":"int","old_signature":"int aM()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"if (this.aq()) {","new_return_type":"int","new_signature":"int aP()","old_args":"","old_implementation":"if (this.ap()) {","old_return_type":"int","old_signature":"int aM()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"if (this.aq()) {","new_return_type":"int","new_signature":"int aP()","old_args":"","old_implementation":"if (this.ap()) {","old_return_type":"int","old_signature":"int aM()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"if (this.aq()) {","new_return_type":"int","new_signature":"int aP()","old_args":"","old_implementation":"if (this.ap()) {","old_return_type":"int","old_signature":"int aM()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"if (this.aq()) {","new_return_type":"int","new_signature":"int aP()","old_args":"","old_implementation":"if (this.ap()) {","old_return_type":"int","old_signature":"int aM()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"super.ay();\n if (this.bT()) {\n public boolean be() {\n public void d(EntityLivingBase entitylivingbase) {\n super.d(entitylivingbase);\n this.l(false);","new_return_type":"void","new_signature":"void ay()","old_args":"","old_implementation":"super.ax();\n if (this.bP()) {\n public boolean bb() {\n public void c(EntityLivingBase entitylivingbase) {\n super.c(entitylivingbase);\n if (!this.bY()) {\n return;","old_return_type":"void","old_signature":"void ax()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","new_return_type":"void","new_signature":"void bj()","old_args":"","old_implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","old_return_type":"void","old_signature":"void bg()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","new_return_type":"void","new_signature":"void bj()","old_args":"","old_implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","old_return_type":"void","old_signature":"void bg()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","new_return_type":"void","new_signature":"void bj()","old_args":"","old_implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","old_return_type":"void","old_signature":"void bg()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"this.ah.b(18, Float.valueOf(this.aM()));\n this.ah.a(18, new Float(this.aM()));\n nbttagcompound.a(\"Angry\", this.cc());\n nbttagcompound.a(\"CollarColor\", (byte) this.cd());\n this.l(nbttagcompound.n(\"Angry\"));\n return this.cc() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aN() {\n protected String aO() {\n protected float aZ() {\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\n if (this.ce()) {\n if (this.ce()) {\n this.a(\"mob.wolf.shake\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bp() {\n return this.bU() ? 20 : super.bp();\n if (this.aq()) {\n int i0 = this.bT() ? 4 : 2;\n public void j(boolean flag0) {\n super.j(flag0);\n if (this.bT()) {\n if (i0 != this.cd()) {\n this.bp.a(!this.bU());\n this.b((Entity) null);\n this.d((EntityLivingBase) null);","new_return_type":"void","new_signature":"void bj()","old_args":"","old_implementation":"this.ah.b(18, Float.valueOf(this.aJ()));\n this.ah.a(18, new Float(this.aJ()));\n nbttagcompound.a(\"Angry\", this.bY());\n nbttagcompound.a(\"CollarColor\", (byte) this.bZ());\n this.m(nbttagcompound.n(\"Angry\"));\n return this.bY() ? \"mob.wolf.growl\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \"mob.wolf.whine\" : \"mob.wolf.panting\") : \"mob.wolf.bark\");\n protected String aK() {\n protected String aL() {\n protected float aW() {\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\n if (this.ca()) {\n if (this.ca()) {\n this.a(\"mob.wolf.shake\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\n public int bl() {\n return this.bQ() ? 20 : super.bl();\n if (this.ap()) {\n int i0 = this.bP() ? 4 : 2;\n public void k(boolean flag0) {\n super.k(flag0);\n if (this.bP()) {\n if (i0 != this.bZ()) {\n this.bp.a(!this.bQ());","old_return_type":"void","old_signature":"void bg()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {","new_return_type":"int","new_signature":"int bv()","old_args":"","old_implementation":"public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {","old_return_type":"int","old_signature":"int br()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {","new_return_type":"int","new_signature":"int bv()","old_args":"","old_implementation":"public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {","old_return_type":"int","old_signature":"int br()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {","new_return_type":"int","new_signature":"int bv()","old_args":"","old_implementation":"public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {","old_return_type":"int","old_signature":"int br()"},{"name":"fallenmoonnetwork$canaryrecode","new_args":"","new_implementation":"public boolean cc() {\n public void l(boolean flag0) {\n public int cd() {\n entitywolf.j(true);\n public void m(boolean flag0) {","new_return_type":"int","new_signature":"int bv()","old_args":"","old_implementation":"public boolean bY() {\n public void m(boolean flag0) {\n public int bZ() {\n entitywolf.k(true);\n public void n(boolean flag0) {","old_return_type":"int","old_signature":"int br()"}],"string":"[\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public boolean T() {\\n public void U() {\\n this.o.V();\\n public void V() {\\n this.n.b(this.u, this.v + this.X() + this.n.W(), this.w);\\n public double W() {\\n public double X() {\\n public float Y() {\\n public Vec3 Z() {\\n public void aa() {\\n this.ao = this.ab();\\n public int ab() {\\n public ItemStack[] ad() {\\n public boolean ae() {\\n public boolean af() {\\n public boolean ag() {\\n public boolean ah() {\\n public boolean ai() {\\n public int ak() {\\n public void al() {\\n public String am() {\\n public Entity[] an() {\\n public float ao() {\\n public boolean ap() {\\n return String.format(\\\"%s[\\\\'%s\\\\'/%d, l=\\\\'%s\\\\', x=%.2f, y=%.2f, z=%.2f]\\\", new Object[]{ this.getClass().getSimpleName(), this.am(), Integer.valueOf(this.k), this.q == null ? \\\"~NULL~\\\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean S()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public boolean S() {\\n public void T() {\\n this.o.U();\\n this.A = (float) ((double) this.A + d0);\\n this.B = (float) ((double) this.B + d1);\\n public void U() {\\n this.n.b(this.u, this.v + this.W() + this.n.V(), this.w);\\n public double V() {\\n public double W() {\\n public float X() {\\n public Vec3 Y() {\\n public void Z() {\\n this.ao = this.aa();\\n public int aa() {\\n public ItemStack[] ac() {\\n public boolean ad() {\\n public boolean ae() {\\n public boolean af() {\\n public boolean ag() {\\n public boolean ah() {\\n public int aj() {\\n public void ak() {\\n public String al() {\\n public Entity[] am() {\\n public float an() {\\n public boolean ao() {\\n return String.format(\\\"%s[\\\\'%s\\\\'/%d, l=\\\\'%s\\\\', x=%.2f, y=%.2f, z=%.2f]\\\", new Object[]{ this.getClass().getSimpleName(), this.al(), Integer.valueOf(this.k), this.q == null ? \\\"~NULL~\\\" : this.q.N().k(), Double.valueOf(this.u), Double.valueOf(this.v), Double.valueOf(this.w)\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean R()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void aA() {\\n protected void bo() {\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bK()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void az() {\\n protected void bk() {\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bG()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void aA() {\\n protected void bo() {\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bK()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void az() {\\n protected void bk() {\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bG()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void bk() {\\n this.bn = this.bJ();\\n Entity entity = this.bL();\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean bJ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void bh() {\\n this.bn = this.bF();\\n Entity entity = this.bH();\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bF()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void aA() {\\n protected void bo() {\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bK()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void az() {\\n protected void bk() {\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bG()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void aA() {\\n protected void bo() {\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bK()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void az() {\\n protected void bk() {\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bG()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.cJ();\\n public int bU() {\\n public String am() {\\n if (this.bB()) {\\n return this.bA();\\n int i0 = this.bT();\\n public boolean bV() {\\n public boolean bW() {\\n public boolean ca() {\\n return this.bV();\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bT()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.cF();\\n public int bQ() {\\n public String al() {\\n if (this.bx()) {\\n return this.bw();\\n int i0 = this.bP();\\n public boolean bR() {\\n public boolean bS() {\\n public boolean bW() {\\n return this.bR();\\n public float bY() {\\n this.a(this.bY());\\n public boolean bZ() {\\n public void j(boolean flag0) {\\n public void k(boolean flag0) {\\n public boolean bC() {\\n return !this.cu() && super.bC();\\n public boolean ca() {\\n public int cb() {\\n public boolean cc() {\\n public boolean cd() {\\n public boolean ce() {\\n public boolean cf() {\\n this.cF();\\n public void l(boolean flag0) {\\n public void m(boolean flag0) {\\n public void n(boolean flag0) {\\n public void o(boolean flag0) {\\n public int cg() {\\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\\n if (this.n != null && this.n.equals(entity)) {\\n return false;\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.cJ();\\n public int bU() {\\n public String am() {\\n if (this.bB()) {\\n return this.bA();\\n int i0 = this.bT();\\n public boolean bV() {\\n public boolean bW() {\\n public boolean ca() {\\n return this.bV();\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bT()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.cF();\\n public int bQ() {\\n public String al() {\\n if (this.bx()) {\\n return this.bw();\\n int i0 = this.bP();\\n public boolean bR() {\\n public boolean bS() {\\n public boolean bW() {\\n return this.bR();\\n public float bY() {\\n this.a(this.bY());\\n public boolean bZ() {\\n public void j(boolean flag0) {\\n public void k(boolean flag0) {\\n public boolean bC() {\\n return !this.cu() && super.bC();\\n public boolean ca() {\\n public int cb() {\\n public boolean cc() {\\n public boolean cd() {\\n public boolean ce() {\\n public boolean cf() {\\n this.cF();\\n public void l(boolean flag0) {\\n public void m(boolean flag0) {\\n public void n(boolean flag0) {\\n public void o(boolean flag0) {\\n public int cg() {\\n int i1 = MathHelper.a(this.cg() + i0, 0, this.cm());\\n if (this.n != null && this.n.equals(entity)) {\\n return false;\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int bP()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected float ba() {\\n protected boolean bb() {\\n return this.aM() <= 0.0F;\\n protected void bd() {\\n if (this.ah()) {\\n this.a(f0, f1, this.be() ? 0.04F : 0.02F);\\n f4 = this.bf() * f3;\\n boolean flag0 = this.ag() && this instanceof EntityPlayer;\\n protected boolean be() {\\n public float bf() {\\n return this.be() ? this.bp : 0.1F;\\n this.bp = f0;\\n public boolean bg() {\\n int i0 = this.aT();\\n if (this.bq > 0) {\\n --this.bq;\",\n \"new_return_type\": \"float\",\n \"new_signature\": \"float aZ()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected float aX() {\\n protected boolean aY() {\\n return this.aJ() <= 0.0F;\\n protected void ba() {\\n if (this.ag()) {\\n this.a(f0, f1, this.bb() ? 0.04F : 0.02F);\\n f4 = this.bc() * f3;\\n boolean flag0 = this.af() && this instanceof EntityPlayer;\\n protected boolean bb() {\\n public float bc() {\\n return this.bb() ? this.bo : 0.1F;\\n this.bo = f0;\\n public boolean bd() {\\n int i0 = this.aQ();\\n if (this.bp > 0) {\\n --this.bp;\",\n \"old_return_type\": \"float\",\n \"old_signature\": \"float aW()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bh()\",\n \"old_args\": \"\",\n \"old_implementation\": \"\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void be()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bh()\",\n \"old_args\": \"\",\n \"old_implementation\": \"\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void be()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public void U() {\\n super.U();\\n protected void bj() {\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bi()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public void T() {\\n super.T();\\n protected void bg() {\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bf()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bj()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bg()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bj()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bg()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bj()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bg()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bj()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bg()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected void ay() {\\n super.ay();\\n protected void bh() {\\n super.bh();\\n public boolean by() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aY();\\n nbttagcompound.a(\\\"Saddle\\\", this.bT());\\n this.i(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aN() {\\n protected String aO() {\",\n \"new_return_type\": \"boolean\",\n \"new_signature\": \"boolean be()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected void ax() {\\n super.ax();\\n protected void be() {\\n super.be();\\n public boolean bu() {\\n ItemStack itemstack = ((EntityPlayer) this.n).aV();\\n nbttagcompound.a(\\\"Saddle\\\", this.bP());\\n this.j(nbttagcompound.n(\\\"Saddle\\\"));\\n protected String aK() {\\n protected String aL() {\",\n \"old_return_type\": \"boolean\",\n \"old_signature\": \"boolean bb()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"protected String aO() {\\n if (this.v < entity.v || !this.bV() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bV();\\n if (this.bU() > 0) {\\n protected void bh() {\\n if (this.bU() > 0) {\\n i0 = this.bU() - 1;\\n super.bh();\\n if (entity != null && entity.S() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.S() && this.o(entitylivingbase)) {\\n public void bT() {\\n this.g(this.aS() / 3.0F);\\n public void al() {\",\n \"new_return_type\": \"String\",\n \"new_signature\": \"String aN()\",\n \"old_args\": \"\",\n \"old_implementation\": \"protected String aL() {\\n if (this.v < entity.v || !this.bR() && this.v < entity.v + 5.0D) {\\n boolean flag0 = this.bR();\\n if (this.bQ() > 0) {\\n protected void be() {\\n if (this.bQ() > 0) {\\n i0 = this.bQ() - 1;\\n super.be();\\n if (entity != null && entity.R() && this.e(entity) <= 900.0D && this.o(entity)) {\\n if (entitylivingbase != this && entitylivingbase.R() && this.o(entitylivingbase)) {\\n public void bP() {\\n this.g(this.aP() / 3.0F);\\n public void ak() {\",\n \"old_return_type\": \"String\",\n \"old_signature\": \"String aK()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public void c(PotionEffect potioneffect) {\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bo()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public void d(PotionEffect potioneffect) {\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bk()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"if (this.aq()) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int aP()\",\n \"old_args\": \"\",\n \"old_implementation\": \"if (this.ap()) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aM()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"if (this.aq()) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int aP()\",\n \"old_args\": \"\",\n \"old_implementation\": \"if (this.ap()) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aM()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"if (this.aq()) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int aP()\",\n \"old_args\": \"\",\n \"old_implementation\": \"if (this.ap()) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aM()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"if (this.aq()) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int aP()\",\n \"old_args\": \"\",\n \"old_implementation\": \"if (this.ap()) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aM()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"if (this.aq()) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int aP()\",\n \"old_args\": \"\",\n \"old_implementation\": \"if (this.ap()) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int aM()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"super.ay();\\n if (this.bT()) {\\n public boolean be() {\\n public void d(EntityLivingBase entitylivingbase) {\\n super.d(entitylivingbase);\\n this.l(false);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void ay()\",\n \"old_args\": \"\",\n \"old_implementation\": \"super.ax();\\n if (this.bP()) {\\n public boolean bb() {\\n public void c(EntityLivingBase entitylivingbase) {\\n super.c(entitylivingbase);\\n if (!this.bY()) {\\n return;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void ax()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bj()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bg()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bj()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bg()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bj()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bg()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"this.ah.b(18, Float.valueOf(this.aM()));\\n this.ah.a(18, new Float(this.aM()));\\n nbttagcompound.a(\\\"Angry\\\", this.cc());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.cd());\\n this.l(nbttagcompound.n(\\\"Angry\\\"));\\n return this.cc() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bT() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aN() {\\n protected String aO() {\\n protected float aZ() {\\n if (!this.q.I && this.bs && !this.bt && !this.bM() && this.F) {\\n if (this.ce()) {\\n if (this.ce()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aZ(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bp() {\\n return this.bU() ? 20 : super.bp();\\n if (this.aq()) {\\n int i0 = this.bT() ? 4 : 2;\\n public void j(boolean flag0) {\\n super.j(flag0);\\n if (this.bT()) {\\n if (i0 != this.cd()) {\\n this.bp.a(!this.bU());\\n this.b((Entity) null);\\n this.d((EntityLivingBase) null);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void bj()\",\n \"old_args\": \"\",\n \"old_implementation\": \"this.ah.b(18, Float.valueOf(this.aJ()));\\n this.ah.a(18, new Float(this.aJ()));\\n nbttagcompound.a(\\\"Angry\\\", this.bY());\\n nbttagcompound.a(\\\"CollarColor\\\", (byte) this.bZ());\\n this.m(nbttagcompound.n(\\\"Angry\\\"));\\n return this.bY() ? \\\"mob.wolf.growl\\\" : (this.ab.nextInt(3) == 0 ? (this.bP() && this.ah.d(18) < 10.0F ? \\\"mob.wolf.whine\\\" : \\\"mob.wolf.panting\\\") : \\\"mob.wolf.bark\\\");\\n protected String aK() {\\n protected String aL() {\\n protected float aW() {\\n if (!this.q.I && this.bs && !this.bt && !this.bI() && this.F) {\\n if (this.ca()) {\\n if (this.ca()) {\\n this.a(\\\"mob.wolf.shake\\\", this.aW(), (this.ab.nextFloat() - this.ab.nextFloat()) * 0.2F + 1.0F);\\n public int bl() {\\n return this.bQ() ? 20 : super.bl();\\n if (this.ap()) {\\n int i0 = this.bP() ? 4 : 2;\\n public void k(boolean flag0) {\\n super.k(flag0);\\n if (this.bP()) {\\n if (i0 != this.bZ()) {\\n this.bp.a(!this.bQ());\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void bg()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public boolean cc() {\\n public void l(boolean flag0) {\\n public int cd() {\\n entitywolf.j(true);\\n public void m(boolean flag0) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bv()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public boolean bY() {\\n public void m(boolean flag0) {\\n public int bZ() {\\n entitywolf.k(true);\\n public void n(boolean flag0) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int br()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public boolean cc() {\\n public void l(boolean flag0) {\\n public int cd() {\\n entitywolf.j(true);\\n public void m(boolean flag0) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bv()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public boolean bY() {\\n public void m(boolean flag0) {\\n public int bZ() {\\n entitywolf.k(true);\\n public void n(boolean flag0) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int br()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public boolean cc() {\\n public void l(boolean flag0) {\\n public int cd() {\\n entitywolf.j(true);\\n public void m(boolean flag0) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bv()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public boolean bY() {\\n public void m(boolean flag0) {\\n public int bZ() {\\n entitywolf.k(true);\\n public void n(boolean flag0) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int br()\"\n },\n {\n \"name\": \"fallenmoonnetwork$canaryrecode\",\n \"new_args\": \"\",\n \"new_implementation\": \"public boolean cc() {\\n public void l(boolean flag0) {\\n public int cd() {\\n entitywolf.j(true);\\n public void m(boolean flag0) {\",\n \"new_return_type\": \"int\",\n \"new_signature\": \"int bv()\",\n \"old_args\": \"\",\n \"old_implementation\": \"public boolean bY() {\\n public void m(boolean flag0) {\\n public int bZ() {\\n entitywolf.k(true);\\n public void n(boolean flag0) {\",\n \"old_return_type\": \"int\",\n \"old_signature\": \"int br()\"\n }\n]"},"enhanced_diffs_count":{"kind":"number","value":300,"string":"300"},"diff_count":{"kind":"number","value":272,"string":"272"}}},{"rowIdx":17,"cells":{"commit_sha":{"kind":"string","value":"42584cd5328fc55a499d318dda6fefff6459242c"},"modifications":{"kind":"list like","value":[{"name":"apache$hama","new_args":"","new_implementation":"v1.add(v2);\n int i = 0;\n Iterator it = v1.iterator();\n while (it.hasNext()) {\n DoubleEntry c = (DoubleEntry) it.next();\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\n i++;","new_return_type":"void","new_signature":"void add()","old_args":"","old_implementation":"v1.add(v2);\r\n int i = 0;\r\n Iterator it = v1.iterator();\r\n while (it.hasNext()) {\r\n DoubleEntry c = (DoubleEntry) it.next();\r\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\r\n i++;","old_return_type":"void","old_signature":"void testAdd()"},{"name":"apache$hama","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void addTest()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testAdd()"},{"name":"apache$hama","new_args":"Matrix m1,Matrix m2","new_implementation":null,"new_return_type":"void","new_signature":"void addAlphaMatrix(Matrix m1,Matrix m2)","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testAddAlphaMatrix()"},{"name":"apache$hama","new_args":"","new_implementation":"((DenseVector) v1).clear();\n assertEquals(v1.size(), 0);","new_return_type":"void","new_signature":"void clear()","old_args":"","old_implementation":"((DenseVector) v1).clear();\r\n assertEquals(v1.size(), 0);","old_return_type":"void","old_signature":"void testClear()"},{"name":"apache$hama","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testDenseVector()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testDot()"},{"name":"apache$hama","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void getSetTest()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testGetSet()"},{"name":"apache$hama","new_args":"Matrix m1,Matrix m2","new_implementation":null,"new_return_type":"void","new_signature":"void matrixAdd(Matrix m1,Matrix m2)","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testMatrixAdd()"},{"name":"apache$hama","new_args":"Matrix m1,Matrix m2","new_implementation":null,"new_return_type":"void","new_signature":"void matrixMult(Matrix m1,Matrix m2)","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testMatrixMult()"},{"name":"apache$hama","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testMult()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testMatrixMult()"},{"name":"apache$hama","new_args":"Matrix m1,Matrix m2,Matrix m3","new_implementation":null,"new_return_type":"void","new_signature":"void multMatrixAdd(Matrix m1,Matrix m2,Matrix m3)","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testMultiMatrixAdd()"},{"name":"apache$hama","new_args":"","new_implementation":"v1.set(v2);\n\n for(int i = 0; i < v1.size(); i ++) {\n assertEquals(v2.get(i), v1.get(i));","new_return_type":"void","new_signature":"void setTest()","old_args":"","old_implementation":"v1.set(v2);\r\n \r\n for(int i = 0; i < v1.size(); i ++) {\r\n assertEquals(v2.get(i), v1.get(i));","old_return_type":"void","old_signature":"void testSet()"},{"name":"apache$hama","new_args":"Matrix m1","new_implementation":null,"new_return_type":"void","new_signature":"void setAlphaMatrix(Matrix m1)","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testSetAlphaMatrix()"},{"name":"apache$hama","new_args":"Matrix m1","new_implementation":null,"new_return_type":"void","new_signature":"void setMatrix(Matrix m1)","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testSetMatrix()"},{"name":"apache$hama","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void setRowColumn()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testSetRow()"},{"name":"apache$hama","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void sparsity()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void testSparsity()"},{"name":"apache$hama","new_args":"","new_implementation":"int start = 2;\n Vector subVector = v1.subVector(start, v1.size() - 1);\n Iterator it = subVector.iterator();\n\n int i = start;\n while (it.hasNext()) {\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\n i++;","new_return_type":"void","new_signature":"void subVector()","old_args":"","old_implementation":"int start = 2;\r\n Vector subVector = v1.subVector(start, v1.size() - 1);\r\n Iterator it = subVector.iterator();\r\n\r\n int i = start;\r\n while (it.hasNext()) {\r\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\r\n i++;","old_return_type":"void","old_signature":"void testSubVector()"}],"string":"[\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": \"v1.add(v2);\\n int i = 0;\\n Iterator it = v1.iterator();\\n while (it.hasNext()) {\\n DoubleEntry c = (DoubleEntry) it.next();\\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\\n i++;\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void add()\",\n \"old_args\": \"\",\n \"old_implementation\": \"v1.add(v2);\\r\\n int i = 0;\\r\\n Iterator it = v1.iterator();\\r\\n while (it.hasNext()) {\\r\\n DoubleEntry c = (DoubleEntry) it.next();\\r\\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\\r\\n i++;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testAdd()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void addTest()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testAdd()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"Matrix m1,Matrix m2\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void addAlphaMatrix(Matrix m1,Matrix m2)\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testAddAlphaMatrix()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": \"((DenseVector) v1).clear();\\n assertEquals(v1.size(), 0);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void clear()\",\n \"old_args\": \"\",\n \"old_implementation\": \"((DenseVector) v1).clear();\\r\\n assertEquals(v1.size(), 0);\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testClear()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testDenseVector()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testDot()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void getSetTest()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testGetSet()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"Matrix m1,Matrix m2\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void matrixAdd(Matrix m1,Matrix m2)\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testMatrixAdd()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"Matrix m1,Matrix m2\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void matrixMult(Matrix m1,Matrix m2)\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testMatrixMult()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testMult()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testMatrixMult()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"Matrix m1,Matrix m2,Matrix m3\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void multMatrixAdd(Matrix m1,Matrix m2,Matrix m3)\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testMultiMatrixAdd()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": \"v1.set(v2);\\n\\n for(int i = 0; i < v1.size(); i ++) {\\n assertEquals(v2.get(i), v1.get(i));\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setTest()\",\n \"old_args\": \"\",\n \"old_implementation\": \"v1.set(v2);\\r\\n \\r\\n for(int i = 0; i < v1.size(); i ++) {\\r\\n assertEquals(v2.get(i), v1.get(i));\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testSet()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"Matrix m1\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setAlphaMatrix(Matrix m1)\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testSetAlphaMatrix()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"Matrix m1\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setMatrix(Matrix m1)\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testSetMatrix()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setRowColumn()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testSetRow()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void sparsity()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testSparsity()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": \"int start = 2;\\n Vector subVector = v1.subVector(start, v1.size() - 1);\\n Iterator it = subVector.iterator();\\n\\n int i = start;\\n while (it.hasNext()) {\\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\\n i++;\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void subVector()\",\n \"old_args\": \"\",\n \"old_implementation\": \"int start = 2;\\r\\n Vector subVector = v1.subVector(start, v1.size() - 1);\\r\\n Iterator it = subVector.iterator();\\r\\n\\r\\n int i = start;\\r\\n while (it.hasNext()) {\\r\\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\\r\\n i++;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testSubVector()\"\n }\n]"},"files":{"kind":"list like","value":[{"additions":1,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/CHANGES.txt","changes":1,"contents_url":"https://api.github.com/repos/apache/hama/contents/CHANGES.txt?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":0,"filename":"CHANGES.txt","new_code":" HAMA-188: Upgrade dependencies for hadoop/hbase 2.0 (edwardyoon)","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -40,6 +40,7 @@ Trunk (unreleased changes)\n \n IMPROVEMENTS\n \n+ HAMA-188: Upgrade dependencies for hadoop/hbase 2.0 (edwardyoon)\n HAMA-192: Refactor top-level package (edwardyoon)\n HAMA-189: Update website (edwardyoon)\n HAMA-187: Add matrix subtraction test case (edwardyoon)","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/CHANGES.txt","sha":"a0ae72a6a567226cb201224eda80907fb4e8931d","status":"modified"},{"additions":324,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/build.xml","changes":651,"contents_url":"https://api.github.com/repos/apache/hama/contents/build.xml?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":327,"filename":"build.xml","new_code":"\n\n\n\n\n \n \n \n \n\n \n \n \n \n\n \n \n \n \n\n \n \n \n \n\n\t\n \n\n \n \n\n\t\n\t\n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n \n\n \n \n\n \n \n\n \n \n \n \n \n \n \n \n \n\n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\t\n\t\n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n\n \n \n \n \n \n\n \n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n \n \n \n \n \n \t\n \n \n \n \n \t\n \n\n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n\n \n \n \n \n \n \n \n \n Tests failed!\n \n\n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n \n","new_methods":[],"old_code":"\r\n\r\n\r\n\r\n\r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n\r\n\t\r\n \r\n\r\n \r\n \r\n\r\n\t\r\n\t\r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n\r\n \r\n \r\n\r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\t\r\n\t\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \t\r\n \r\n \r\n \r\n \r\n \t\r\n \r\n\r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n Tests failed!\r\n \r\n\r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n \r\n\r","old_methods":[],"patch":"@@ -1,327 +1,324 @@\n-\r\n-\r\n-\r\n-\r\n-\r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n-\r\n-\t\r\n- \r\n-\r\n- \r\n- \r\n-\r\n-\t\r\n-\t\r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n-\r\n- \r\n- \r\n-\r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\t\r\n-\t\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \t\r\n- \r\n- \r\n- \r\n- \r\n- \t\r\n- \r\n-\r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- Tests failed!\r\n- \r\n-\r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n- \r\n-\r\n+\n+\n+\n+\n+\n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+\n+\t\n+ \n+\n+ \n+ \n+\n+\t\n+\t\n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+\n+ \n+ \n+\n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\t\n+\t\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \t\n+ \n+ \n+ \n+ \n+ \t\n+ \n+\n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ Tests failed!\n+ \n+\n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+ \n+","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/build.xml","sha":"c45e160c5f4258d11573be997351b4718cf43a73","status":"modified"},{"additions":2,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2FHamaAdminImpl.java","changes":2,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Fjava%2Forg%2Fapache%2Fhama%2FHamaAdminImpl.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":0,"filename":"src/java/org/apache/hama/HamaAdminImpl.java","new_code":"import org.apache.hadoop.hbase.client.Get;\nimport org.apache.hadoop.hbase.client.Result;","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -25,8 +25,10 @@\n import org.apache.hadoop.hbase.HTableDescriptor;\n import org.apache.hadoop.hbase.MasterNotRunningException;\n import org.apache.hadoop.hbase.RegionException;\n+import org.apache.hadoop.hbase.client.Get;\n import org.apache.hadoop.hbase.client.HBaseAdmin;\n import org.apache.hadoop.hbase.client.HTable;\n+import org.apache.hadoop.hbase.client.Result;\n import org.apache.hadoop.hbase.io.BatchUpdate;\n import org.apache.hadoop.hbase.io.Cell;\n import org.apache.hadoop.hbase.util.Bytes;","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2FHamaAdminImpl.java","sha":"39568b43f7cfa5c02867b88ec49d851a7c954faf","status":"modified"},{"additions":13,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FAbstractMatrix.java","changes":14,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FAbstractMatrix.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":1,"filename":"src/java/org/apache/hama/matrix/AbstractMatrix.java","new_code":" this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.COLUMN)));\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.ATTRIBUTE)));\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.ALIASEFAMILY)));\n \n // It's a temporary data.\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.BLOCK)));\n // the following families are used in JacobiEigenValue computation\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EI)));\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EICOL)));\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EIVEC)));\n \n /*\n */","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -143,6 +143,18 @@ protected void tryToCreateTable(String table_prefix) throws IOException {\n protected void create() throws IOException {\n // It should run only when table doesn't exist.\n if (!admin.tableExists(matrixPath)) {\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.COLUMN)));\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.ATTRIBUTE)));\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.ALIASEFAMILY)));\n+ \n+ // It's a temporary data.\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.BLOCK)));\n+ // the following families are used in JacobiEigenValue computation\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EI)));\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EICOL)));\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EIVEC)));\n+ \n+ /*\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes\n .toBytes(Constants.COLUMN), 3, CompressionType.NONE, false, false,\n Integer.MAX_VALUE, HConstants.FOREVER, false));\n@@ -162,7 +174,7 @@ protected void create() throws IOException {\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes\n .toBytes(JacobiEigenValue.EIVEC), 10, CompressionType.NONE, false,\n false, Integer.MAX_VALUE, HConstants.FOREVER, false));\n-\n+ */\n LOG.info(\"Initializing the matrix storage.\");\n this.admin.createTable(this.tableDesc);\n LOG.info(\"Create Matrix \" + matrixPath);","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FAbstractMatrix.java","sha":"54d9308ec83d3eccadce44883b70f367b07cd939","status":"modified"},{"additions":0,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FDenseMatrix.java","changes":1,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FDenseMatrix.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":1,"filename":"src/java/org/apache/hama/matrix/DenseMatrix.java","new_code":"","new_methods":[],"old_code":"import org.apache.hama.matrix.Matrix.Norm;","old_methods":[],"patch":"@@ -59,7 +59,6 @@\n import org.apache.hama.mapred.RandomMatrixMap;\n import org.apache.hama.mapred.RandomMatrixReduce;\n import org.apache.hama.mapred.VectorInputFormat;\n-import org.apache.hama.matrix.Matrix.Norm;\n import org.apache.hama.matrix.algebra.BlockMultiplyMap;\n import org.apache.hama.matrix.algebra.BlockMultiplyReduce;\n import org.apache.hama.matrix.algebra.DenseMatrixVectorMultMap;","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FDenseMatrix.java","sha":"3e70326f6b8dc2c970255fed8d5db15c57d53609","status":"modified"},{"additions":185,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FSparseVector.java","changes":371,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FSparseVector.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":186,"filename":"src/java/org/apache/hama/matrix/SparseVector.java","new_code":"/**\n * Copyright 2007 The Apache Software Foundation\n *\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\npackage org.apache.hama.matrix;\n\nimport java.io.IOException;\nimport java.util.Map;\n\nimport org.apache.hadoop.hbase.io.RowResult;\nimport org.apache.hadoop.io.IntWritable;\nimport org.apache.hadoop.io.MapWritable;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hama.io.DoubleEntry;\nimport org.apache.log4j.Logger;\n\n/**\n * This class represents a sparse vector.\n */\npublic class SparseVector extends AbstractVector implements Vector {\n static final Logger LOG = Logger.getLogger(SparseVector.class);\n\n public SparseVector() {\n this(new MapWritable());\n }\n\n public SparseVector(MapWritable m) {\n this.entries = m;\n }\n\n public SparseVector(RowResult row) {\n this.initMap(row);\n }\n\n @Override\n public Vector add(double alpha, Vector v) {\n if (alpha == 0)\n return this;\n\n for (Map.Entry e : v.getEntries().entrySet()) {\n if (this.entries.containsKey(e.getKey())) {\n // add\n double value = alpha * ((DoubleEntry) e.getValue()).getValue()\n + this.get(((IntWritable) e.getKey()).get());\n this.entries.put(e.getKey(), new DoubleEntry(value));\n } else {\n // put\n double value = alpha * ((DoubleEntry) e.getValue()).getValue();\n this.entries.put(e.getKey(), new DoubleEntry(value));\n }\n }\n\n return this;\n }\n\n /**\n * x = v + x\n * \n * @param v2\n * @return x = v + x\n */\n public SparseVector add(Vector v2) {\n\n for (Map.Entry e : v2.getEntries().entrySet()) {\n int key = ((IntWritable) e.getKey()).get();\n if (this.entries.containsKey(e.getKey())) {\n this.add(key, ((DoubleEntry) e.getValue()).getValue());\n } else {\n this.set(key, ((DoubleEntry) e.getValue()).getValue());\n }\n }\n\n return this;\n }\n\n @Override\n public double dot(Vector v) {\n // TODO Auto-generated method stub\n return 0;\n }\n\n @Override\n public double norm(Norm type) {\n // TODO Auto-generated method stub\n return 0;\n }\n\n /**\n * v = alpha*v\n * \n * @param alpha\n * @return v = alpha*v\n */\n public SparseVector scale(double alpha) {\n for (Map.Entry e : this.entries.entrySet()) {\n this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\n .getValue()\n * alpha));\n }\n return this;\n }\n\n /**\n * Gets the value of index\n * \n * @param index\n * @return the value of v(index)\n * @throws IOException\n */\n public double get(int index) {\n double value;\n try {\n value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\n .getValue();\n } catch (NullPointerException e) { // returns zero if there is no value\n return 0;\n }\n\n return value;\n }\n\n /**\n * Sets the value of index\n * \n * @param index\n * @param value\n */\n public void set(int index, double value) {\n // If entries are null, create new object\n if (this.entries == null) {\n this.entries = new MapWritable();\n }\n\n if (value != 0) // only stores non-zero element\n this.entries.put(new IntWritable(index), new DoubleEntry(value));\n }\n\n /**\n * Adds the value to v(index)\n * \n * @param index\n * @param value\n */\n public void add(int index, double value) {\n set(index, get(index) + value);\n }\n\n /**\n * Sets the vector\n * \n * @param v\n * @return x = v\n */\n public SparseVector set(Vector v) {\n return new SparseVector(v.getEntries());\n }\n\n @Override\n public Vector subVector(int i0, int i1) {\n // TODO Auto-generated method stub\n return null;\n }\n\n @Override\n public Vector set(double alpha, Vector v) {\n // TODO Auto-generated method stub\n return null;\n }\n\n}","new_methods":[{"arguments":[],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"this(new MapWritable());","signature":"public SparseVector()"},{"arguments":["MapWritable m"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"this.entries = m;","signature":"public SparseVector(MapWritable m)"},{"arguments":["RowResult row"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"this.initMap(row);","signature":"public SparseVector(RowResult row)"},{"arguments":["double alpha"," Vector v"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"if (alpha == 0)\n return this;\n\n for (Map.Entry e : v.getEntries().entrySet()) {\n if (this.entries.containsKey(e.getKey())) {\n // add\n double value = alpha * ((DoubleEntry) e.getValue()).getValue()\n + this.get(((IntWritable) e.getKey()).get());\n this.entries.put(e.getKey(), new DoubleEntry(value));","signature":"Vector add(double alpha, Vector v)"},{"arguments":["Vector v2"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"for (Map.Entry e : v2.getEntries().entrySet()) {\n int key = ((IntWritable) e.getKey()).get();\n if (this.entries.containsKey(e.getKey())) {\n this.add(key, ((DoubleEntry) e.getValue()).getValue());","signature":"SparseVector add(Vector v2)"},{"arguments":["Vector v"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"// TODO Auto-generated method stub\n return 0;","signature":"double dot(Vector v)"},{"arguments":["Norm type"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"// TODO Auto-generated method stub\n return 0;","signature":"double norm(Norm type)"},{"arguments":["double alpha"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"for (Map.Entry e : this.entries.entrySet()) {\n this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\n .getValue()\n * alpha));","signature":"SparseVector scale(double alpha)"},{"arguments":["int index"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"double value;\n try {\n value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\n .getValue();","signature":"double get(int index)"},{"arguments":["int index"," double value"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"// If entries are null, create new object\n if (this.entries == null) {\n this.entries = new MapWritable();","signature":"void set(int index, double value)"},{"arguments":["int index"," double value"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"set(index, get(index) + value);","signature":"void add(int index, double value)"},{"arguments":["Vector v"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"return new SparseVector(v.getEntries());","signature":"SparseVector set(Vector v)"},{"arguments":["int i0"," int i1"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"// TODO Auto-generated method stub\n return null;","signature":"Vector subVector(int i0, int i1)"},{"arguments":["double alpha"," Vector v"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"// TODO Auto-generated method stub\n return null;","signature":"Vector set(double alpha, Vector v)"}],"old_code":"/**\r\n * Copyright 2007 The Apache Software Foundation\r\n *\r\n * Licensed to the Apache Software Foundation (ASF) under one\r\n * or more contributor license agreements. See the NOTICE file\r\n * distributed with this work for additional information\r\n * regarding copyright ownership. The ASF licenses this file\r\n * to you under the Apache License, Version 2.0 (the\r\n * \"License\"); you may not use this file except in compliance\r\n * with the License. You may obtain a copy of the License at\r\n *\r\n * http://www.apache.org/licenses/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n */\r\npackage org.apache.hama.matrix;\r\n\r\nimport java.io.IOException;\r\nimport java.util.Map;\r\n\r\nimport org.apache.hadoop.hbase.io.RowResult;\r\nimport org.apache.hadoop.io.IntWritable;\r\nimport org.apache.hadoop.io.MapWritable;\r\nimport org.apache.hadoop.io.Writable;\r\nimport org.apache.hama.io.DoubleEntry;\r\nimport org.apache.hama.matrix.Vector.Norm;\r\nimport org.apache.log4j.Logger;\r\n\r\n/**\r\n * This class represents a sparse vector.\r\n */\r\npublic class SparseVector extends AbstractVector implements Vector {\r\n static final Logger LOG = Logger.getLogger(SparseVector.class);\r\n\r\n public SparseVector() {\r\n this(new MapWritable());\r\n }\r\n\r\n public SparseVector(MapWritable m) {\r\n this.entries = m;\r\n }\r\n\r\n public SparseVector(RowResult row) {\r\n this.initMap(row);\r\n }\r\n\r\n @Override\r\n public Vector add(double alpha, Vector v) {\r\n if (alpha == 0)\r\n return this;\r\n\r\n for (Map.Entry e : v.getEntries().entrySet()) {\r\n if (this.entries.containsKey(e.getKey())) {\r\n // add\r\n double value = alpha * ((DoubleEntry) e.getValue()).getValue()\r\n + this.get(((IntWritable) e.getKey()).get());\r\n this.entries.put(e.getKey(), new DoubleEntry(value));\r\n } else {\r\n // put\r\n double value = alpha * ((DoubleEntry) e.getValue()).getValue();\r\n this.entries.put(e.getKey(), new DoubleEntry(value));\r\n }\r\n }\r\n\r\n return this;\r\n }\r\n\r\n /**\r\n * x = v + x\r\n * \r\n * @param v2\r\n * @return x = v + x\r\n */\r\n public SparseVector add(Vector v2) {\r\n\r\n for (Map.Entry e : v2.getEntries().entrySet()) {\r\n int key = ((IntWritable) e.getKey()).get();\r\n if (this.entries.containsKey(e.getKey())) {\r\n this.add(key, ((DoubleEntry) e.getValue()).getValue());\r\n } else {\r\n this.set(key, ((DoubleEntry) e.getValue()).getValue());\r\n }\r\n }\r\n\r\n return this;\r\n }\r\n\r\n @Override\r\n public double dot(Vector v) {\r\n // TODO Auto-generated method stub\r\n return 0;\r\n }\r\n\r\n @Override\r\n public double norm(Norm type) {\r\n // TODO Auto-generated method stub\r\n return 0;\r\n }\r\n\r\n /**\r\n * v = alpha*v\r\n * \r\n * @param alpha\r\n * @return v = alpha*v\r\n */\r\n public SparseVector scale(double alpha) {\r\n for (Map.Entry e : this.entries.entrySet()) {\r\n this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\r\n .getValue()\r\n * alpha));\r\n }\r\n return this;\r\n }\r\n\r\n /**\r\n * Gets the value of index\r\n * \r\n * @param index\r\n * @return the value of v(index)\r\n * @throws IOException\r\n */\r\n public double get(int index) {\r\n double value;\r\n try {\r\n value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\r\n .getValue();\r\n } catch (NullPointerException e) { // returns zero if there is no value\r\n return 0;\r\n }\r\n\r\n return value;\r\n }\r\n\r\n /**\r\n * Sets the value of index\r\n * \r\n * @param index\r\n * @param value\r\n */\r\n public void set(int index, double value) {\r\n // If entries are null, create new object\r\n if (this.entries == null) {\r\n this.entries = new MapWritable();\r\n }\r\n\r\n if (value != 0) // only stores non-zero element\r\n this.entries.put(new IntWritable(index), new DoubleEntry(value));\r\n }\r\n\r\n /**\r\n * Adds the value to v(index)\r\n * \r\n * @param index\r\n * @param value\r\n */\r\n public void add(int index, double value) {\r\n set(index, get(index) + value);\r\n }\r\n\r\n /**\r\n * Sets the vector\r\n * \r\n * @param v\r\n * @return x = v\r\n */\r\n public SparseVector set(Vector v) {\r\n return new SparseVector(v.getEntries());\r\n }\r\n\r\n @Override\r\n public Vector subVector(int i0, int i1) {\r\n // TODO Auto-generated method stub\r\n return null;\r\n }\r\n\r\n @Override\r\n public Vector set(double alpha, Vector v) {\r\n // TODO Auto-generated method stub\r\n return null;\r\n }\r\n\r\n}\r","old_methods":[{"arguments":[],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"this(new MapWritable());","signature":"public SparseVector()"},{"arguments":["MapWritable m"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"this.entries = m;","signature":"public SparseVector(MapWritable m)"},{"arguments":["RowResult row"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"this.initMap(row);","signature":"public SparseVector(RowResult row)"},{"arguments":["double alpha"," Vector v"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"if (alpha == 0)\r\n return this;\r\n\r\n for (Map.Entry e : v.getEntries().entrySet()) {\r\n if (this.entries.containsKey(e.getKey())) {\r\n // add\r\n double value = alpha * ((DoubleEntry) e.getValue()).getValue()\r\n + this.get(((IntWritable) e.getKey()).get());\r\n this.entries.put(e.getKey(), new DoubleEntry(value));","signature":"Vector add(double alpha, Vector v)"},{"arguments":["Vector v2"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"for (Map.Entry e : v2.getEntries().entrySet()) {\r\n int key = ((IntWritable) e.getKey()).get();\r\n if (this.entries.containsKey(e.getKey())) {\r\n this.add(key, ((DoubleEntry) e.getValue()).getValue());","signature":"SparseVector add(Vector v2)"},{"arguments":["Vector v"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"// TODO Auto-generated method stub\r\n return 0;","signature":"double dot(Vector v)"},{"arguments":["Norm type"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"// TODO Auto-generated method stub\r\n return 0;","signature":"double norm(Norm type)"},{"arguments":["double alpha"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"for (Map.Entry e : this.entries.entrySet()) {\r\n this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\r\n .getValue()\r\n * alpha));","signature":"SparseVector scale(double alpha)"},{"arguments":["int index"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"double value;\r\n try {\r\n value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\r\n .getValue();","signature":"double get(int index)"},{"arguments":["int index"," double value"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"// If entries are null, create new object\r\n if (this.entries == null) {\r\n this.entries = new MapWritable();","signature":"void set(int index, double value)"},{"arguments":["int index"," double value"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"set(index, get(index) + value);","signature":"void add(int index, double value)"},{"arguments":["Vector v"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"return new SparseVector(v.getEntries());","signature":"SparseVector set(Vector v)"},{"arguments":["int i0"," int i1"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"// TODO Auto-generated method stub\r\n return null;","signature":"Vector subVector(int i0, int i1)"},{"arguments":["double alpha"," Vector v"],"filename":"src/java/org/apache/hama/matrix/SparseVector.java","implementation":"// TODO Auto-generated method stub\r\n return null;","signature":"Vector set(double alpha, Vector v)"}],"patch":"@@ -1,186 +1,185 @@\n-/**\r\n- * Copyright 2007 The Apache Software Foundation\r\n- *\r\n- * Licensed to the Apache Software Foundation (ASF) under one\r\n- * or more contributor license agreements. See the NOTICE file\r\n- * distributed with this work for additional information\r\n- * regarding copyright ownership. The ASF licenses this file\r\n- * to you under the Apache License, Version 2.0 (the\r\n- * \"License\"); you may not use this file except in compliance\r\n- * with the License. You may obtain a copy of the License at\r\n- *\r\n- * http://www.apache.org/licenses/LICENSE-2.0\r\n- *\r\n- * Unless required by applicable law or agreed to in writing, software\r\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n- * See the License for the specific language governing permissions and\r\n- * limitations under the License.\r\n- */\r\n-package org.apache.hama.matrix;\r\n-\r\n-import java.io.IOException;\r\n-import java.util.Map;\r\n-\r\n-import org.apache.hadoop.hbase.io.RowResult;\r\n-import org.apache.hadoop.io.IntWritable;\r\n-import org.apache.hadoop.io.MapWritable;\r\n-import org.apache.hadoop.io.Writable;\r\n-import org.apache.hama.io.DoubleEntry;\r\n-import org.apache.hama.matrix.Vector.Norm;\r\n-import org.apache.log4j.Logger;\r\n-\r\n-/**\r\n- * This class represents a sparse vector.\r\n- */\r\n-public class SparseVector extends AbstractVector implements Vector {\r\n- static final Logger LOG = Logger.getLogger(SparseVector.class);\r\n-\r\n- public SparseVector() {\r\n- this(new MapWritable());\r\n- }\r\n-\r\n- public SparseVector(MapWritable m) {\r\n- this.entries = m;\r\n- }\r\n-\r\n- public SparseVector(RowResult row) {\r\n- this.initMap(row);\r\n- }\r\n-\r\n- @Override\r\n- public Vector add(double alpha, Vector v) {\r\n- if (alpha == 0)\r\n- return this;\r\n-\r\n- for (Map.Entry e : v.getEntries().entrySet()) {\r\n- if (this.entries.containsKey(e.getKey())) {\r\n- // add\r\n- double value = alpha * ((DoubleEntry) e.getValue()).getValue()\r\n- + this.get(((IntWritable) e.getKey()).get());\r\n- this.entries.put(e.getKey(), new DoubleEntry(value));\r\n- } else {\r\n- // put\r\n- double value = alpha * ((DoubleEntry) e.getValue()).getValue();\r\n- this.entries.put(e.getKey(), new DoubleEntry(value));\r\n- }\r\n- }\r\n-\r\n- return this;\r\n- }\r\n-\r\n- /**\r\n- * x = v + x\r\n- * \r\n- * @param v2\r\n- * @return x = v + x\r\n- */\r\n- public SparseVector add(Vector v2) {\r\n-\r\n- for (Map.Entry e : v2.getEntries().entrySet()) {\r\n- int key = ((IntWritable) e.getKey()).get();\r\n- if (this.entries.containsKey(e.getKey())) {\r\n- this.add(key, ((DoubleEntry) e.getValue()).getValue());\r\n- } else {\r\n- this.set(key, ((DoubleEntry) e.getValue()).getValue());\r\n- }\r\n- }\r\n-\r\n- return this;\r\n- }\r\n-\r\n- @Override\r\n- public double dot(Vector v) {\r\n- // TODO Auto-generated method stub\r\n- return 0;\r\n- }\r\n-\r\n- @Override\r\n- public double norm(Norm type) {\r\n- // TODO Auto-generated method stub\r\n- return 0;\r\n- }\r\n-\r\n- /**\r\n- * v = alpha*v\r\n- * \r\n- * @param alpha\r\n- * @return v = alpha*v\r\n- */\r\n- public SparseVector scale(double alpha) {\r\n- for (Map.Entry e : this.entries.entrySet()) {\r\n- this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\r\n- .getValue()\r\n- * alpha));\r\n- }\r\n- return this;\r\n- }\r\n-\r\n- /**\r\n- * Gets the value of index\r\n- * \r\n- * @param index\r\n- * @return the value of v(index)\r\n- * @throws IOException\r\n- */\r\n- public double get(int index) {\r\n- double value;\r\n- try {\r\n- value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\r\n- .getValue();\r\n- } catch (NullPointerException e) { // returns zero if there is no value\r\n- return 0;\r\n- }\r\n-\r\n- return value;\r\n- }\r\n-\r\n- /**\r\n- * Sets the value of index\r\n- * \r\n- * @param index\r\n- * @param value\r\n- */\r\n- public void set(int index, double value) {\r\n- // If entries are null, create new object\r\n- if (this.entries == null) {\r\n- this.entries = new MapWritable();\r\n- }\r\n-\r\n- if (value != 0) // only stores non-zero element\r\n- this.entries.put(new IntWritable(index), new DoubleEntry(value));\r\n- }\r\n-\r\n- /**\r\n- * Adds the value to v(index)\r\n- * \r\n- * @param index\r\n- * @param value\r\n- */\r\n- public void add(int index, double value) {\r\n- set(index, get(index) + value);\r\n- }\r\n-\r\n- /**\r\n- * Sets the vector\r\n- * \r\n- * @param v\r\n- * @return x = v\r\n- */\r\n- public SparseVector set(Vector v) {\r\n- return new SparseVector(v.getEntries());\r\n- }\r\n-\r\n- @Override\r\n- public Vector subVector(int i0, int i1) {\r\n- // TODO Auto-generated method stub\r\n- return null;\r\n- }\r\n-\r\n- @Override\r\n- public Vector set(double alpha, Vector v) {\r\n- // TODO Auto-generated method stub\r\n- return null;\r\n- }\r\n-\r\n-}\r\n+/**\n+ * Copyright 2007 The Apache Software Foundation\n+ *\n+ * Licensed to the Apache Software Foundation (ASF) under one\n+ * or more contributor license agreements. See the NOTICE file\n+ * distributed with this work for additional information\n+ * regarding copyright ownership. The ASF licenses this file\n+ * to you under the Apache License, Version 2.0 (the\n+ * \"License\"); you may not use this file except in compliance\n+ * with the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.apache.hama.matrix;\n+\n+import java.io.IOException;\n+import java.util.Map;\n+\n+import org.apache.hadoop.hbase.io.RowResult;\n+import org.apache.hadoop.io.IntWritable;\n+import org.apache.hadoop.io.MapWritable;\n+import org.apache.hadoop.io.Writable;\n+import org.apache.hama.io.DoubleEntry;\n+import org.apache.log4j.Logger;\n+\n+/**\n+ * This class represents a sparse vector.\n+ */\n+public class SparseVector extends AbstractVector implements Vector {\n+ static final Logger LOG = Logger.getLogger(SparseVector.class);\n+\n+ public SparseVector() {\n+ this(new MapWritable());\n+ }\n+\n+ public SparseVector(MapWritable m) {\n+ this.entries = m;\n+ }\n+\n+ public SparseVector(RowResult row) {\n+ this.initMap(row);\n+ }\n+\n+ @Override\n+ public Vector add(double alpha, Vector v) {\n+ if (alpha == 0)\n+ return this;\n+\n+ for (Map.Entry e : v.getEntries().entrySet()) {\n+ if (this.entries.containsKey(e.getKey())) {\n+ // add\n+ double value = alpha * ((DoubleEntry) e.getValue()).getValue()\n+ + this.get(((IntWritable) e.getKey()).get());\n+ this.entries.put(e.getKey(), new DoubleEntry(value));\n+ } else {\n+ // put\n+ double value = alpha * ((DoubleEntry) e.getValue()).getValue();\n+ this.entries.put(e.getKey(), new DoubleEntry(value));\n+ }\n+ }\n+\n+ return this;\n+ }\n+\n+ /**\n+ * x = v + x\n+ * \n+ * @param v2\n+ * @return x = v + x\n+ */\n+ public SparseVector add(Vector v2) {\n+\n+ for (Map.Entry e : v2.getEntries().entrySet()) {\n+ int key = ((IntWritable) e.getKey()).get();\n+ if (this.entries.containsKey(e.getKey())) {\n+ this.add(key, ((DoubleEntry) e.getValue()).getValue());\n+ } else {\n+ this.set(key, ((DoubleEntry) e.getValue()).getValue());\n+ }\n+ }\n+\n+ return this;\n+ }\n+\n+ @Override\n+ public double dot(Vector v) {\n+ // TODO Auto-generated method stub\n+ return 0;\n+ }\n+\n+ @Override\n+ public double norm(Norm type) {\n+ // TODO Auto-generated method stub\n+ return 0;\n+ }\n+\n+ /**\n+ * v = alpha*v\n+ * \n+ * @param alpha\n+ * @return v = alpha*v\n+ */\n+ public SparseVector scale(double alpha) {\n+ for (Map.Entry e : this.entries.entrySet()) {\n+ this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\n+ .getValue()\n+ * alpha));\n+ }\n+ return this;\n+ }\n+\n+ /**\n+ * Gets the value of index\n+ * \n+ * @param index\n+ * @return the value of v(index)\n+ * @throws IOException\n+ */\n+ public double get(int index) {\n+ double value;\n+ try {\n+ value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\n+ .getValue();\n+ } catch (NullPointerException e) { // returns zero if there is no value\n+ return 0;\n+ }\n+\n+ return value;\n+ }\n+\n+ /**\n+ * Sets the value of index\n+ * \n+ * @param index\n+ * @param value\n+ */\n+ public void set(int index, double value) {\n+ // If entries are null, create new object\n+ if (this.entries == null) {\n+ this.entries = new MapWritable();\n+ }\n+\n+ if (value != 0) // only stores non-zero element\n+ this.entries.put(new IntWritable(index), new DoubleEntry(value));\n+ }\n+\n+ /**\n+ * Adds the value to v(index)\n+ * \n+ * @param index\n+ * @param value\n+ */\n+ public void add(int index, double value) {\n+ set(index, get(index) + value);\n+ }\n+\n+ /**\n+ * Sets the vector\n+ * \n+ * @param v\n+ * @return x = v\n+ */\n+ public SparseVector set(Vector v) {\n+ return new SparseVector(v.getEntries());\n+ }\n+\n+ @Override\n+ public Vector subVector(int i0, int i1) {\n+ // TODO Auto-generated method stub\n+ return null;\n+ }\n+\n+ @Override\n+ public Vector set(double alpha, Vector v) {\n+ // TODO Auto-generated method stub\n+ return null;\n+ }\n+\n+}","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FSparseVector.java","sha":"5480a4915ff8d739e87ae67063ba5a53e23a2112","status":"modified"},{"additions":13,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fgraph%2FTestGraph.java","changes":32,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fgraph%2FTestGraph.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":19,"filename":"src/test/org/apache/hama/graph/TestGraph.java","new_code":"import java.io.UnsupportedEncodingException;\nimport org.apache.hama.HamaCluster;\npublic class TestGraph extends HamaCluster {\n /**\n * @throws UnsupportedEncodingException\n */\n public TestGraph() throws UnsupportedEncodingException {\n super();\n }\n public void setUp() throws Exception {\n super.setUp();\n conf = getConf();\n adj = new SparseGraph(conf);","new_methods":[],"old_code":"import junit.extensions.TestSetup;\nimport junit.framework.Test;\nimport junit.framework.TestCase;\nimport junit.framework.TestSuite;\n\nimport org.apache.hama.matrix.HCluster;\npublic class TestGraph extends TestCase {\n public static Test suite() {\n TestSetup setup = new TestSetup(new TestSuite(TestGraph.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n conf = hCluster.getConf();\n adj = new SparseGraph(conf);\n }\n protected void tearDown() {\n }\n };\n return setup;","old_methods":[{"arguments":[],"filename":"src/test/org/apache/hama/graph/TestGraph.java","implementation":"TestSetup setup = new TestSetup(new TestSuite(TestGraph.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n conf = hCluster.getConf();\n adj = new SparseGraph(conf);","signature":"Test suite()"},{"arguments":[],"filename":"src/test/org/apache/hama/graph/TestGraph.java","implementation":"","signature":"void tearDown()"}],"patch":"@@ -20,38 +20,32 @@\n package org.apache.hama.graph;\n \n import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n import java.util.HashMap;\n import java.util.Map;\n \n-import junit.extensions.TestSetup;\n-import junit.framework.Test;\n-import junit.framework.TestCase;\n-import junit.framework.TestSuite;\n-\n+import org.apache.hama.HamaCluster;\n import org.apache.hama.HamaConfiguration;\n-import org.apache.hama.matrix.HCluster;\n import org.apache.log4j.Logger;\n \n-public class TestGraph extends TestCase {\n+public class TestGraph extends HamaCluster {\n static final Logger LOG = Logger.getLogger(TestGraph.class);\n private static HamaConfiguration conf;\n private static Graph adj;\n private static int[] result = new int[] { 4, 3, 2, 0, 1 };\n \n- public static Test suite() {\n- TestSetup setup = new TestSetup(new TestSuite(TestGraph.class)) {\n- protected void setUp() throws Exception {\n- HCluster hCluster = new HCluster();\n- hCluster.setUp();\n \n- conf = hCluster.getConf();\n- adj = new SparseGraph(conf);\n- }\n+ /**\n+ * @throws UnsupportedEncodingException\n+ */\n+ public TestGraph() throws UnsupportedEncodingException {\n+ super();\n+ }\n \n- protected void tearDown() {\n- }\n- };\n- return setup;\n+ public void setUp() throws Exception {\n+ super.setUp();\n+ conf = getConf();\n+ adj = new SparseGraph(conf);\n }\n \n public void testAddEdge() throws IOException {","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fgraph%2FTestGraph.java","sha":"3a22f64e33cbab0acadaf146bbb70b07f1698271","status":"modified"},{"additions":60,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestBlockMatrixMapReduce.java","changes":120,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestBlockMatrixMapReduce.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":60,"filename":"src/test/org/apache/hama/mapred/TestBlockMatrixMapReduce.java","new_code":"/**\n * Copyright 2007 The Apache Software Foundation\n *\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\npackage org.apache.hama.mapred;\n\nimport java.io.IOException;\n\nimport org.apache.hama.HamaCluster;\nimport org.apache.hama.matrix.DenseMatrix;\nimport org.apache.log4j.Logger;\n\npublic class TestBlockMatrixMapReduce extends HamaCluster {\n static final Logger LOG = Logger.getLogger(TestBlockMatrixMapReduce.class);\n static final int SIZE = 32;\n\n /** constructor */\n public TestBlockMatrixMapReduce() {\n super();\n }\n\n public void testBlockMatrixMapReduce() throws IOException,\n ClassNotFoundException {\n DenseMatrix m1 = DenseMatrix.random(conf, SIZE, SIZE);\n DenseMatrix m2 = DenseMatrix.random(conf, SIZE, SIZE);\n\n DenseMatrix c = (DenseMatrix) m1.mult(m2, 16);\n\n double[][] mem = new double[SIZE][SIZE];\n for (int i = 0; i < SIZE; i++) {\n for (int j = 0; j < SIZE; j++) {\n for (int k = 0; k < SIZE; k++) {\n mem[i][k] += m1.get(i, j) * m2.get(j, k);\n }\n }\n }\n\n for (int i = 0; i < SIZE; i++) {\n for (int j = 0; j < SIZE; j++) {\n double gap = (mem[i][j] - c.get(i, j));\n assertTrue(gap < 0.000001 || gap < -0.000001);\n }\n }\n }\n}","new_methods":[{"arguments":[],"filename":"src/test/org/apache/hama/mapred/TestBlockMatrixMapReduce.java","implementation":"super();","signature":"public TestBlockMatrixMapReduce()"}],"old_code":"/**\r\n * Copyright 2007 The Apache Software Foundation\r\n *\r\n * Licensed to the Apache Software Foundation (ASF) under one\r\n * or more contributor license agreements. See the NOTICE file\r\n * distributed with this work for additional information\r\n * regarding copyright ownership. The ASF licenses this file\r\n * to you under the Apache License, Version 2.0 (the\r\n * \"License\"); you may not use this file except in compliance\r\n * with the License. You may obtain a copy of the License at\r\n *\r\n * http://www.apache.org/licenses/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n */\r\npackage org.apache.hama.mapred;\r\n\r\nimport java.io.IOException;\r\n\r\nimport org.apache.hama.matrix.DenseMatrix;\r\nimport org.apache.hama.matrix.HCluster;\r\nimport org.apache.log4j.Logger;\r\n\r\npublic class TestBlockMatrixMapReduce extends HCluster {\r\n static final Logger LOG = Logger.getLogger(TestBlockMatrixMapReduce.class);\r\n static final int SIZE = 32;\r\n\r\n /** constructor */\r\n public TestBlockMatrixMapReduce() {\r\n super();\r\n }\r\n\r\n public void testBlockMatrixMapReduce() throws IOException,\r\n ClassNotFoundException {\r\n DenseMatrix m1 = DenseMatrix.random(conf, SIZE, SIZE);\r\n DenseMatrix m2 = DenseMatrix.random(conf, SIZE, SIZE);\r\n\r\n DenseMatrix c = (DenseMatrix) m1.mult(m2, 16);\r\n\r\n double[][] mem = new double[SIZE][SIZE];\r\n for (int i = 0; i < SIZE; i++) {\r\n for (int j = 0; j < SIZE; j++) {\r\n for (int k = 0; k < SIZE; k++) {\r\n mem[i][k] += m1.get(i, j) * m2.get(j, k);\r\n }\r\n }\r\n }\r\n\r\n for (int i = 0; i < SIZE; i++) {\r\n for (int j = 0; j < SIZE; j++) {\r\n double gap = (mem[i][j] - c.get(i, j));\r\n assertTrue(gap < 0.000001 || gap < -0.000001);\r\n }\r\n }\r\n }\r\n}\r","old_methods":[{"arguments":[],"filename":"src/test/org/apache/hama/mapred/TestBlockMatrixMapReduce.java","implementation":"super();","signature":"public TestBlockMatrixMapReduce()"}],"patch":"@@ -1,60 +1,60 @@\n-/**\r\n- * Copyright 2007 The Apache Software Foundation\r\n- *\r\n- * Licensed to the Apache Software Foundation (ASF) under one\r\n- * or more contributor license agreements. See the NOTICE file\r\n- * distributed with this work for additional information\r\n- * regarding copyright ownership. The ASF licenses this file\r\n- * to you under the Apache License, Version 2.0 (the\r\n- * \"License\"); you may not use this file except in compliance\r\n- * with the License. You may obtain a copy of the License at\r\n- *\r\n- * http://www.apache.org/licenses/LICENSE-2.0\r\n- *\r\n- * Unless required by applicable law or agreed to in writing, software\r\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n- * See the License for the specific language governing permissions and\r\n- * limitations under the License.\r\n- */\r\n-package org.apache.hama.mapred;\r\n-\r\n-import java.io.IOException;\r\n-\r\n-import org.apache.hama.matrix.DenseMatrix;\r\n-import org.apache.hama.matrix.HCluster;\r\n-import org.apache.log4j.Logger;\r\n-\r\n-public class TestBlockMatrixMapReduce extends HCluster {\r\n- static final Logger LOG = Logger.getLogger(TestBlockMatrixMapReduce.class);\r\n- static final int SIZE = 32;\r\n-\r\n- /** constructor */\r\n- public TestBlockMatrixMapReduce() {\r\n- super();\r\n- }\r\n-\r\n- public void testBlockMatrixMapReduce() throws IOException,\r\n- ClassNotFoundException {\r\n- DenseMatrix m1 = DenseMatrix.random(conf, SIZE, SIZE);\r\n- DenseMatrix m2 = DenseMatrix.random(conf, SIZE, SIZE);\r\n-\r\n- DenseMatrix c = (DenseMatrix) m1.mult(m2, 16);\r\n-\r\n- double[][] mem = new double[SIZE][SIZE];\r\n- for (int i = 0; i < SIZE; i++) {\r\n- for (int j = 0; j < SIZE; j++) {\r\n- for (int k = 0; k < SIZE; k++) {\r\n- mem[i][k] += m1.get(i, j) * m2.get(j, k);\r\n- }\r\n- }\r\n- }\r\n-\r\n- for (int i = 0; i < SIZE; i++) {\r\n- for (int j = 0; j < SIZE; j++) {\r\n- double gap = (mem[i][j] - c.get(i, j));\r\n- assertTrue(gap < 0.000001 || gap < -0.000001);\r\n- }\r\n- }\r\n- }\r\n-}\r\n+/**\n+ * Copyright 2007 The Apache Software Foundation\n+ *\n+ * Licensed to the Apache Software Foundation (ASF) under one\n+ * or more contributor license agreements. See the NOTICE file\n+ * distributed with this work for additional information\n+ * regarding copyright ownership. The ASF licenses this file\n+ * to you under the Apache License, Version 2.0 (the\n+ * \"License\"); you may not use this file except in compliance\n+ * with the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.apache.hama.mapred;\n+\n+import java.io.IOException;\n+\n+import org.apache.hama.HamaCluster;\n+import org.apache.hama.matrix.DenseMatrix;\n+import org.apache.log4j.Logger;\n+\n+public class TestBlockMatrixMapReduce extends HamaCluster {\n+ static final Logger LOG = Logger.getLogger(TestBlockMatrixMapReduce.class);\n+ static final int SIZE = 32;\n+\n+ /** constructor */\n+ public TestBlockMatrixMapReduce() {\n+ super();\n+ }\n+\n+ public void testBlockMatrixMapReduce() throws IOException,\n+ ClassNotFoundException {\n+ DenseMatrix m1 = DenseMatrix.random(conf, SIZE, SIZE);\n+ DenseMatrix m2 = DenseMatrix.random(conf, SIZE, SIZE);\n+\n+ DenseMatrix c = (DenseMatrix) m1.mult(m2, 16);\n+\n+ double[][] mem = new double[SIZE][SIZE];\n+ for (int i = 0; i < SIZE; i++) {\n+ for (int j = 0; j < SIZE; j++) {\n+ for (int k = 0; k < SIZE; k++) {\n+ mem[i][k] += m1.get(i, j) * m2.get(j, k);\n+ }\n+ }\n+ }\n+\n+ for (int i = 0; i < SIZE; i++) {\n+ for (int j = 0; j < SIZE; j++) {\n+ double gap = (mem[i][j] - c.get(i, j));\n+ assertTrue(gap < 0.000001 || gap < -0.000001);\n+ }\n+ }\n+ }\n+}","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestBlockMatrixMapReduce.java","sha":"96419f3cee20b7fd3167f286812a23d740564721","status":"modified"},{"additions":2,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestRandomMatrixMapReduce.java","changes":4,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestRandomMatrixMapReduce.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":2,"filename":"src/test/org/apache/hama/mapred/TestRandomMatrixMapReduce.java","new_code":"import org.apache.hama.HamaCluster;\npublic class TestRandomMatrixMapReduce extends HamaCluster {","new_methods":[],"old_code":"import org.apache.hama.matrix.HCluster;\npublic class TestRandomMatrixMapReduce extends HCluster {","old_methods":[],"patch":"@@ -21,12 +21,12 @@\n \n import java.io.IOException;\n \n+import org.apache.hama.HamaCluster;\n import org.apache.hama.matrix.DenseMatrix;\n-import org.apache.hama.matrix.HCluster;\n import org.apache.hama.matrix.SparseMatrix;\n import org.apache.log4j.Logger;\n \n-public class TestRandomMatrixMapReduce extends HCluster {\n+public class TestRandomMatrixMapReduce extends HamaCluster {\n static final Logger LOG = Logger.getLogger(TestRandomMatrixMapReduce.class);\n \n public void testRandomMatrixMapReduce() throws IOException {","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestRandomMatrixMapReduce.java","sha":"7c2979b382bb14adec6e4f892915ef7d9b8e0899","status":"modified"},{"additions":74,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FMatrixTestCommon.java","changes":148,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FMatrixTestCommon.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":74,"filename":"src/test/org/apache/hama/matrix/MatrixTestCommon.java","new_code":"/**\n * Licensed to the Apache Software Foundation (ASF) under one or more\n * contributor license agreements. See the NOTICE file distributed with this\n * work for additional information regarding copyright ownership. The ASF\n * licenses this file to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance with the License.\n * You may obtain a copy of the License at\n * \n * http://www.apache.org/licenses/LICENSE-2.0\n * \n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\n * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\n * License for the specific language governing permissions and limitations under\n * the License.\n */\npackage org.apache.hama.matrix;\n\nimport java.io.IOException;\n\nclass MatrixTestCommon {\n\n static double verifyNorm1(Matrix m1) throws IOException {\n double[] colSum = new double[m1.getColumns()];\n for (int j = 0; j < m1.getColumns(); j++) {\n for (int i = 0; i < m1.getRows(); i++) {\n colSum[j] += Math.abs(m1.get(i, j));\n }\n }\n\n double max = 0;\n for (int i = 0; i < colSum.length; i++) {\n max = Math.max(colSum[i], max);\n }\n return max;\n }\n\n static double verifyNormInfinity(Matrix m1) throws IOException {\n double[] rowSum = new double[m1.getRows()];\n for (int i = 0; i < m1.getRows(); i++) {\n for (int j = 0; j < m1.getColumns(); j++) {\n rowSum[i] += Math.abs(m1.get(i, j));\n }\n }\n\n double max = 0;\n for (int i = 0; i < rowSum.length; ++i)\n max = Math.max(rowSum[i], max);\n return max;\n }\n\n static double verifyNormMaxValue(Matrix m1) throws IOException {\n double max = 0;\n for (int i = 0; i < m1.getRows(); i++) {\n for (int j = 0; j < m1.getColumns(); j++) {\n max = Math.max(Math.abs(m1.get(i, j)), max);\n }\n }\n\n return max;\n }\n\n static double verifyNormFrobenius(Matrix m1) throws IOException {\n double sqrtSum = 0;\n for (int i = 0; i < m1.getRows(); i++) {\n for (int j = 0; j < m1.getColumns(); j++) {\n double cellValue = m1.get(i, j);\n sqrtSum += (cellValue * cellValue);\n }\n }\n return Math.sqrt(sqrtSum);\n }\n\n}","new_methods":[],"old_code":"/**\r\n * Licensed to the Apache Software Foundation (ASF) under one or more\r\n * contributor license agreements. See the NOTICE file distributed with this\r\n * work for additional information regarding copyright ownership. The ASF\r\n * licenses this file to you under the Apache License, Version 2.0 (the\r\n * \"License\"); you may not use this file except in compliance with the License.\r\n * You may obtain a copy of the License at\r\n * \r\n * http://www.apache.org/licenses/LICENSE-2.0\r\n * \r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\r\n * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r\n * License for the specific language governing permissions and limitations under\r\n * the License.\r\n */\r\npackage org.apache.hama.matrix;\r\n\r\nimport java.io.IOException;\r\n\r\nclass MatrixTestCommon {\r\n\r\n static double verifyNorm1(Matrix m1) throws IOException {\r\n double[] colSum = new double[m1.getColumns()];\r\n for (int j = 0; j < m1.getColumns(); j++) {\r\n for (int i = 0; i < m1.getRows(); i++) {\r\n colSum[j] += Math.abs(m1.get(i, j));\r\n }\r\n }\r\n \r\n double max = 0;\r\n for (int i=0; i < colSum.length; i++) {\r\n max = Math.max(colSum[i], max);\r\n }\r\n return max;\r\n }\r\n \r\n static double verifyNormInfinity(Matrix m1) throws IOException {\r\n double[] rowSum = new double[m1.getRows()];\r\n for (int i = 0; i < m1.getRows(); i++) {\r\n for (int j = 0; j < m1.getColumns(); j++) {\r\n rowSum[i] += Math.abs(m1.get(i, j));\r\n }\r\n }\r\n\r\n double max = 0;\r\n for (int i = 0; i < rowSum.length; ++i)\r\n max = Math.max(rowSum[i], max);\r\n return max;\r\n }\r\n \r\n static double verifyNormMaxValue(Matrix m1) throws IOException {\r\n double max = 0;\r\n for (int i = 0; i < m1.getRows(); i++) {\r\n for (int j = 0; j < m1.getColumns(); j++) {\r\n max = Math.max(Math.abs(m1.get(i, j)), max);\r\n }\r\n }\r\n \r\n return max;\r\n }\r\n \r\n static double verifyNormFrobenius(Matrix m1) throws IOException {\r\n double sqrtSum = 0;\r\n for (int i = 0; i < m1.getRows(); i++) {\r\n for (int j = 0; j < m1.getColumns(); j++) {\r\n double cellValue = m1.get(i, j);\r\n sqrtSum += ( cellValue * cellValue );\r\n }\r\n } \r\n return Math.sqrt(sqrtSum);\r\n }\r\n \r\n}\r","old_methods":[],"patch":"@@ -1,74 +1,74 @@\n-/**\r\n- * Licensed to the Apache Software Foundation (ASF) under one or more\r\n- * contributor license agreements. See the NOTICE file distributed with this\r\n- * work for additional information regarding copyright ownership. The ASF\r\n- * licenses this file to you under the Apache License, Version 2.0 (the\r\n- * \"License\"); you may not use this file except in compliance with the License.\r\n- * You may obtain a copy of the License at\r\n- * \r\n- * http://www.apache.org/licenses/LICENSE-2.0\r\n- * \r\n- * Unless required by applicable law or agreed to in writing, software\r\n- * distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\r\n- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\r\n- * License for the specific language governing permissions and limitations under\r\n- * the License.\r\n- */\r\n-package org.apache.hama.matrix;\r\n-\r\n-import java.io.IOException;\r\n-\r\n-class MatrixTestCommon {\r\n-\r\n- static double verifyNorm1(Matrix m1) throws IOException {\r\n- double[] colSum = new double[m1.getColumns()];\r\n- for (int j = 0; j < m1.getColumns(); j++) {\r\n- for (int i = 0; i < m1.getRows(); i++) {\r\n- colSum[j] += Math.abs(m1.get(i, j));\r\n- }\r\n- }\r\n- \r\n- double max = 0;\r\n- for (int i=0; i < colSum.length; i++) {\r\n- max = Math.max(colSum[i], max);\r\n- }\r\n- return max;\r\n- }\r\n- \r\n- static double verifyNormInfinity(Matrix m1) throws IOException {\r\n- double[] rowSum = new double[m1.getRows()];\r\n- for (int i = 0; i < m1.getRows(); i++) {\r\n- for (int j = 0; j < m1.getColumns(); j++) {\r\n- rowSum[i] += Math.abs(m1.get(i, j));\r\n- }\r\n- }\r\n-\r\n- double max = 0;\r\n- for (int i = 0; i < rowSum.length; ++i)\r\n- max = Math.max(rowSum[i], max);\r\n- return max;\r\n- }\r\n- \r\n- static double verifyNormMaxValue(Matrix m1) throws IOException {\r\n- double max = 0;\r\n- for (int i = 0; i < m1.getRows(); i++) {\r\n- for (int j = 0; j < m1.getColumns(); j++) {\r\n- max = Math.max(Math.abs(m1.get(i, j)), max);\r\n- }\r\n- }\r\n- \r\n- return max;\r\n- }\r\n- \r\n- static double verifyNormFrobenius(Matrix m1) throws IOException {\r\n- double sqrtSum = 0;\r\n- for (int i = 0; i < m1.getRows(); i++) {\r\n- for (int j = 0; j < m1.getColumns(); j++) {\r\n- double cellValue = m1.get(i, j);\r\n- sqrtSum += ( cellValue * cellValue );\r\n- }\r\n- } \r\n- return Math.sqrt(sqrtSum);\r\n- }\r\n- \r\n-}\r\n+/**\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\n+ * contributor license agreements. See the NOTICE file distributed with this\n+ * work for additional information regarding copyright ownership. The ASF\n+ * licenses this file to you under the Apache License, Version 2.0 (the\n+ * \"License\"); you may not use this file except in compliance with the License.\n+ * You may obtain a copy of the License at\n+ * \n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ * \n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS, WITHOUT\n+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\n+ * License for the specific language governing permissions and limitations under\n+ * the License.\n+ */\n+package org.apache.hama.matrix;\n+\n+import java.io.IOException;\n+\n+class MatrixTestCommon {\n+\n+ static double verifyNorm1(Matrix m1) throws IOException {\n+ double[] colSum = new double[m1.getColumns()];\n+ for (int j = 0; j < m1.getColumns(); j++) {\n+ for (int i = 0; i < m1.getRows(); i++) {\n+ colSum[j] += Math.abs(m1.get(i, j));\n+ }\n+ }\n+\n+ double max = 0;\n+ for (int i = 0; i < colSum.length; i++) {\n+ max = Math.max(colSum[i], max);\n+ }\n+ return max;\n+ }\n+\n+ static double verifyNormInfinity(Matrix m1) throws IOException {\n+ double[] rowSum = new double[m1.getRows()];\n+ for (int i = 0; i < m1.getRows(); i++) {\n+ for (int j = 0; j < m1.getColumns(); j++) {\n+ rowSum[i] += Math.abs(m1.get(i, j));\n+ }\n+ }\n+\n+ double max = 0;\n+ for (int i = 0; i < rowSum.length; ++i)\n+ max = Math.max(rowSum[i], max);\n+ return max;\n+ }\n+\n+ static double verifyNormMaxValue(Matrix m1) throws IOException {\n+ double max = 0;\n+ for (int i = 0; i < m1.getRows(); i++) {\n+ for (int j = 0; j < m1.getColumns(); j++) {\n+ max = Math.max(Math.abs(m1.get(i, j)), max);\n+ }\n+ }\n+\n+ return max;\n+ }\n+\n+ static double verifyNormFrobenius(Matrix m1) throws IOException {\n+ double sqrtSum = 0;\n+ for (int i = 0; i < m1.getRows(); i++) {\n+ for (int j = 0; j < m1.getColumns(); j++) {\n+ double cellValue = m1.get(i, j);\n+ sqrtSum += (cellValue * cellValue);\n+ }\n+ }\n+ return Math.sqrt(sqrtSum);\n+ }\n+\n+}","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FMatrixTestCommon.java","sha":"7c00eb66ef35f28a763649fb25b0b91e8ce6a138","status":"modified"},{"additions":90,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseMatrix.java","changes":497,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseMatrix.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":407,"filename":"src/test/org/apache/hama/matrix/TestDenseMatrix.java","new_code":"import java.io.UnsupportedEncodingException;\nimport org.apache.hama.HamaCluster;\npublic class TestDenseMatrix extends HamaCluster {\n private int SIZE = 10;\n private Matrix m1;\n private Matrix m2;\n private HamaConfiguration conf;\n * @throws UnsupportedEncodingException\n public TestDenseMatrix() throws UnsupportedEncodingException {\n super();\n public void setUp() throws Exception {\n super.setUp();\n conf = getConf();\n m1 = DenseMatrix.random(conf, SIZE, SIZE);\n m2 = DenseMatrix.random(conf, SIZE, SIZE);\n }\n public void testAddMult() throws IOException {\n Matrix m3 = DenseMatrix.random(conf, SIZE, SIZE);\n Matrix m4 = DenseMatrix.random(conf, SIZE - 2, SIZE - 2);\n try {\n m1.add(m4);\n fail(\"Matrix-Addition should be failed while rows and columns aren't same.\");\n } catch (IOException e) {\n LOG.info(e.toString());\n try {\n m1.mult(m4);\n fail(\"Matrix-Mult should be failed while A.columns!=B.rows.\");\n } catch (IOException e) {\n LOG.info(e.toString());\n \n double origin = m1.get(1, 1);\n m1.add(1, 1, 0.5);\n assertEquals(m1.get(1, 1), origin + 0.5);\n \n matrixAdd(m1, m2);\n multMatrixAdd(m1, m2, m3);\n matrixMult(m1, m2);\n addAlphaMatrix(m1, m2);\n \n getRowColumn();\n setRowColumn();\n setMatrix(m1);\n setAlphaMatrix(m1);\n public void matrixAdd(Matrix m1, Matrix m2) throws IOException {\n public void multMatrixAdd(Matrix m1, Matrix m2, Matrix m3) throws IOException {\n Matrix result = ((DenseMatrix) m1).add(m2, m3);\n\n\n assertEquals(result.get(i, j), m1.get(i, j) + m2.get(i, j)\n + m3.get(i, j));\n public void matrixMult(Matrix m1, Matrix m2) throws IOException {\n public void addAlphaMatrix(Matrix m1, Matrix m2) throws IOException {\n double value = m1.get(0, 0) + (m2.get(0, 0) * 0.1);\n Matrix result = m1.add(0.1, m2);\n assertEquals(value, result.get(0, 0));\n }\n \n public void setMatrix(Matrix m1) throws IOException {\n public void setAlphaMatrix(Matrix m1) throws IOException {\n\n\n public void getRowColumn() throws IOException {\n boolean ex = false;\n try {\n m1.get(SIZE + 1, SIZE + 1);\n } catch (ArrayIndexOutOfBoundsException e) {\n ex = true;\n }\n assertTrue(ex);\n assertTrue(m1.get(0, 0) > 0);\n Vector v = m1.getColumn(0);\n Iterator it = v.iterator();\n int x = 0;\n while (it.hasNext()) {\n assertEquals(m1.get(x, 0), ((DoubleEntry) it.next()).getValue());\n x++;\n }\n m1.setRowLabel(0, \"row1\");\n assertEquals(m1.getRowLabel(0), \"row1\");\n assertEquals(m1.getRowLabel(1), null);\n\n m1.setColumnLabel(0, \"column1\");\n assertEquals(m1.getColumnLabel(0), \"column1\");\n assertEquals(m1.getColumnLabel(1), null);\n public void setRowColumn() throws IOException {\n Iterator it2 = m1.getColumn(SIZE).iterator();\n int x = 0;\n while (it2.hasNext()) {\n assertEquals(entries[x], ((DoubleEntry) it2.next()).getValue());\n x++;","new_methods":[],"old_code":"import junit.extensions.TestSetup;\nimport junit.framework.Test;\nimport junit.framework.TestCase;\nimport junit.framework.TestSuite;\n\nimport org.apache.hadoop.hbase.client.HBaseAdmin;\nimport org.apache.hama.HamaAdmin;\nimport org.apache.hama.HamaAdminImpl;\nimport org.apache.hama.matrix.Matrix.Norm;\npublic class TestDenseMatrix extends TestCase {\n private static int SIZE = 10;\n private static Matrix m1;\n private static Matrix m2;\n private static Matrix m3;\n private static Matrix m4, m5;\n private final static String aliase1 = \"matrix_aliase_A\";\n private final static String aliase2 = \"matrix_aliase_B\";\n private static HamaConfiguration conf;\n private static HBaseAdmin admin;\n private static HamaAdmin hamaAdmin;\n\n public static Test suite() {\n TestSetup setup = new TestSetup(new TestSuite(TestDenseMatrix.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n\n conf = hCluster.getConf();\n admin = new HBaseAdmin(conf);\n hamaAdmin = new HamaAdminImpl(conf, admin);\n\n m1 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m2 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m3 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m4 = DenseMatrix.random(hCluster.getConf(), SIZE-2, SIZE-2);\n m5 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n }\n\n protected void tearDown() {\n try {\n closeTest();\n } catch (IOException e) {\n e.printStackTrace();\n }\n }\n };\n return setup;\n }\n\n public static void closeTest() throws IOException {\n m1.close();\n m2.close();\n }\n\n public void testEntryAdd() throws IOException {\n double origin = m1.get(1, 1);\n m1.add(1, 1, 0.5);\n\n assertEquals(m1.get(1, 1), origin + 0.5);\n }\n\n public void testGet() throws IOException {\n boolean ex = false;\n try {\n m1.get(SIZE + 1, SIZE + 1);\n } catch (ArrayIndexOutOfBoundsException e) {\n ex = true;\n }\n assertTrue(ex);\n assertTrue(m1.get(0, 0) > 0);\n }\n \n public void testTranspose() throws IOException {\n DenseMatrix trans = (DenseMatrix) m1.transpose();\n for(int i = 0; i < trans.getRows(); i++) {\n for(int j = 0; j < trans.getColumns(); j++) {\n assertEquals(trans.get(i, j), m1.get(j, i));\n }\n }\n }\n * Column vector test.\n * \n * @param rand\n * @throws IOException\n public void testGetColumn() throws IOException {\n Vector v = m1.getColumn(0);\n Iterator it = v.iterator();\n int x = 0;\n while (it.hasNext()) {\n assertEquals(m1.get(x, 0), ((DoubleEntry) it.next()).getValue());\n x++;\n }\n public void testGetSetAttribute() throws IOException {\n m1.setRowLabel(0, \"row1\");\n assertEquals(m1.getRowLabel(0), \"row1\");\n assertEquals(m1.getRowLabel(1), null);\n\n m1.setColumnLabel(0, \"column1\");\n assertEquals(m1.getColumnLabel(0), \"column1\");\n assertEquals(m1.getColumnLabel(1), null);\n }\n public void testSubMatrix() throws IOException {\n SubMatrix a = m1.subMatrix(2, 4, 2, 5); // A : 3 * 4\n for (int i = 0; i < a.getRows(); i++) {\n for (int j = 0; j < a.getColumns(); j++) {\n assertEquals(a.get(i, j), m1.get(i + 2, j + 2));\n }\n }\n SubMatrix b = m2.subMatrix(0, 3, 0, 2); // B : 4 * 3\n SubMatrix c = a.mult(b);\n double[][] C = new double[3][3]; // A * B\n for (int i = 0; i < 3; i++) {\n for (int j = 0; j < 3; j++) {\n for (int k = 0; k < 4; k++) {\n C[i][j] += m1.get(i + 2, k + 2) * m2.get(k, j);\n }\n }\n for (int i = 0; i < 3; i++) {\n for (int j = 0; j < 3; j++) {\n assertEquals(C[i][j], c.get(i, j));\n }\n public void testMatrixAdd() throws IOException {\n public void testMultiMatrixAdd() throws IOException {\n Matrix result = ((DenseMatrix)m1).add(m2, m3);\n \n \n assertEquals(result.get(i, j), m1.get(i, j) + m2.get(i, j) + m3.get(i, j));\n public void testMatrixMult() throws IOException {\n public void testSetMatrix() throws IOException {\n public void testSetAlphaMatrix() throws IOException {\n \n \n public void testAddAlphaMatrix() throws IOException {\n double value = m1.get(0, 0) + (m2.get(0, 0) * 0.1);\n Matrix result = m1.add(0.1, m2);\n assertEquals(value, result.get(0, 0));\n }\n \n public void testNorm() throws IOException {\n double gap = 0.000001;\n \n double norm1 = m1.norm(Norm.One);\n double verify_norm1 = MatrixTestCommon.verifyNorm1(m1);\n gap = norm1 - verify_norm1;\n LOG.info(\"Norm One : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n \n double normInfinity = m1.norm(Norm.Infinity);\n double verify_normInf = MatrixTestCommon.verifyNormInfinity(m1);\n gap = normInfinity - verify_normInf;\n LOG.info(\"Norm Infinity : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n double normMaxValue = m1.norm(Norm.Maxvalue);\n double verify_normMV = MatrixTestCommon.verifyNormMaxValue(m1);\n gap = normMaxValue - verify_normMV;\n LOG.info(\"Norm MaxValue : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n double normFrobenius = m1.norm(Norm.Frobenius);\n double verify_normFrobenius = MatrixTestCommon.verifyNormFrobenius(m1);\n gap = normFrobenius - verify_normFrobenius;\n LOG.info(\"Norm Frobenius : \" + normFrobenius + \"(map/reduce) - \" + verify_normFrobenius + \" expected\");\n LOG.info(\"Norm Frobenius : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n public void testSetRow() throws IOException {\n }\n\n public void testSetColumn() throws IOException {\n Vector v = new DenseVector();\n double[] entries = new double[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };\n\n for (int i = 0; i < SIZE; i++) {\n v.set(i, entries[i]);\n }\n Iterator it = m1.getColumn(SIZE).iterator();\n\n int i = 0;\n while (it.hasNext()) {\n assertEquals(entries[i], ((DoubleEntry) it.next()).getValue());\n i++;\n }\n }\n\n public void testJacobiEigenValue() throws IOException {\n // copy Matrix m5 to the array\n double[][] S = new double[SIZE][SIZE];\n \n for (int i = 0; i < SIZE; i++) {\n for (int j = 0; j < SIZE; j++) {\n S[i][j] = m5.get(i, j);\n }\n }\n \n // do m/r jacobi eigen value computation\n DenseMatrix dm = (DenseMatrix)m5;\n dm.jacobiEigenValue(3);\n \n // do jacobi egien value over S array\n int i, j, k, l, m, state;\n double s, c, t, p, y;\n double e1, e2;\n // index array\n int[] ind = new int[SIZE];\n boolean[] changed = new boolean[SIZE];\n \n // output\n double[] e = new double[SIZE];\n double[][] E = new double[SIZE][SIZE];\n \n // init e & E; ind & changed\n for(i=0; i 0) {\n // find index(k, l) for pivot p\n m = 0;\n for(k = 1; k <= SIZE-2; k++) {\n if(Math.abs(S[m][ind[m]]) < Math.abs(S[k][ind[k]])) {\n m = k;\n }\n }\n \n k = m; l = ind[m]; p = S[k][l];\n \n // calculate c = cos, s = sin\n y = (e[l] - e[k]) / 2;\n t = Math.abs(y) + Math.sqrt(p * p + y * y);\n s = Math.sqrt(p * p + t * t);\n c = t / s;\n s = p / s;\n t = (p * p) / t;\n if(y < 0) {\n s = -s;\n t = -t;\n }\n \n S[k][l] = 0.0;\n state = update(e, changed, k, -t, state);\n state = update(e, changed, l, t, state);\n \n for(i = 0; i <= k-1; i++) \n rotate(S, i, k, i, l, c, s);\n \n for(i = l+1; i < SIZE; i++)\n rotate(S, k, i, l, i, c, s);\n \n for(i = k+1; i <= l-1; i++)\n rotate(S, k, i, i, l, c, s);\n \n // rotate eigenvectors\n for(i = 0; i < SIZE; i++) {\n e1 = E[k][i];\n e2 = E[l][i];\n \n E[k][i] = c * e1 - s * e2;\n E[l][i] = s * e1 + c * e2;\n }\n \n ind[k] = maxind(S, k, SIZE);\n ind[l] = maxind(S, l, SIZE);\n \n loops --;\n }\n \n // verify the results\n assertTrue(dm.verifyEigenValue(e, E));\n }\n\n public void testEnsureForAddition() {\n try {\n m1.add(m4);\n fail(\"Matrix-Addition should be failed while rows and columns aren't same.\");\n } catch (IOException e) {\n LOG.info(e.toString());\n }\n }\n\n public void testEnsureForMultiplication() {\n try {\n m1.mult(m4);\n fail(\"Matrix-Mult should be failed while A.columns!=B.rows.\");\n } catch (IOException e) {\n LOG.info(e.toString());\n }\n }\n \n public void testLoadSave() throws IOException {\n String path1 = m1.getPath();\n // save m1 to aliase1\n m1.save(aliase1);\n // load matrix m1 using aliase1\n DenseMatrix loadTest = new DenseMatrix(conf, aliase1, false);\n for (int i = 0; i < SIZE; i++) {\n for (int j = 0; j < SIZE; j++) {\n assertEquals(m1.get(i, j), loadTest.get(i, j));\n }\n }\n\n assertEquals(path1, loadTest.getPath());\n // close loadTest, it just disconnect to the table but didn't delete it.\n loadTest.close();\n\n // try to close m1 & load matrix m1 using aliase1 again.\n m1.close();\n DenseMatrix loadTest2 = new DenseMatrix(conf, aliase1, false);\n assertEquals(path1, loadTest2.getPath());\n // remove aliase1\n // because loadTest2 connect the aliase1, so we just remove aliase entry\n // but didn't delete the table.\n hamaAdmin.delete(aliase1);\n assertEquals(true, admin.tableExists(path1));\n // close loadTest2, because it is the last one who reference table 'path1'\n // it will do the gc!\n loadTest2.close();\n assertEquals(false, admin.tableExists(path1));\n\n // if we try to load non-existed matrix using aliase name, it should fail.\n DenseMatrix loadTest3 = null;\n try {\n loadTest3 = new DenseMatrix(conf, aliase1, false);\n fail(\"Try to load a non-existed matrix should fail!\");\n } catch (IOException e) {\n\n } finally {\n if (loadTest3 != null)\n loadTest3.close();\n \n public void testForceCreate() throws IOException {\n String path2 = m2.getPath();\n // save m2 to aliase2\n m2.save(aliase2);\n // load matrix m2 using aliase2\n DenseMatrix loadTest = new DenseMatrix(conf, aliase2, false);\n\n for (int i = 0; i < loadTest.getRows(); i++) {\n for (int j = 0; j < loadTest.getColumns(); j++) {\n assertEquals(m2.get(i, j), loadTest.get(i, j));\n }\n }\n\n assertEquals(path2, loadTest.getPath());\n\n Matrix test = hamaAdmin.getMatrix(aliase2);\n assertEquals(test.getType(), \"DenseMatrix\");\n \n // force to create matrix loadTest2 using aliasename 'aliase2'\n DenseMatrix loadTest2 = new DenseMatrix(conf, aliase2, true);\n String loadPath2 = loadTest2.getPath();\n assertFalse(path2.equals(loadPath2));\n assertEquals(loadPath2, hamaAdmin.getPath(aliase2));\n assertFalse(path2.equals(hamaAdmin.getPath(aliase2)));\n\n // try to close m2 & loadTest, it table will be deleted finally\n m2.close();\n assertEquals(true, admin.tableExists(path2));\n loadTest.close();\n assertEquals(false, admin.tableExists(path2));\n\n // remove 'aliase2' & close loadTest2\n loadTest2.close();\n assertEquals(true, admin.tableExists(loadPath2));\n hamaAdmin.delete(aliase2);\n assertEquals(false, admin.tableExists(loadPath2));\n }\n \n //index of largest off-diagonal element in row k\n int maxind(double[][] S, int row, int size) {\n int m = row + 1;\n for(int i=row + 2; i Math.abs(S[row][m]))\n m = i;\n }\n return m;\n }\n \n int update(double[] e, boolean[] changed, int row, double value, int state) {\n double y = e[row];\n e[row] += value;\n \n if(changed[row] && y == e[row]) {\n changed[row] = false;\n return state - 1;\n } else if(!changed[row] && y != e[row]) {\n changed[row] = true;\n return state + 1;\n } else\n return state;\n }\n \n void rotate(double[][] S, int k, int l, int i, int j, double c, double s) {\n double s1 = S[k][l], s2 = S[i][j];\n S[k][l] = c * s1 - s * s2;\n S[i][j] = s * s1 + c * s2;\n }","old_methods":[{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseMatrix.java","implementation":"TestSetup setup = new TestSetup(new TestSuite(TestDenseMatrix.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n\n conf = hCluster.getConf();\n admin = new HBaseAdmin(conf);\n hamaAdmin = new HamaAdminImpl(conf, admin);\n\n m1 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m2 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m3 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m4 = DenseMatrix.random(hCluster.getConf(), SIZE-2, SIZE-2);\n m5 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);","signature":"Test suite()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseMatrix.java","implementation":"try {\n closeTest();","signature":"void tearDown()"},{"arguments":["int i = 0; i < 3; i++"],"filename":"src/test/org/apache/hama/matrix/TestDenseMatrix.java","implementation":"for (int j = 0; j < 3; j++) {\n for (int k = 0; k < 4; k++) {\n C[i][j] += m1.get(i + 2, k + 2) * m2.get(k, j);","signature":"B\n for (int i = 0; i < 3; i++)"},{"arguments":["i=0; i 0"],"filename":"src/test/org/apache/hama/matrix/TestDenseMatrix.java","implementation":"// find index(k, l) for pivot p\n m = 0;\n for(k = 1; k <= SIZE-2; k++) {\n if(Math.abs(S[m][ind[m]]) < Math.abs(S[k][ind[k]])) {\n m = k;","signature":"rotation\n while(state != 0 && loops > 0)"},{"arguments":["i = 0; i < SIZE; i++"],"filename":"src/test/org/apache/hama/matrix/TestDenseMatrix.java","implementation":"e1 = E[k][i];\n e2 = E[l][i];\n \n E[k][i] = c * e1 - s * e2;\n E[l][i] = s * e1 + c * e2;","signature":"eigenvectors\n for(i = 0; i < SIZE; i++)"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseMatrix.java","implementation":"try {\n m1.add(m4);\n fail(\"Matrix-Addition should be failed while rows and columns aren't same.\");","signature":"void testEnsureForAddition()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseMatrix.java","implementation":"try {\n m1.mult(m4);\n fail(\"Matrix-Mult should be failed while A.columns!=B.rows.\");","signature":"void testEnsureForMultiplication()"},{"arguments":["double[][] S"," int row"," int size"],"filename":"src/test/org/apache/hama/matrix/TestDenseMatrix.java","implementation":"int m = row + 1;\n for(int i=row + 2; i Math.abs(S[row][m]))\n m = i;","signature":"int maxind(double[][] S, int row, int size)"},{"arguments":["double[] e"," boolean[] changed"," int row"," double value"," int state"],"filename":"src/test/org/apache/hama/matrix/TestDenseMatrix.java","implementation":"double y = e[row];\n e[row] += value;\n \n if(changed[row] && y == e[row]) {\n changed[row] = false;\n return state - 1;","signature":"int update(double[] e, boolean[] changed, int row, double value, int state)"},{"arguments":["!changed[row] && y != e[row]"],"filename":"src/test/org/apache/hama/matrix/TestDenseMatrix.java","implementation":"changed[row] = true;\n return state + 1;","signature":"else if(!changed[row] && y != e[row])"},{"arguments":["double[][] S"," int k"," int l"," int i"," int j"," double c"," double s"],"filename":"src/test/org/apache/hama/matrix/TestDenseMatrix.java","implementation":"double s1 = S[k][l], s2 = S[i][j];\n S[k][l] = c * s1 - s * s2;\n S[i][j] = s * s1 + c * s2;","signature":"void rotate(double[][] S, int k, int l, int i, int j, double c, double s)"}],"patch":"@@ -20,158 +20,80 @@\n package org.apache.hama.matrix;\n \n import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n import java.util.Iterator;\n \n-import junit.extensions.TestSetup;\n-import junit.framework.Test;\n-import junit.framework.TestCase;\n-import junit.framework.TestSuite;\n-\n-import org.apache.hadoop.hbase.client.HBaseAdmin;\n import org.apache.hadoop.io.Writable;\n-import org.apache.hama.HamaAdmin;\n-import org.apache.hama.HamaAdminImpl;\n+import org.apache.hama.HamaCluster;\n import org.apache.hama.HamaConfiguration;\n import org.apache.hama.io.DoubleEntry;\n-import org.apache.hama.matrix.Matrix.Norm;\n import org.apache.hama.util.RandomVariable;\n import org.apache.log4j.Logger;\n \n /**\n * Matrix test\n */\n-public class TestDenseMatrix extends TestCase {\n+public class TestDenseMatrix extends HamaCluster {\n static final Logger LOG = Logger.getLogger(TestDenseMatrix.class);\n- private static int SIZE = 10;\n- private static Matrix m1;\n- private static Matrix m2;\n- private static Matrix m3;\n- private static Matrix m4, m5;\n- private final static String aliase1 = \"matrix_aliase_A\";\n- private final static String aliase2 = \"matrix_aliase_B\";\n- private static HamaConfiguration conf;\n- private static HBaseAdmin admin;\n- private static HamaAdmin hamaAdmin;\n-\n- public static Test suite() {\n- TestSetup setup = new TestSetup(new TestSuite(TestDenseMatrix.class)) {\n- protected void setUp() throws Exception {\n- HCluster hCluster = new HCluster();\n- hCluster.setUp();\n-\n- conf = hCluster.getConf();\n- admin = new HBaseAdmin(conf);\n- hamaAdmin = new HamaAdminImpl(conf, admin);\n-\n- m1 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n- m2 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n- m3 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n- m4 = DenseMatrix.random(hCluster.getConf(), SIZE-2, SIZE-2);\n- m5 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n- }\n-\n- protected void tearDown() {\n- try {\n- closeTest();\n- } catch (IOException e) {\n- e.printStackTrace();\n- }\n- }\n- };\n- return setup;\n- }\n-\n- public static void closeTest() throws IOException {\n- m1.close();\n- m2.close();\n- }\n-\n- public void testEntryAdd() throws IOException {\n- double origin = m1.get(1, 1);\n- m1.add(1, 1, 0.5);\n-\n- assertEquals(m1.get(1, 1), origin + 0.5);\n- }\n-\n- public void testGet() throws IOException {\n- boolean ex = false;\n- try {\n- m1.get(SIZE + 1, SIZE + 1);\n- } catch (ArrayIndexOutOfBoundsException e) {\n- ex = true;\n- }\n- assertTrue(ex);\n- assertTrue(m1.get(0, 0) > 0);\n- }\n- \n- public void testTranspose() throws IOException {\n- DenseMatrix trans = (DenseMatrix) m1.transpose();\n- for(int i = 0; i < trans.getRows(); i++) {\n- for(int j = 0; j < trans.getColumns(); j++) {\n- assertEquals(trans.get(i, j), m1.get(j, i));\n- }\n- }\n- }\n+ private int SIZE = 10;\n+ private Matrix m1;\n+ private Matrix m2;\n+ private HamaConfiguration conf;\n \n /**\n- * Column vector test.\n- * \n- * @param rand\n- * @throws IOException\n+ * @throws UnsupportedEncodingException\n */\n- public void testGetColumn() throws IOException {\n- Vector v = m1.getColumn(0);\n- Iterator it = v.iterator();\n- int x = 0;\n- while (it.hasNext()) {\n- assertEquals(m1.get(x, 0), ((DoubleEntry) it.next()).getValue());\n- x++;\n- }\n+ public TestDenseMatrix() throws UnsupportedEncodingException {\n+ super();\n }\n \n- public void testGetSetAttribute() throws IOException {\n- m1.setRowLabel(0, \"row1\");\n- assertEquals(m1.getRowLabel(0), \"row1\");\n- assertEquals(m1.getRowLabel(1), null);\n-\n- m1.setColumnLabel(0, \"column1\");\n- assertEquals(m1.getColumnLabel(0), \"column1\");\n- assertEquals(m1.getColumnLabel(1), null);\n- }\n+ public void setUp() throws Exception {\n+ super.setUp();\n \n- public void testSubMatrix() throws IOException {\n- SubMatrix a = m1.subMatrix(2, 4, 2, 5); // A : 3 * 4\n- for (int i = 0; i < a.getRows(); i++) {\n- for (int j = 0; j < a.getColumns(); j++) {\n- assertEquals(a.get(i, j), m1.get(i + 2, j + 2));\n- }\n- }\n+ conf = getConf();\n \n- SubMatrix b = m2.subMatrix(0, 3, 0, 2); // B : 4 * 3\n- SubMatrix c = a.mult(b);\n+ m1 = DenseMatrix.random(conf, SIZE, SIZE);\n+ m2 = DenseMatrix.random(conf, SIZE, SIZE);\n+ }\n \n- double[][] C = new double[3][3]; // A * B\n- for (int i = 0; i < 3; i++) {\n- for (int j = 0; j < 3; j++) {\n- for (int k = 0; k < 4; k++) {\n- C[i][j] += m1.get(i + 2, k + 2) * m2.get(k, j);\n- }\n- }\n+ public void testAddMult() throws IOException {\n+ Matrix m3 = DenseMatrix.random(conf, SIZE, SIZE);\n+ Matrix m4 = DenseMatrix.random(conf, SIZE - 2, SIZE - 2);\n+ try {\n+ m1.add(m4);\n+ fail(\"Matrix-Addition should be failed while rows and columns aren't same.\");\n+ } catch (IOException e) {\n+ LOG.info(e.toString());\n }\n \n- for (int i = 0; i < 3; i++) {\n- for (int j = 0; j < 3; j++) {\n- assertEquals(C[i][j], c.get(i, j));\n- }\n+ try {\n+ m1.mult(m4);\n+ fail(\"Matrix-Mult should be failed while A.columns!=B.rows.\");\n+ } catch (IOException e) {\n+ LOG.info(e.toString());\n }\n+ \n+ double origin = m1.get(1, 1);\n+ m1.add(1, 1, 0.5);\n+ assertEquals(m1.get(1, 1), origin + 0.5);\n+ \n+ matrixAdd(m1, m2);\n+ multMatrixAdd(m1, m2, m3);\n+ matrixMult(m1, m2);\n+ addAlphaMatrix(m1, m2);\n+ \n+ getRowColumn();\n+ setRowColumn();\n+ setMatrix(m1);\n+ setAlphaMatrix(m1);\n }\n \n /**\n * Test matrices addition\n * \n * @throws IOException\n */\n- public void testMatrixAdd() throws IOException {\n+ public void matrixAdd(Matrix m1, Matrix m2) throws IOException {\n Matrix result = m1.add(m2);\n \n assertEquals(result.getRows(), SIZE);\n@@ -193,15 +115,16 @@ public void testMatrixAdd() throws IOException {\n }\n }\n \n- public void testMultiMatrixAdd() throws IOException {\n- Matrix result = ((DenseMatrix)m1).add(m2, m3);\n- \n+ public void multMatrixAdd(Matrix m1, Matrix m2, Matrix m3) throws IOException {\n+ Matrix result = ((DenseMatrix) m1).add(m2, m3);\n+\n assertEquals(result.getRows(), SIZE);\n assertEquals(result.getColumns(), SIZE);\n- \n+\n for (int i = 0; i < SIZE; i++) {\n for (int j = 0; j < SIZE; j++) {\n- assertEquals(result.get(i, j), m1.get(i, j) + m2.get(i, j) + m3.get(i, j));\n+ assertEquals(result.get(i, j), m1.get(i, j) + m2.get(i, j)\n+ + m3.get(i, j));\n }\n }\n }\n@@ -211,7 +134,7 @@ public void testMultiMatrixAdd() throws IOException {\n * \n * @throws IOException\n */\n- public void testMatrixMult() throws IOException {\n+ public void matrixMult(Matrix m1, Matrix m2) throws IOException {\n Matrix result = m1.mult(m2);\n \n assertEquals(result.getRows(), SIZE);\n@@ -220,7 +143,13 @@ public void testMatrixMult() throws IOException {\n verifyMultResult(m1, m2, result);\n }\n \n- public void testSetMatrix() throws IOException {\n+ public void addAlphaMatrix(Matrix m1, Matrix m2) throws IOException {\n+ double value = m1.get(0, 0) + (m2.get(0, 0) * 0.1);\n+ Matrix result = m1.add(0.1, m2);\n+ assertEquals(value, result.get(0, 0));\n+ }\n+ \n+ public void setMatrix(Matrix m1) throws IOException {\n Matrix a = new DenseMatrix(conf, m1.getRows(), m1.getColumns());\n a.set(m1);\n \n@@ -232,53 +161,45 @@ public void testSetMatrix() throws IOException {\n }\n }\n \n- public void testSetAlphaMatrix() throws IOException {\n+ public void setAlphaMatrix(Matrix m1) throws IOException {\n Matrix a = new DenseMatrix(conf, m1.getRows(), m1.getColumns());\n a.set(0.5, m1);\n- \n+\n for (int i = 0; i < 5; i++) {\n int x = RandomVariable.randInt(0, SIZE - 1);\n int y = RandomVariable.randInt(0, SIZE - 1);\n assertEquals(a.get(x, y), (m1.get(x, y) * 0.5));\n }\n }\n- \n- public void testAddAlphaMatrix() throws IOException {\n- double value = m1.get(0, 0) + (m2.get(0, 0) * 0.1);\n- Matrix result = m1.add(0.1, m2);\n- assertEquals(value, result.get(0, 0));\n- }\n- \n- public void testNorm() throws IOException {\n- double gap = 0.000001;\n- \n- double norm1 = m1.norm(Norm.One);\n- double verify_norm1 = MatrixTestCommon.verifyNorm1(m1);\n- gap = norm1 - verify_norm1;\n- LOG.info(\"Norm One : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n- \n- double normInfinity = m1.norm(Norm.Infinity);\n- double verify_normInf = MatrixTestCommon.verifyNormInfinity(m1);\n- gap = normInfinity - verify_normInf;\n- LOG.info(\"Norm Infinity : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n+\n+ public void getRowColumn() throws IOException {\n+ boolean ex = false;\n+ try {\n+ m1.get(SIZE + 1, SIZE + 1);\n+ } catch (ArrayIndexOutOfBoundsException e) {\n+ ex = true;\n+ }\n+ assertTrue(ex);\n+ assertTrue(m1.get(0, 0) > 0);\n \n- double normMaxValue = m1.norm(Norm.Maxvalue);\n- double verify_normMV = MatrixTestCommon.verifyNormMaxValue(m1);\n- gap = normMaxValue - verify_normMV;\n- LOG.info(\"Norm MaxValue : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n+ Vector v = m1.getColumn(0);\n+ Iterator it = v.iterator();\n+ int x = 0;\n+ while (it.hasNext()) {\n+ assertEquals(m1.get(x, 0), ((DoubleEntry) it.next()).getValue());\n+ x++;\n+ }\n \n- double normFrobenius = m1.norm(Norm.Frobenius);\n- double verify_normFrobenius = MatrixTestCommon.verifyNormFrobenius(m1);\n- gap = normFrobenius - verify_normFrobenius;\n- LOG.info(\"Norm Frobenius : \" + normFrobenius + \"(map/reduce) - \" + verify_normFrobenius + \" expected\");\n- LOG.info(\"Norm Frobenius : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n+ m1.setRowLabel(0, \"row1\");\n+ assertEquals(m1.getRowLabel(0), \"row1\");\n+ assertEquals(m1.getRowLabel(1), null);\n+\n+ m1.setColumnLabel(0, \"column1\");\n+ assertEquals(m1.getColumnLabel(0), \"column1\");\n+ assertEquals(m1.getColumnLabel(1), null);\n }\n \n- public void testSetRow() throws IOException {\n+ public void setRowColumn() throws IOException {\n Vector v = new DenseVector();\n double[] entries = new double[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };\n \n@@ -294,224 +215,16 @@ public void testSetRow() throws IOException {\n assertEquals(entries[i], ((DoubleEntry) it.next()).getValue());\n i++;\n }\n- }\n-\n- public void testSetColumn() throws IOException {\n- Vector v = new DenseVector();\n- double[] entries = new double[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };\n-\n- for (int i = 0; i < SIZE; i++) {\n- v.set(i, entries[i]);\n- }\n \n m1.setColumn(SIZE, v);\n- Iterator it = m1.getColumn(SIZE).iterator();\n-\n- int i = 0;\n- while (it.hasNext()) {\n- assertEquals(entries[i], ((DoubleEntry) it.next()).getValue());\n- i++;\n- }\n- }\n-\n- public void testJacobiEigenValue() throws IOException {\n- // copy Matrix m5 to the array\n- double[][] S = new double[SIZE][SIZE];\n- \n- for (int i = 0; i < SIZE; i++) {\n- for (int j = 0; j < SIZE; j++) {\n- S[i][j] = m5.get(i, j);\n- }\n- }\n- \n- // do m/r jacobi eigen value computation\n- DenseMatrix dm = (DenseMatrix)m5;\n- dm.jacobiEigenValue(3);\n- \n- // do jacobi egien value over S array\n- int i, j, k, l, m, state;\n- double s, c, t, p, y;\n- double e1, e2;\n- // index array\n- int[] ind = new int[SIZE];\n- boolean[] changed = new boolean[SIZE];\n- \n- // output\n- double[] e = new double[SIZE];\n- double[][] E = new double[SIZE][SIZE];\n- \n- // init e & E; ind & changed\n- for(i=0; i 0) {\n- // find index(k, l) for pivot p\n- m = 0;\n- for(k = 1; k <= SIZE-2; k++) {\n- if(Math.abs(S[m][ind[m]]) < Math.abs(S[k][ind[k]])) {\n- m = k;\n- }\n- }\n- \n- k = m; l = ind[m]; p = S[k][l];\n- \n- // calculate c = cos, s = sin\n- y = (e[l] - e[k]) / 2;\n- t = Math.abs(y) + Math.sqrt(p * p + y * y);\n- s = Math.sqrt(p * p + t * t);\n- c = t / s;\n- s = p / s;\n- t = (p * p) / t;\n- if(y < 0) {\n- s = -s;\n- t = -t;\n- }\n- \n- S[k][l] = 0.0;\n- state = update(e, changed, k, -t, state);\n- state = update(e, changed, l, t, state);\n- \n- for(i = 0; i <= k-1; i++) \n- rotate(S, i, k, i, l, c, s);\n- \n- for(i = l+1; i < SIZE; i++)\n- rotate(S, k, i, l, i, c, s);\n- \n- for(i = k+1; i <= l-1; i++)\n- rotate(S, k, i, i, l, c, s);\n- \n- // rotate eigenvectors\n- for(i = 0; i < SIZE; i++) {\n- e1 = E[k][i];\n- e2 = E[l][i];\n- \n- E[k][i] = c * e1 - s * e2;\n- E[l][i] = s * e1 + c * e2;\n- }\n- \n- ind[k] = maxind(S, k, SIZE);\n- ind[l] = maxind(S, l, SIZE);\n- \n- loops --;\n- }\n- \n- // verify the results\n- assertTrue(dm.verifyEigenValue(e, E));\n- }\n-\n- public void testEnsureForAddition() {\n- try {\n- m1.add(m4);\n- fail(\"Matrix-Addition should be failed while rows and columns aren't same.\");\n- } catch (IOException e) {\n- LOG.info(e.toString());\n- }\n- }\n-\n- public void testEnsureForMultiplication() {\n- try {\n- m1.mult(m4);\n- fail(\"Matrix-Mult should be failed while A.columns!=B.rows.\");\n- } catch (IOException e) {\n- LOG.info(e.toString());\n- }\n- }\n- \n- public void testLoadSave() throws IOException {\n- String path1 = m1.getPath();\n- // save m1 to aliase1\n- m1.save(aliase1);\n- // load matrix m1 using aliase1\n- DenseMatrix loadTest = new DenseMatrix(conf, aliase1, false);\n+ Iterator it2 = m1.getColumn(SIZE).iterator();\n \n- for (int i = 0; i < SIZE; i++) {\n- for (int j = 0; j < SIZE; j++) {\n- assertEquals(m1.get(i, j), loadTest.get(i, j));\n- }\n- }\n-\n- assertEquals(path1, loadTest.getPath());\n- // close loadTest, it just disconnect to the table but didn't delete it.\n- loadTest.close();\n-\n- // try to close m1 & load matrix m1 using aliase1 again.\n- m1.close();\n- DenseMatrix loadTest2 = new DenseMatrix(conf, aliase1, false);\n- assertEquals(path1, loadTest2.getPath());\n- // remove aliase1\n- // because loadTest2 connect the aliase1, so we just remove aliase entry\n- // but didn't delete the table.\n- hamaAdmin.delete(aliase1);\n- assertEquals(true, admin.tableExists(path1));\n- // close loadTest2, because it is the last one who reference table 'path1'\n- // it will do the gc!\n- loadTest2.close();\n- assertEquals(false, admin.tableExists(path1));\n-\n- // if we try to load non-existed matrix using aliase name, it should fail.\n- DenseMatrix loadTest3 = null;\n- try {\n- loadTest3 = new DenseMatrix(conf, aliase1, false);\n- fail(\"Try to load a non-existed matrix should fail!\");\n- } catch (IOException e) {\n-\n- } finally {\n- if (loadTest3 != null)\n- loadTest3.close();\n+ int x = 0;\n+ while (it2.hasNext()) {\n+ assertEquals(entries[x], ((DoubleEntry) it2.next()).getValue());\n+ x++;\n }\n }\n- \n- public void testForceCreate() throws IOException {\n- String path2 = m2.getPath();\n- // save m2 to aliase2\n- m2.save(aliase2);\n- // load matrix m2 using aliase2\n- DenseMatrix loadTest = new DenseMatrix(conf, aliase2, false);\n-\n- for (int i = 0; i < loadTest.getRows(); i++) {\n- for (int j = 0; j < loadTest.getColumns(); j++) {\n- assertEquals(m2.get(i, j), loadTest.get(i, j));\n- }\n- }\n-\n- assertEquals(path2, loadTest.getPath());\n-\n- Matrix test = hamaAdmin.getMatrix(aliase2);\n- assertEquals(test.getType(), \"DenseMatrix\");\n- \n- // force to create matrix loadTest2 using aliasename 'aliase2'\n- DenseMatrix loadTest2 = new DenseMatrix(conf, aliase2, true);\n- String loadPath2 = loadTest2.getPath();\n- assertFalse(path2.equals(loadPath2));\n- assertEquals(loadPath2, hamaAdmin.getPath(aliase2));\n- assertFalse(path2.equals(hamaAdmin.getPath(aliase2)));\n-\n- // try to close m2 & loadTest, it table will be deleted finally\n- m2.close();\n- assertEquals(true, admin.tableExists(path2));\n- loadTest.close();\n- assertEquals(false, admin.tableExists(path2));\n-\n- // remove 'aliase2' & close loadTest2\n- loadTest2.close();\n- assertEquals(true, admin.tableExists(loadPath2));\n- hamaAdmin.delete(aliase2);\n- assertEquals(false, admin.tableExists(loadPath2));\n- }\n \n /**\n * Verifying multiplication result\n@@ -539,34 +252,4 @@ private void verifyMultResult(Matrix m1, Matrix m2, Matrix result)\n }\n }\n }\n- \n- //index of largest off-diagonal element in row k\n- int maxind(double[][] S, int row, int size) {\n- int m = row + 1;\n- for(int i=row + 2; i Math.abs(S[row][m]))\n- m = i;\n- }\n- return m;\n- }\n- \n- int update(double[] e, boolean[] changed, int row, double value, int state) {\n- double y = e[row];\n- e[row] += value;\n- \n- if(changed[row] && y == e[row]) {\n- changed[row] = false;\n- return state - 1;\n- } else if(!changed[row] && y != e[row]) {\n- changed[row] = true;\n- return state + 1;\n- } else\n- return state;\n- }\n- \n- void rotate(double[][] S, int k, int l, int i, int j, double c, double s) {\n- double s1 = S[k][l], s2 = S[i][j];\n- S[k][l] = c * s1 - s * s2;\n- S[i][j] = s * s1 + c * s2;\n- }\n }","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseMatrix.java","sha":"463f6c1a10d2611bb386cdb08ffac4a4cc167fe3","status":"modified"},{"additions":204,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseVector.java","changes":433,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseVector.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":229,"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","new_code":"/**\n * Copyright 2007 The Apache Software Foundation\n *\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n * distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * \"License\"); you may not use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicable law or agreed to in writing, software\n * distributed under the License is distributed on an \"AS IS\" BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\npackage org.apache.hama.matrix;\n\nimport java.io.IOException;\nimport java.io.UnsupportedEncodingException;\nimport java.util.Iterator;\n\nimport org.apache.commons.logging.Log;\nimport org.apache.commons.logging.LogFactory;\nimport org.apache.hadoop.io.Writable;\nimport org.apache.hama.HamaCluster;\nimport org.apache.hama.io.DoubleEntry;\n\npublic class TestDenseVector extends HamaCluster {\n final static Log LOG = LogFactory.getLog(TestDenseVector.class.getName());\n\n private final double cosine = 0.6978227007909176;\n private final double norm1 = 12.0;\n private final double norm2 = 6.782329983125268;\n private final double normInf = 5.0;\n private final double norm2Robust = 6.782329983125269;\n private double[][] values = { { 2, 5, 1, 4 }, { 4, 1, 3, 3 } };\n private DenseMatrix m1;\n private DenseVector v1;\n private DenseVector v2;\n private DenseVector smallSize = new DenseVector();\n\n /**\n * @throws UnsupportedEncodingException\n */\n public TestDenseVector() throws UnsupportedEncodingException {\n super();\n }\n\n public void setUp() throws Exception {\n super.setUp();\n\n m1 = new DenseMatrix(getConf(), 2, 4);\n\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 4; j++)\n m1.set(i, j, values[i][j]);\n\n v1 = m1.getRow(0);\n v2 = m1.getRow(1);\n smallSize.set(0, 0.5);\n }\n\n /**\n * @throws IOException \n */\n public void testDenseVector() throws IOException {\n double cos = v1.dot(v2);\n assertEquals(cos, cosine);\n\n boolean except = false;\n try {\n v1.dot(smallSize);\n } catch (IndexOutOfBoundsException e) {\n except = true;\n }\n \n assertTrue(except);\n subVector();\n \n assertEquals(norm1, v1.norm(Vector.Norm.One));\n assertEquals(norm2, v1.norm(Vector.Norm.Two));\n assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\n assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\n\n getSetTest();\n add();\n scalingTest();\n setTest();\n clear();\n }\n\n /**\n * Test scaling\n */\n public void scalingTest() {\n v2.scale(0.5);\n\n for (int i = 0; i < v2.size(); i++) {\n assertEquals(values[1][i] * 0.5, v2.get(i));\n }\n }\n\n /**\n * Test get/set methods\n * @throws IOException \n */\n public void getSetTest() throws IOException {\n assertEquals(v1.get(0), values[0][0]);\n boolean ex = false;\n try {\n v1.get(5);\n } catch (NullPointerException e) {\n ex = true;\n }\n assertTrue(ex);\n assertEquals(m1.getColumn(0).size(), 2);\n }\n\n /**\n * Test add()\n */\n public void add() {\n v1.add(v2);\n int i = 0;\n Iterator it = v1.iterator();\n while (it.hasNext()) {\n DoubleEntry c = (DoubleEntry) it.next();\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\n i++;\n }\n\n v1.add(0.5, v2);\n int j = 0;\n Iterator itt = v1.iterator();\n while (itt.hasNext()) {\n DoubleEntry c = (DoubleEntry) itt.next();\n assertEquals(c.getValue(), (values[0][j] + values[1][j]) + (0.5 * values[1][j]));\n j++;\n }\n \n double old = v1.get(0);\n v1.add(0, norm1);\n assertEquals(v1.get(0), old + norm1);\n \n boolean except = false;\n try {\n v1.add(smallSize);\n } catch (IndexOutOfBoundsException e) {\n except = true;\n }\n \n assertTrue(except);\n \n except = false;\n try {\n v1.add(0.6, smallSize);\n } catch (IndexOutOfBoundsException e) {\n except = true;\n }\n \n assertTrue(except);\n }\n \n public void setTest() {\n v1.set(v2);\n\n for(int i = 0; i < v1.size(); i ++) {\n assertEquals(v2.get(i), v1.get(i));\n }\n \n boolean except = false;\n try {\n v1.set(0.6, smallSize);\n } catch (IndexOutOfBoundsException e) {\n except = true;\n }\n \n assertTrue(except);\n }\n \n public void subVector() {\n int start = 2;\n Vector subVector = v1.subVector(start, v1.size() - 1);\n Iterator it = subVector.iterator();\n\n int i = start;\n while (it.hasNext()) {\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\n i++;\n }\n }\n \n /**\n * Clear test\n */\n public void clear() {\n ((DenseVector) v1).clear();\n assertEquals(v1.size(), 0);\n }\n}","new_methods":[{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"v2.scale(0.5);\n\n for (int i = 0; i < v2.size(); i++) {\n assertEquals(values[1][i] * 0.5, v2.get(i));","signature":"void scalingTest()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"v1.add(v2);\n int i = 0;\n Iterator it = v1.iterator();\n while (it.hasNext()) {\n DoubleEntry c = (DoubleEntry) it.next();\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\n i++;","signature":"void add()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"v1.set(v2);\n\n for(int i = 0; i < v1.size(); i ++) {\n assertEquals(v2.get(i), v1.get(i));","signature":"void setTest()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"int start = 2;\n Vector subVector = v1.subVector(start, v1.size() - 1);\n Iterator it = subVector.iterator();\n\n int i = start;\n while (it.hasNext()) {\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\n i++;","signature":"void subVector()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"((DenseVector) v1).clear();\n assertEquals(v1.size(), 0);","signature":"void clear()"}],"old_code":"/**\r\n * Copyright 2007 The Apache Software Foundation\r\n *\r\n * Licensed to the Apache Software Foundation (ASF) under one\r\n * or more contributor license agreements. See the NOTICE file\r\n * distributed with this work for additional information\r\n * regarding copyright ownership. The ASF licenses this file\r\n * to you under the Apache License, Version 2.0 (the\r\n * \"License\"); you may not use this file except in compliance\r\n * with the License. You may obtain a copy of the License at\r\n *\r\n * http://www.apache.org/licenses/LICENSE-2.0\r\n *\r\n * Unless required by applicable law or agreed to in writing, software\r\n * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n * See the License for the specific language governing permissions and\r\n * limitations under the License.\r\n */\r\npackage org.apache.hama.matrix;\r\n\r\nimport java.io.IOException;\r\nimport java.util.Iterator;\r\n\r\nimport junit.extensions.TestSetup;\r\nimport junit.framework.Test;\r\nimport junit.framework.TestCase;\r\nimport junit.framework.TestSuite;\r\n\r\nimport org.apache.commons.logging.Log;\r\nimport org.apache.commons.logging.LogFactory;\r\nimport org.apache.hadoop.io.Writable;\r\nimport org.apache.hama.io.DoubleEntry;\r\nimport org.apache.hama.matrix.DenseMatrix;\r\nimport org.apache.hama.matrix.DenseVector;\r\nimport org.apache.hama.matrix.Vector;\r\n\r\npublic class TestDenseVector extends TestCase {\r\n final static Log LOG = LogFactory.getLog(TestDenseVector.class.getName());\r\n \r\n private static final double cosine = 0.6978227007909176;\r\n private static final double norm1 = 12.0;\r\n private static final double norm2 = 6.782329983125268;\r\n private static final double normInf = 5.0;\r\n private static final double norm2Robust = 6.782329983125269;\r\n private static double[][] values = { { 2, 5, 1, 4 }, { 4, 1, 3, 3 } };\r\n private static DenseMatrix m1;\r\n private static DenseVector v1;\r\n private static DenseVector v2;\r\n private static DenseVector smallSize = new DenseVector();\r\n \r\n public static Test suite() {\r\n TestSetup setup = new TestSetup(new TestSuite(TestDenseVector.class)) {\r\n protected void setUp() throws Exception {\r\n HCluster hCluster = new HCluster();\r\n hCluster.setUp();\r\n\r\n m1 = new DenseMatrix(hCluster.getConf(), 2, 4);\r\n\r\n for (int i = 0; i < 2; i++)\r\n for (int j = 0; j < 4; j++)\r\n m1.set(i, j, values[i][j]);\r\n\r\n v1 = m1.getRow(0);\r\n v2 = m1.getRow(1);\r\n smallSize.set(0, 0.5);\r\n }\r\n\r\n protected void tearDown() {\r\n LOG.info(\"tearDown()\");\r\n }\r\n };\r\n return setup;\r\n }\r\n\r\n /**\r\n * Test |a| dot |b|\r\n */\r\n public void testDot() {\r\n double cos = v1.dot(v2);\r\n assertEquals(cos, cosine);\r\n \r\n boolean except = false;\r\n try {\r\n v1.dot(smallSize);\r\n } catch (IndexOutOfBoundsException e) {\r\n except = true;\r\n }\r\n \r\n assertTrue(except);\r\n }\r\n\r\n public void testSubVector() {\r\n int start = 2;\r\n Vector subVector = v1.subVector(start, v1.size() - 1);\r\n Iterator it = subVector.iterator();\r\n\r\n int i = start;\r\n while (it.hasNext()) {\r\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\r\n i++;\r\n }\r\n }\r\n\r\n /**\r\n * Test norm one\r\n */\r\n public void testNom1() {\r\n assertEquals(norm1, v1.norm(Vector.Norm.One));\r\n }\r\n\r\n /**\r\n * Test norm two\r\n */\r\n public void testNom2() {\r\n assertEquals(norm2, v1.norm(Vector.Norm.Two));\r\n }\r\n\r\n /**\r\n * Test infinity norm\r\n */\r\n public void testNormInf() {\r\n assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\r\n }\r\n \r\n /**\r\n * Test infinity norm\r\n */\r\n public void testNorm2Robust() {\r\n assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\r\n }\r\n \r\n /**\r\n * Test scaling\r\n */\r\n public void scalingTest() {\r\n v2.scale(0.5);\r\n\r\n for (int i = 0; i < v2.size(); i++) {\r\n assertEquals(values[1][i] * 0.5, v2.get(i));\r\n }\r\n }\r\n\r\n /**\r\n * Test get/set methods\r\n * @throws IOException \r\n */\r\n public void testGetSet() throws IOException {\r\n assertEquals(v1.get(0), values[0][0]);\r\n boolean ex = false;\r\n try {\r\n v1.get(5);\r\n } catch (NullPointerException e) {\r\n ex = true;\r\n }\r\n assertTrue(ex);\r\n assertEquals(m1.getColumn(0).size(), 2);\r\n }\r\n\r\n /**\r\n * Test add()\r\n */\r\n public void testAdd() {\r\n v1.add(v2);\r\n int i = 0;\r\n Iterator it = v1.iterator();\r\n while (it.hasNext()) {\r\n DoubleEntry c = (DoubleEntry) it.next();\r\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\r\n i++;\r\n }\r\n\r\n v1.add(0.5, v2);\r\n int j = 0;\r\n Iterator itt = v1.iterator();\r\n while (itt.hasNext()) {\r\n DoubleEntry c = (DoubleEntry) itt.next();\r\n assertEquals(c.getValue(), (values[0][j] + values[1][j]) + (0.5 * values[1][j]));\r\n j++;\r\n }\r\n \r\n double old = v1.get(0);\r\n v1.add(0, norm1);\r\n assertEquals(v1.get(0), old + norm1);\r\n \r\n boolean except = false;\r\n try {\r\n v1.add(smallSize);\r\n } catch (IndexOutOfBoundsException e) {\r\n except = true;\r\n }\r\n \r\n assertTrue(except);\r\n \r\n except = false;\r\n try {\r\n v1.add(0.6, smallSize);\r\n } catch (IndexOutOfBoundsException e) {\r\n except = true;\r\n }\r\n \r\n assertTrue(except);\r\n }\r\n \r\n public void testSet() {\r\n v1.set(v2);\r\n \r\n for(int i = 0; i < v1.size(); i ++) {\r\n assertEquals(v2.get(i), v1.get(i));\r\n }\r\n \r\n boolean except = false;\r\n try {\r\n v1.set(0.6, smallSize);\r\n } catch (IndexOutOfBoundsException e) {\r\n except = true;\r\n }\r\n \r\n assertTrue(except);\r\n }\r\n \r\n /**\r\n * Clear test\r\n */\r\n public void testClear() {\r\n ((DenseVector) v1).clear();\r\n assertEquals(v1.size(), 0);\r\n }\r\n}\r","old_methods":[{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"TestSetup setup = new TestSetup(new TestSuite(TestDenseVector.class)) {\r\n protected void setUp() throws Exception {\r\n HCluster hCluster = new HCluster();\r\n hCluster.setUp();\r\n\r\n m1 = new DenseMatrix(hCluster.getConf(), 2, 4);\r\n\r\n for (int i = 0; i < 2; i++)\r\n for (int j = 0; j < 4; j++)\r\n m1.set(i, j, values[i][j]);\r\n\r\n v1 = m1.getRow(0);\r\n v2 = m1.getRow(1);\r\n smallSize.set(0, 0.5);","signature":"Test suite()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"LOG.info(\"tearDown()\");","signature":"void tearDown()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"double cos = v1.dot(v2);\r\n assertEquals(cos, cosine);\r\n \r\n boolean except = false;\r\n try {\r\n v1.dot(smallSize);","signature":"void testDot()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"int start = 2;\r\n Vector subVector = v1.subVector(start, v1.size() - 1);\r\n Iterator it = subVector.iterator();\r\n\r\n int i = start;\r\n while (it.hasNext()) {\r\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\r\n i++;","signature":"void testSubVector()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"assertEquals(norm1, v1.norm(Vector.Norm.One));","signature":"void testNom1()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"assertEquals(norm2, v1.norm(Vector.Norm.Two));","signature":"void testNom2()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"assertEquals(normInf, v1.norm(Vector.Norm.Infinity));","signature":"void testNormInf()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));","signature":"void testNorm2Robust()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"v2.scale(0.5);\r\n\r\n for (int i = 0; i < v2.size(); i++) {\r\n assertEquals(values[1][i] * 0.5, v2.get(i));","signature":"void scalingTest()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"v1.add(v2);\r\n int i = 0;\r\n Iterator it = v1.iterator();\r\n while (it.hasNext()) {\r\n DoubleEntry c = (DoubleEntry) it.next();\r\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\r\n i++;","signature":"void testAdd()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"v1.set(v2);\r\n \r\n for(int i = 0; i < v1.size(); i ++) {\r\n assertEquals(v2.get(i), v1.get(i));","signature":"void testSet()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestDenseVector.java","implementation":"((DenseVector) v1).clear();\r\n assertEquals(v1.size(), 0);","signature":"void testClear()"}],"patch":"@@ -1,229 +1,204 @@\n-/**\r\n- * Copyright 2007 The Apache Software Foundation\r\n- *\r\n- * Licensed to the Apache Software Foundation (ASF) under one\r\n- * or more contributor license agreements. See the NOTICE file\r\n- * distributed with this work for additional information\r\n- * regarding copyright ownership. The ASF licenses this file\r\n- * to you under the Apache License, Version 2.0 (the\r\n- * \"License\"); you may not use this file except in compliance\r\n- * with the License. You may obtain a copy of the License at\r\n- *\r\n- * http://www.apache.org/licenses/LICENSE-2.0\r\n- *\r\n- * Unless required by applicable law or agreed to in writing, software\r\n- * distributed under the License is distributed on an \"AS IS\" BASIS,\r\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r\n- * See the License for the specific language governing permissions and\r\n- * limitations under the License.\r\n- */\r\n-package org.apache.hama.matrix;\r\n-\r\n-import java.io.IOException;\r\n-import java.util.Iterator;\r\n-\r\n-import junit.extensions.TestSetup;\r\n-import junit.framework.Test;\r\n-import junit.framework.TestCase;\r\n-import junit.framework.TestSuite;\r\n-\r\n-import org.apache.commons.logging.Log;\r\n-import org.apache.commons.logging.LogFactory;\r\n-import org.apache.hadoop.io.Writable;\r\n-import org.apache.hama.io.DoubleEntry;\r\n-import org.apache.hama.matrix.DenseMatrix;\r\n-import org.apache.hama.matrix.DenseVector;\r\n-import org.apache.hama.matrix.Vector;\r\n-\r\n-public class TestDenseVector extends TestCase {\r\n- final static Log LOG = LogFactory.getLog(TestDenseVector.class.getName());\r\n- \r\n- private static final double cosine = 0.6978227007909176;\r\n- private static final double norm1 = 12.0;\r\n- private static final double norm2 = 6.782329983125268;\r\n- private static final double normInf = 5.0;\r\n- private static final double norm2Robust = 6.782329983125269;\r\n- private static double[][] values = { { 2, 5, 1, 4 }, { 4, 1, 3, 3 } };\r\n- private static DenseMatrix m1;\r\n- private static DenseVector v1;\r\n- private static DenseVector v2;\r\n- private static DenseVector smallSize = new DenseVector();\r\n- \r\n- public static Test suite() {\r\n- TestSetup setup = new TestSetup(new TestSuite(TestDenseVector.class)) {\r\n- protected void setUp() throws Exception {\r\n- HCluster hCluster = new HCluster();\r\n- hCluster.setUp();\r\n-\r\n- m1 = new DenseMatrix(hCluster.getConf(), 2, 4);\r\n-\r\n- for (int i = 0; i < 2; i++)\r\n- for (int j = 0; j < 4; j++)\r\n- m1.set(i, j, values[i][j]);\r\n-\r\n- v1 = m1.getRow(0);\r\n- v2 = m1.getRow(1);\r\n- smallSize.set(0, 0.5);\r\n- }\r\n-\r\n- protected void tearDown() {\r\n- LOG.info(\"tearDown()\");\r\n- }\r\n- };\r\n- return setup;\r\n- }\r\n-\r\n- /**\r\n- * Test |a| dot |b|\r\n- */\r\n- public void testDot() {\r\n- double cos = v1.dot(v2);\r\n- assertEquals(cos, cosine);\r\n- \r\n- boolean except = false;\r\n- try {\r\n- v1.dot(smallSize);\r\n- } catch (IndexOutOfBoundsException e) {\r\n- except = true;\r\n- }\r\n- \r\n- assertTrue(except);\r\n- }\r\n-\r\n- public void testSubVector() {\r\n- int start = 2;\r\n- Vector subVector = v1.subVector(start, v1.size() - 1);\r\n- Iterator it = subVector.iterator();\r\n-\r\n- int i = start;\r\n- while (it.hasNext()) {\r\n- assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\r\n- i++;\r\n- }\r\n- }\r\n-\r\n- /**\r\n- * Test norm one\r\n- */\r\n- public void testNom1() {\r\n- assertEquals(norm1, v1.norm(Vector.Norm.One));\r\n- }\r\n-\r\n- /**\r\n- * Test norm two\r\n- */\r\n- public void testNom2() {\r\n- assertEquals(norm2, v1.norm(Vector.Norm.Two));\r\n- }\r\n-\r\n- /**\r\n- * Test infinity norm\r\n- */\r\n- public void testNormInf() {\r\n- assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\r\n- }\r\n- \r\n- /**\r\n- * Test infinity norm\r\n- */\r\n- public void testNorm2Robust() {\r\n- assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\r\n- }\r\n- \r\n- /**\r\n- * Test scaling\r\n- */\r\n- public void scalingTest() {\r\n- v2.scale(0.5);\r\n-\r\n- for (int i = 0; i < v2.size(); i++) {\r\n- assertEquals(values[1][i] * 0.5, v2.get(i));\r\n- }\r\n- }\r\n-\r\n- /**\r\n- * Test get/set methods\r\n- * @throws IOException \r\n- */\r\n- public void testGetSet() throws IOException {\r\n- assertEquals(v1.get(0), values[0][0]);\r\n- boolean ex = false;\r\n- try {\r\n- v1.get(5);\r\n- } catch (NullPointerException e) {\r\n- ex = true;\r\n- }\r\n- assertTrue(ex);\r\n- assertEquals(m1.getColumn(0).size(), 2);\r\n- }\r\n-\r\n- /**\r\n- * Test add()\r\n- */\r\n- public void testAdd() {\r\n- v1.add(v2);\r\n- int i = 0;\r\n- Iterator it = v1.iterator();\r\n- while (it.hasNext()) {\r\n- DoubleEntry c = (DoubleEntry) it.next();\r\n- assertEquals(c.getValue(), values[0][i] + values[1][i]);\r\n- i++;\r\n- }\r\n-\r\n- v1.add(0.5, v2);\r\n- int j = 0;\r\n- Iterator itt = v1.iterator();\r\n- while (itt.hasNext()) {\r\n- DoubleEntry c = (DoubleEntry) itt.next();\r\n- assertEquals(c.getValue(), (values[0][j] + values[1][j]) + (0.5 * values[1][j]));\r\n- j++;\r\n- }\r\n- \r\n- double old = v1.get(0);\r\n- v1.add(0, norm1);\r\n- assertEquals(v1.get(0), old + norm1);\r\n- \r\n- boolean except = false;\r\n- try {\r\n- v1.add(smallSize);\r\n- } catch (IndexOutOfBoundsException e) {\r\n- except = true;\r\n- }\r\n- \r\n- assertTrue(except);\r\n- \r\n- except = false;\r\n- try {\r\n- v1.add(0.6, smallSize);\r\n- } catch (IndexOutOfBoundsException e) {\r\n- except = true;\r\n- }\r\n- \r\n- assertTrue(except);\r\n- }\r\n- \r\n- public void testSet() {\r\n- v1.set(v2);\r\n- \r\n- for(int i = 0; i < v1.size(); i ++) {\r\n- assertEquals(v2.get(i), v1.get(i));\r\n- }\r\n- \r\n- boolean except = false;\r\n- try {\r\n- v1.set(0.6, smallSize);\r\n- } catch (IndexOutOfBoundsException e) {\r\n- except = true;\r\n- }\r\n- \r\n- assertTrue(except);\r\n- }\r\n- \r\n- /**\r\n- * Clear test\r\n- */\r\n- public void testClear() {\r\n- ((DenseVector) v1).clear();\r\n- assertEquals(v1.size(), 0);\r\n- }\r\n-}\r\n+/**\n+ * Copyright 2007 The Apache Software Foundation\n+ *\n+ * Licensed to the Apache Software Foundation (ASF) under one\n+ * or more contributor license agreements. See the NOTICE file\n+ * distributed with this work for additional information\n+ * regarding copyright ownership. The ASF licenses this file\n+ * to you under the Apache License, Version 2.0 (the\n+ * \"License\"); you may not use this file except in compliance\n+ * with the License. You may obtain a copy of the License at\n+ *\n+ * http://www.apache.org/licenses/LICENSE-2.0\n+ *\n+ * Unless required by applicable law or agreed to in writing, software\n+ * distributed under the License is distributed on an \"AS IS\" BASIS,\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n+ * See the License for the specific language governing permissions and\n+ * limitations under the License.\n+ */\n+package org.apache.hama.matrix;\n+\n+import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n+import java.util.Iterator;\n+\n+import org.apache.commons.logging.Log;\n+import org.apache.commons.logging.LogFactory;\n+import org.apache.hadoop.io.Writable;\n+import org.apache.hama.HamaCluster;\n+import org.apache.hama.io.DoubleEntry;\n+\n+public class TestDenseVector extends HamaCluster {\n+ final static Log LOG = LogFactory.getLog(TestDenseVector.class.getName());\n+\n+ private final double cosine = 0.6978227007909176;\n+ private final double norm1 = 12.0;\n+ private final double norm2 = 6.782329983125268;\n+ private final double normInf = 5.0;\n+ private final double norm2Robust = 6.782329983125269;\n+ private double[][] values = { { 2, 5, 1, 4 }, { 4, 1, 3, 3 } };\n+ private DenseMatrix m1;\n+ private DenseVector v1;\n+ private DenseVector v2;\n+ private DenseVector smallSize = new DenseVector();\n+\n+ /**\n+ * @throws UnsupportedEncodingException\n+ */\n+ public TestDenseVector() throws UnsupportedEncodingException {\n+ super();\n+ }\n+\n+ public void setUp() throws Exception {\n+ super.setUp();\n+\n+ m1 = new DenseMatrix(getConf(), 2, 4);\n+\n+ for (int i = 0; i < 2; i++)\n+ for (int j = 0; j < 4; j++)\n+ m1.set(i, j, values[i][j]);\n+\n+ v1 = m1.getRow(0);\n+ v2 = m1.getRow(1);\n+ smallSize.set(0, 0.5);\n+ }\n+\n+ /**\n+ * @throws IOException \n+ */\n+ public void testDenseVector() throws IOException {\n+ double cos = v1.dot(v2);\n+ assertEquals(cos, cosine);\n+\n+ boolean except = false;\n+ try {\n+ v1.dot(smallSize);\n+ } catch (IndexOutOfBoundsException e) {\n+ except = true;\n+ }\n+ \n+ assertTrue(except);\n+ subVector();\n+ \n+ assertEquals(norm1, v1.norm(Vector.Norm.One));\n+ assertEquals(norm2, v1.norm(Vector.Norm.Two));\n+ assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\n+ assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\n+\n+ getSetTest();\n+ add();\n+ scalingTest();\n+ setTest();\n+ clear();\n+ }\n+\n+ /**\n+ * Test scaling\n+ */\n+ public void scalingTest() {\n+ v2.scale(0.5);\n+\n+ for (int i = 0; i < v2.size(); i++) {\n+ assertEquals(values[1][i] * 0.5, v2.get(i));\n+ }\n+ }\n+\n+ /**\n+ * Test get/set methods\n+ * @throws IOException \n+ */\n+ public void getSetTest() throws IOException {\n+ assertEquals(v1.get(0), values[0][0]);\n+ boolean ex = false;\n+ try {\n+ v1.get(5);\n+ } catch (NullPointerException e) {\n+ ex = true;\n+ }\n+ assertTrue(ex);\n+ assertEquals(m1.getColumn(0).size(), 2);\n+ }\n+\n+ /**\n+ * Test add()\n+ */\n+ public void add() {\n+ v1.add(v2);\n+ int i = 0;\n+ Iterator it = v1.iterator();\n+ while (it.hasNext()) {\n+ DoubleEntry c = (DoubleEntry) it.next();\n+ assertEquals(c.getValue(), values[0][i] + values[1][i]);\n+ i++;\n+ }\n+\n+ v1.add(0.5, v2);\n+ int j = 0;\n+ Iterator itt = v1.iterator();\n+ while (itt.hasNext()) {\n+ DoubleEntry c = (DoubleEntry) itt.next();\n+ assertEquals(c.getValue(), (values[0][j] + values[1][j]) + (0.5 * values[1][j]));\n+ j++;\n+ }\n+ \n+ double old = v1.get(0);\n+ v1.add(0, norm1);\n+ assertEquals(v1.get(0), old + norm1);\n+ \n+ boolean except = false;\n+ try {\n+ v1.add(smallSize);\n+ } catch (IndexOutOfBoundsException e) {\n+ except = true;\n+ }\n+ \n+ assertTrue(except);\n+ \n+ except = false;\n+ try {\n+ v1.add(0.6, smallSize);\n+ } catch (IndexOutOfBoundsException e) {\n+ except = true;\n+ }\n+ \n+ assertTrue(except);\n+ }\n+ \n+ public void setTest() {\n+ v1.set(v2);\n+\n+ for(int i = 0; i < v1.size(); i ++) {\n+ assertEquals(v2.get(i), v1.get(i));\n+ }\n+ \n+ boolean except = false;\n+ try {\n+ v1.set(0.6, smallSize);\n+ } catch (IndexOutOfBoundsException e) {\n+ except = true;\n+ }\n+ \n+ assertTrue(except);\n+ }\n+ \n+ public void subVector() {\n+ int start = 2;\n+ Vector subVector = v1.subVector(start, v1.size() - 1);\n+ Iterator it = subVector.iterator();\n+\n+ int i = start;\n+ while (it.hasNext()) {\n+ assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\n+ i++;\n+ }\n+ }\n+ \n+ /**\n+ * Clear test\n+ */\n+ public void clear() {\n+ ((DenseVector) v1).clear();\n+ assertEquals(v1.size(), 0);\n+ }\n+}","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseVector.java","sha":"5abfb33047adfd7dbd1a8699cd5e5f261bf37fea","status":"modified"},{"additions":25,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestMatrixVectorMult.java","changes":66,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestMatrixVectorMult.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":41,"filename":"src/test/org/apache/hama/matrix/TestMatrixVectorMult.java","new_code":"import java.io.UnsupportedEncodingException;\nimport org.apache.hama.HamaCluster;\npublic class TestMatrixVectorMult extends HamaCluster {\n private Matrix m1, m2;\n private HamaConfiguration conf;\n private double[][] result = { { 5 }, { 11 } };\n /**\n * @throws UnsupportedEncodingException\n */\n public TestMatrixVectorMult() throws UnsupportedEncodingException {\n super();\n }\n public void setUp() throws Exception {\n super.setUp();\n conf = getConf();\n m1 = new DenseMatrix(conf, \"A\", true);\n m1.setDimension(2, 2);\n m1.set(0, 0, 1);\n m1.set(0, 1, 2);\n m1.set(1, 0, 3);\n m1.set(1, 1, 4);\n m2 = new DenseMatrix(conf, \"B\", true);\n m2.setDimension(2, 1);\n m2.set(0, 0, 1);\n m2.set(1, 0, 2);","new_methods":[],"old_code":"import junit.extensions.TestSetup;\nimport junit.framework.Test;\nimport junit.framework.TestCase;\nimport junit.framework.TestSuite;\n\npublic class TestMatrixVectorMult extends TestCase {\n private static Matrix m1;\n private static Matrix m2;\n private static HamaConfiguration conf;\n private static double[][] result = { { 5 }, { 11 } };\n\n public static Test suite() {\n TestSetup setup = new TestSetup(new TestSuite(TestMatrixVectorMult.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n conf = hCluster.getConf();\n m1 = new DenseMatrix(conf, \"A\", true);\n m1.setDimension(2, 2);\n m1.set(0, 0, 1);\n m1.set(0, 1, 2);\n m1.set(1, 0, 3);\n m1.set(1, 1, 4);\n m2 = new DenseMatrix(conf, \"B\", true);\n m2.setDimension(2, 1);\n m2.set(0, 0, 1);\n m2.set(1, 0, 2);\n }\n protected void tearDown() {\n try {\n closeTest();\n } catch (IOException e) {\n e.printStackTrace();\n }\n }\n };\n return setup;\n }\n public static void closeTest() throws IOException {\n m1.close();\n m2.close();","old_methods":[{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestMatrixVectorMult.java","implementation":"TestSetup setup = new TestSetup(new TestSuite(TestMatrixVectorMult.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n conf = hCluster.getConf();\n m1 = new DenseMatrix(conf, \"A\", true);\n m1.setDimension(2, 2);\n m1.set(0, 0, 1);\n m1.set(0, 1, 2);\n m1.set(1, 0, 3);\n m1.set(1, 1, 4);\n m2 = new DenseMatrix(conf, \"B\", true);\n m2.setDimension(2, 1);\n m2.set(0, 0, 1);\n m2.set(1, 0, 2);","signature":"Test suite()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestMatrixVectorMult.java","implementation":"try {\n closeTest();","signature":"void tearDown()"}],"patch":"@@ -20,56 +20,40 @@\n package org.apache.hama.matrix;\n \n import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n \n-import junit.extensions.TestSetup;\n-import junit.framework.Test;\n-import junit.framework.TestCase;\n-import junit.framework.TestSuite;\n-\n+import org.apache.hama.HamaCluster;\n import org.apache.hama.HamaConfiguration;\n import org.apache.log4j.Logger;\n \n-public class TestMatrixVectorMult extends TestCase {\n+public class TestMatrixVectorMult extends HamaCluster {\n static final Logger LOG = Logger.getLogger(TestMatrixVectorMult.class);\n- private static Matrix m1;\n- private static Matrix m2;\n- private static HamaConfiguration conf;\n- private static double[][] result = { { 5 }, { 11 } };\n-\n- public static Test suite() {\n- TestSetup setup = new TestSetup(new TestSuite(TestMatrixVectorMult.class)) {\n- protected void setUp() throws Exception {\n- HCluster hCluster = new HCluster();\n- hCluster.setUp();\n+ private Matrix m1, m2;\n+ private HamaConfiguration conf;\n+ private double[][] result = { { 5 }, { 11 } };\n \n- conf = hCluster.getConf();\n+ /**\n+ * @throws UnsupportedEncodingException\n+ */\n+ public TestMatrixVectorMult() throws UnsupportedEncodingException {\n+ super();\n+ }\n \n- m1 = new DenseMatrix(conf, \"A\", true);\n- m1.setDimension(2, 2);\n- m1.set(0, 0, 1);\n- m1.set(0, 1, 2);\n- m1.set(1, 0, 3);\n- m1.set(1, 1, 4);\n- m2 = new DenseMatrix(conf, \"B\", true);\n- m2.setDimension(2, 1);\n- m2.set(0, 0, 1);\n- m2.set(1, 0, 2);\n- }\n+ public void setUp() throws Exception {\n+ super.setUp();\n \n- protected void tearDown() {\n- try {\n- closeTest();\n- } catch (IOException e) {\n- e.printStackTrace();\n- }\n- }\n- };\n- return setup;\n- }\n+ conf = getConf();\n \n- public static void closeTest() throws IOException {\n- m1.close();\n- m2.close();\n+ m1 = new DenseMatrix(conf, \"A\", true);\n+ m1.setDimension(2, 2);\n+ m1.set(0, 0, 1);\n+ m1.set(0, 1, 2);\n+ m1.set(1, 0, 3);\n+ m1.set(1, 1, 4);\n+ m2 = new DenseMatrix(conf, \"B\", true);\n+ m2.setDimension(2, 1);\n+ m2.set(0, 0, 1);\n+ m2.set(1, 0, 2);\n }\n \n public void testMatVectorMult() throws IOException {","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestMatrixVectorMult.java","sha":"e547dfc18dd947678d685721bd988a41037d017f","status":"modified"},{"additions":43,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSingularValueDecomposition.java","changes":88,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSingularValueDecomposition.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":45,"filename":"src/test/org/apache/hama/matrix/TestSingularValueDecomposition.java","new_code":"import java.io.UnsupportedEncodingException;\nimport org.apache.hadoop.hbase.client.Get;\nimport org.apache.hama.HamaCluster;\npublic class TestSingularValueDecomposition extends HamaCluster {\n static final Logger LOG = Logger\n .getLogger(TestSingularValueDecomposition.class);\n private DenseMatrix m1;\n private HamaConfiguration conf;\n /**\n * @throws UnsupportedEncodingException\n */\n public TestSingularValueDecomposition() throws UnsupportedEncodingException {\n super();\n }\n public void setUp() throws Exception {\n super.setUp();\n conf = getConf();\n m1 = new DenseMatrix(conf, 2, 2);\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 2; j++)\n m1.set(i, j, matrixA[i][j]);\n // Let's assume the A = [4 0; 3-5]\n private double[][] matrixA = { { 4, 0 }, { 3, -5 } };\n // A'A = [25 -15; -15 25]\n private double[][] values = { { 25, -15 }, { -15, 25 } };\n // Then, eigenvalues of A'A are 10, 40\n private double[] eigenvalues = { 10, 40 };\n // And, Singular values are 3.1623, 6.3246\n private double[] singularvalues = { 3.1622776601683795, 6.324555320336759 };\n\n\n for (int i = 0; i < m1.getRows(); i++) {\n for (int j = 0; j < m1.getRows(); j++) {\n\n for (int x = 0; x < 2; x++) {\n Get get = new Get(BytesUtil.getRowIndex(x));\n get.addColumn(Bytes.toBytes(JacobiEigenValue.EIVAL));\n double eigenvalue = BytesUtil.bytesToDouble(table.get(get).getCellValue()\n .getValue());\n\n // TODO: need to compute the inverse of S, S(-1)\n // TODO: need to find out the V(T)\n","new_methods":[],"old_code":"import junit.extensions.TestSetup;\nimport junit.framework.Test;\nimport junit.framework.TestCase;\nimport junit.framework.TestSuite;\n\npublic class TestSingularValueDecomposition extends TestCase {\n static final Logger LOG = Logger.getLogger(TestSingularValueDecomposition.class);\n private static DenseMatrix m1;\n private static HamaConfiguration conf;\n // Let's assume the A = [4 0; 3-5]\n private static double[][] matrixA = {{4, 0}, {3, -5}};\n // A'A = [25 -15; -15 25]\n private static double[][] values = { { 25, -15 }, { -15, 25 } };\n // Then, eigenvalues of A'A are 10, 40 \n private static double[] eigenvalues = { 10, 40};\n // And, Singular values are 3.1623, 6.3246\n private static double[] singularvalues = { 3.1622776601683795, 6.324555320336759 };\n \n public static Test suite() {\n TestSetup setup = new TestSetup(new TestSuite(TestSingularValueDecomposition.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n conf = hCluster.getConf();\n m1 = new DenseMatrix(conf, 2, 2);\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 2; j++)\n m1.set(i, j, matrixA[i][j]);\n }\n protected void tearDown() {\n // do nothing\n }\n };\n return setup;\n \n for(int i = 0; i < m1.getRows(); i++) {\n for(int j = 0; j < m1.getRows(); j++) {\n \n for(int x=0; x<2; x++) {\n double eigenvalue = BytesUtil.bytesToDouble(table.get(BytesUtil.getRowIndex(x), \n Bytes.toBytes(JacobiEigenValue.EIVAL)).getValue());\n \n //TODO: need to compute the inverse of S, S(-1)\n //TODO: need to find out the V(T)\n ","old_methods":[{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestSingularValueDecomposition.java","implementation":"TestSetup setup = new TestSetup(new TestSuite(TestSingularValueDecomposition.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n conf = hCluster.getConf();\n m1 = new DenseMatrix(conf, 2, 2);\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 2; j++)\n m1.set(i, j, matrixA[i][j]);","signature":"Test suite()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestSingularValueDecomposition.java","implementation":"// do nothing","signature":"void tearDown()"}],"patch":"@@ -20,77 +20,75 @@\n package org.apache.hama.matrix;\n \n import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n \n-import junit.extensions.TestSetup;\n-import junit.framework.Test;\n-import junit.framework.TestCase;\n-import junit.framework.TestSuite;\n-\n+import org.apache.hadoop.hbase.client.Get;\n import org.apache.hadoop.hbase.client.HTable;\n import org.apache.hadoop.hbase.util.Bytes;\n+import org.apache.hama.HamaCluster;\n import org.apache.hama.HamaConfiguration;\n import org.apache.hama.matrix.algebra.JacobiEigenValue;\n import org.apache.hama.util.BytesUtil;\n import org.apache.log4j.Logger;\n \n-public class TestSingularValueDecomposition extends TestCase {\n- static final Logger LOG = Logger.getLogger(TestSingularValueDecomposition.class);\n- private static DenseMatrix m1;\n- private static HamaConfiguration conf;\n+public class TestSingularValueDecomposition extends HamaCluster {\n+ static final Logger LOG = Logger\n+ .getLogger(TestSingularValueDecomposition.class);\n+ private DenseMatrix m1;\n+ private HamaConfiguration conf;\n \n- // Let's assume the A = [4 0; 3-5]\n- private static double[][] matrixA = {{4, 0}, {3, -5}};\n- // A'A = [25 -15; -15 25]\n- private static double[][] values = { { 25, -15 }, { -15, 25 } };\n- // Then, eigenvalues of A'A are 10, 40 \n- private static double[] eigenvalues = { 10, 40};\n- // And, Singular values are 3.1623, 6.3246\n- private static double[] singularvalues = { 3.1622776601683795, 6.324555320336759 };\n- \n- public static Test suite() {\n- TestSetup setup = new TestSetup(new TestSuite(TestSingularValueDecomposition.class)) {\n- protected void setUp() throws Exception {\n- HCluster hCluster = new HCluster();\n- hCluster.setUp();\n+ /**\n+ * @throws UnsupportedEncodingException\n+ */\n+ public TestSingularValueDecomposition() throws UnsupportedEncodingException {\n+ super();\n+ }\n \n- conf = hCluster.getConf();\n- m1 = new DenseMatrix(conf, 2, 2);\n- for (int i = 0; i < 2; i++)\n- for (int j = 0; j < 2; j++)\n- m1.set(i, j, matrixA[i][j]);\n- }\n+ public void setUp() throws Exception {\n+ super.setUp();\n \n- protected void tearDown() {\n- // do nothing\n- }\n- };\n- return setup;\n+ conf = getConf();\n+ m1 = new DenseMatrix(conf, 2, 2);\n+ for (int i = 0; i < 2; i++)\n+ for (int j = 0; j < 2; j++)\n+ m1.set(i, j, matrixA[i][j]);\n }\n \n+ // Let's assume the A = [4 0; 3-5]\n+ private double[][] matrixA = { { 4, 0 }, { 3, -5 } };\n+ // A'A = [25 -15; -15 25]\n+ private double[][] values = { { 25, -15 }, { -15, 25 } };\n+ // Then, eigenvalues of A'A are 10, 40\n+ private double[] eigenvalues = { 10, 40 };\n+ // And, Singular values are 3.1623, 6.3246\n+ private double[] singularvalues = { 3.1622776601683795, 6.324555320336759 };\n+\n public void testEigenSingularValues() throws IOException {\n Matrix aT = m1.transpose();\n DenseMatrix aTa = (DenseMatrix) aT.mult(m1);\n- \n- for(int i = 0; i < m1.getRows(); i++) {\n- for(int j = 0; j < m1.getRows(); j++) {\n+\n+ for (int i = 0; i < m1.getRows(); i++) {\n+ for (int j = 0; j < m1.getRows(); j++) {\n assertEquals(aTa.get(i, j), values[i][j]);\n }\n }\n- \n+\n // Find the eigen/singular values and vectors of A'A\n aTa.jacobiEigenValue(1);\n HTable table = aTa.getHTable();\n \n- for(int x=0; x<2; x++) {\n- double eigenvalue = BytesUtil.bytesToDouble(table.get(BytesUtil.getRowIndex(x), \n- Bytes.toBytes(JacobiEigenValue.EIVAL)).getValue());\n+ for (int x = 0; x < 2; x++) {\n+ Get get = new Get(BytesUtil.getRowIndex(x));\n+ get.addColumn(Bytes.toBytes(JacobiEigenValue.EIVAL));\n+ double eigenvalue = BytesUtil.bytesToDouble(table.get(get).getCellValue()\n+ .getValue());\n assertTrue(Math.abs(eigenvalues[x] - eigenvalue) < .0000001);\n assertTrue(Math.abs(Math.pow(eigenvalue, 0.5) - singularvalues[x]) < .0000001);\n }\n- \n- //TODO: need to compute the inverse of S, S(-1)\n- //TODO: need to find out the V(T)\n- \n+\n+ // TODO: need to compute the inverse of S, S(-1)\n+ // TODO: need to find out the V(T)\n+\n // Therefore, U= AVS'1=[-0.8944 -0.4472; 0.4472 -0.8944]\n // A = USV'=[4 0; 3 -5]\n }","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSingularValueDecomposition.java","sha":"2f5732ddd544ca667283c33d3248d0e164e4b315","status":"modified"},{"additions":23,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseMatrix.java","changes":103,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseMatrix.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":80,"filename":"src/test/org/apache/hama/matrix/TestSparseMatrix.java","new_code":"import java.io.UnsupportedEncodingException;\nimport org.apache.hama.HamaCluster;\npublic class TestSparseMatrix extends HamaCluster {\n private int SIZE = 10;\n private SparseMatrix m1;\n private SparseMatrix m2;\n /**\n * @throws UnsupportedEncodingException\n */\n public TestSparseMatrix() throws UnsupportedEncodingException {\n super();\n public void setUp() throws Exception {\n super.setUp();\n m1 = SparseMatrix.random(getConf(), SIZE, SIZE);\n m2 = SparseMatrix.random(getConf(), SIZE, SIZE);\n public void testMult() throws IOException {\n assertTrue(m1.getRows() > 0);\n sparsity();\n \n SparseMatrix result = m1.mult(m2);\n verifyMultResult(m1, m2, result);\n \n public void sparsity() throws IOException {","new_methods":[],"old_code":"import junit.extensions.TestSetup;\nimport junit.framework.Test;\nimport junit.framework.TestCase;\nimport junit.framework.TestSuite;\n\nimport org.apache.hama.matrix.Matrix.Norm;\npublic class TestSparseMatrix extends TestCase {\n private static int SIZE = 10;\n private static SparseMatrix m1;\n private static SparseMatrix m2;\n\n public static Test suite() {\n TestSetup setup = new TestSetup(new TestSuite(TestSparseMatrix.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n\n m1 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m2 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n }\n protected void tearDown() {\n try {\n closeTest();\n } catch (IOException e) {\n e.printStackTrace();\n }\n }\n };\n return setup;\n public static void closeTest() throws IOException {\n m1.close();\n m2.close();\n public void testTranspose() throws IOException {\n SparseMatrix trans = (SparseMatrix) m1.transpose();\n for (int i = 0; i < trans.getRows(); i++) {\n for (int j = 0; j < trans.getColumns(); j++) {\n assertEquals(trans.get(i, j), m1.get(j, i));\n }\n }\n\n public void testSparsity() throws IOException {\n /**\n * Test matrices multiplication\n * \n * @throws IOException\n */\n public void testMatrixMult() throws IOException {\n SparseMatrix result = m1.mult(m2);\n verifyMultResult(m1, m2, result);\n }\n\n public void testNorm1() throws IOException {\n double gap = 0.000001;\n \n double norm1 = m1.norm(Norm.One);\n double verify_norm1 = MatrixTestCommon.verifyNorm1(m1);\n gap = norm1 - verify_norm1;\n LOG.info(\"Norm One : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n \n double normInfinity = m1.norm(Norm.Infinity);\n double verify_normInf = MatrixTestCommon.verifyNormInfinity(m1);\n gap = normInfinity - verify_normInf;\n LOG.info(\"Norm Infinity : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n \n double normMaxValue = m1.norm(Norm.Maxvalue);\n double verify_normMV = MatrixTestCommon.verifyNormMaxValue(m1);\n gap = normMaxValue - verify_normMV;\n LOG.info(\"Norm MaxValue : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n \n double normFrobenius = m1.norm(Norm.Frobenius);\n double verify_normFrobenius = MatrixTestCommon.verifyNormFrobenius(m1);\n gap = normFrobenius - verify_normFrobenius;\n LOG.info(\"Norm Frobenius : gap \" + gap);\n assertTrue(gap < 0.000001 && gap > -0.000001);\n }\n\n ","old_methods":[{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestSparseMatrix.java","implementation":"TestSetup setup = new TestSetup(new TestSuite(TestSparseMatrix.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n\n m1 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n m2 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);","signature":"Test suite()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestSparseMatrix.java","implementation":"try {\n closeTest();","signature":"void tearDown()"}],"patch":"@@ -20,57 +20,39 @@\n package org.apache.hama.matrix;\n \n import java.io.IOException;\n+import java.io.UnsupportedEncodingException;\n \n-import junit.extensions.TestSetup;\n-import junit.framework.Test;\n-import junit.framework.TestCase;\n-import junit.framework.TestSuite;\n-\n-import org.apache.hama.matrix.Matrix.Norm;\n+import org.apache.hama.HamaCluster;\n import org.apache.log4j.Logger;\n \n-public class TestSparseMatrix extends TestCase {\n+public class TestSparseMatrix extends HamaCluster {\n static final Logger LOG = Logger.getLogger(TestSparseMatrix.class);\n- private static int SIZE = 10;\n- private static SparseMatrix m1;\n- private static SparseMatrix m2;\n-\n- public static Test suite() {\n- TestSetup setup = new TestSetup(new TestSuite(TestSparseMatrix.class)) {\n- protected void setUp() throws Exception {\n- HCluster hCluster = new HCluster();\n- hCluster.setUp();\n-\n- m1 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n- m2 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\n- }\n+ private int SIZE = 10;\n+ private SparseMatrix m1;\n+ private SparseMatrix m2;\n \n- protected void tearDown() {\n- try {\n- closeTest();\n- } catch (IOException e) {\n- e.printStackTrace();\n- }\n- }\n- };\n- return setup;\n+ /**\n+ * @throws UnsupportedEncodingException\n+ */\n+ public TestSparseMatrix() throws UnsupportedEncodingException {\n+ super();\n }\n \n- public static void closeTest() throws IOException {\n- m1.close();\n- m2.close();\n+ public void setUp() throws Exception {\n+ super.setUp();\n+ m1 = SparseMatrix.random(getConf(), SIZE, SIZE);\n+ m2 = SparseMatrix.random(getConf(), SIZE, SIZE);\n }\n \n- public void testTranspose() throws IOException {\n- SparseMatrix trans = (SparseMatrix) m1.transpose();\n- for (int i = 0; i < trans.getRows(); i++) {\n- for (int j = 0; j < trans.getColumns(); j++) {\n- assertEquals(trans.get(i, j), m1.get(j, i));\n- }\n- }\n+ public void testMult() throws IOException {\n+ assertTrue(m1.getRows() > 0);\n+ sparsity();\n+ \n+ SparseMatrix result = m1.mult(m2);\n+ verifyMultResult(m1, m2, result);\n }\n-\n- public void testSparsity() throws IOException {\n+ \n+ public void sparsity() throws IOException {\n boolean appeared = false;\n for (int i = 0; i < m1.getRows(); i++) {\n for (int j = 0; j < m1.getColumns(); j++) {\n@@ -82,44 +64,6 @@ public void testSparsity() throws IOException {\n assertTrue(appeared);\n }\n \n- /**\n- * Test matrices multiplication\n- * \n- * @throws IOException\n- */\n- public void testMatrixMult() throws IOException {\n- SparseMatrix result = m1.mult(m2);\n- verifyMultResult(m1, m2, result);\n- }\n-\n- public void testNorm1() throws IOException {\n- double gap = 0.000001;\n- \n- double norm1 = m1.norm(Norm.One);\n- double verify_norm1 = MatrixTestCommon.verifyNorm1(m1);\n- gap = norm1 - verify_norm1;\n- LOG.info(\"Norm One : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n- \n- double normInfinity = m1.norm(Norm.Infinity);\n- double verify_normInf = MatrixTestCommon.verifyNormInfinity(m1);\n- gap = normInfinity - verify_normInf;\n- LOG.info(\"Norm Infinity : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n- \n- double normMaxValue = m1.norm(Norm.Maxvalue);\n- double verify_normMV = MatrixTestCommon.verifyNormMaxValue(m1);\n- gap = normMaxValue - verify_normMV;\n- LOG.info(\"Norm MaxValue : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n- \n- double normFrobenius = m1.norm(Norm.Frobenius);\n- double verify_normFrobenius = MatrixTestCommon.verifyNormFrobenius(m1);\n- gap = normFrobenius - verify_normFrobenius;\n- LOG.info(\"Norm Frobenius : gap \" + gap);\n- assertTrue(gap < 0.000001 && gap > -0.000001);\n- }\n-\n /**\n * Verifying multiplication result\n * \n@@ -147,5 +91,4 @@ private void verifyMultResult(SparseMatrix m1, SparseMatrix m2,\n }\n }\n }\n- \n }","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseMatrix.java","sha":"f7d19b275967c37c12bdf3dbeb363b9feb41406c","status":"modified"},{"additions":36,"blob_url":"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseVector.java","changes":73,"contents_url":"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseVector.java?ref=42584cd5328fc55a499d318dda6fefff6459242c","deletions":37,"filename":"src/test/org/apache/hama/matrix/TestSparseVector.java","new_code":"import java.io.UnsupportedEncodingException;\nimport org.apache.hadoop.hbase.client.Get;\nimport org.apache.hadoop.hbase.client.Result;\nimport org.apache.hama.HamaCluster;\npublic class TestSparseVector extends HamaCluster {\n private SparseMatrix m1;\n private SparseVector v1;\n private SparseVector v2;\n private double[][] values = { { 2, 0, 0, 4 }, { 0, 0, 3, 3 } };\n /**\n * @throws UnsupportedEncodingException\n */\n public TestSparseVector() throws UnsupportedEncodingException {\n super();\n }\n public void setUp() throws Exception {\n super.setUp();\n m1 = new SparseMatrix(getConf(), 2, 4);\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 4; j++)\n m1.set(i, j, values[i][j]);\n v1 = m1.getRow(0);\n v2 = m1.getRow(1);\n Get get = new Get(BytesUtil.getRowIndex(0));\n get.addColumn(BytesUtil.getColumnIndex(1));\n Result r = table.get(get);\n assertTrue(r.getCellValue() == null);\n \n addTest();\n\n public void addTest() {\n\n for (int i = 0; i < values[0].length; i++) {\n for (int i = 0; i < values[0].length; i++) {\n assertEquals(v1.get(i), (values[0][i] + values[1][i])\n + (0.5 * values[1][i]));","new_methods":[],"old_code":"\nimport junit.extensions.TestSetup;\nimport junit.framework.Test;\nimport junit.framework.TestCase;\nimport junit.framework.TestSuite;\nimport org.apache.hadoop.hbase.io.Cell;\npublic class TestSparseVector extends TestCase {\n private static SparseMatrix m1;\n private static SparseVector v1;\n private static SparseVector v2;\n private static double[][] values = { { 2, 0, 0, 4 }, { 0, 0, 3, 3 } };\n\n public static Test suite() {\n TestSetup setup = new TestSetup(new TestSuite(TestSparseVector.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n m1 = new SparseMatrix(hCluster.getConf(), 2, 4);\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 4; j++)\n m1.set(i, j, values[i][j]);\n v1 = m1.getRow(0);\n v2 = m1.getRow(1);\n }\n protected void tearDown() {\n LOG.info(\"tearDown()\");\n }\n };\n return setup;\n Cell c = table.get(BytesUtil.getRowIndex(0), BytesUtil.getColumnIndex(1));\n assertTrue(c == null);\n \n public void testAdd() {\n \n for(int i = 0; i < values[0].length; i++) {\n for(int i = 0; i < values[0].length; i++) {\n assertEquals(v1.get(i), (values[0][i] + values[1][i]) + (0.5 * values[1][i]));","old_methods":[{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestSparseVector.java","implementation":"TestSetup setup = new TestSetup(new TestSuite(TestSparseVector.class)) {\n protected void setUp() throws Exception {\n HCluster hCluster = new HCluster();\n hCluster.setUp();\n m1 = new SparseMatrix(hCluster.getConf(), 2, 4);\n for (int i = 0; i < 2; i++)\n for (int j = 0; j < 4; j++)\n m1.set(i, j, values[i][j]);\n v1 = m1.getRow(0);\n v2 = m1.getRow(1);","signature":"Test suite()"},{"arguments":[],"filename":"src/test/org/apache/hama/matrix/TestSparseVector.java","implementation":"LOG.info(\"tearDown()\");","signature":"void tearDown()"}],"patch":"@@ -20,46 +20,40 @@\n package org.apache.hama.matrix;\n \n import java.io.IOException;\n-\n-import junit.extensions.TestSetup;\n-import junit.framework.Test;\n-import junit.framework.TestCase;\n-import junit.framework.TestSuite;\n+import java.io.UnsupportedEncodingException;\n \n import org.apache.commons.logging.Log;\n import org.apache.commons.logging.LogFactory;\n+import org.apache.hadoop.hbase.client.Get;\n import org.apache.hadoop.hbase.client.HTable;\n-import org.apache.hadoop.hbase.io.Cell;\n+import org.apache.hadoop.hbase.client.Result;\n+import org.apache.hama.HamaCluster;\n import org.apache.hama.util.BytesUtil;\n \n-public class TestSparseVector extends TestCase {\n+public class TestSparseVector extends HamaCluster {\n final static Log LOG = LogFactory.getLog(TestSparseVector.class.getName());\n- private static SparseMatrix m1;\n- private static SparseVector v1;\n- private static SparseVector v2;\n- private static double[][] values = { { 2, 0, 0, 4 }, { 0, 0, 3, 3 } };\n-\n- public static Test suite() {\n- TestSetup setup = new TestSetup(new TestSuite(TestSparseVector.class)) {\n- protected void setUp() throws Exception {\n- HCluster hCluster = new HCluster();\n- hCluster.setUp();\n+ private SparseMatrix m1;\n+ private SparseVector v1;\n+ private SparseVector v2;\n+ private double[][] values = { { 2, 0, 0, 4 }, { 0, 0, 3, 3 } };\n \n- m1 = new SparseMatrix(hCluster.getConf(), 2, 4);\n+ /**\n+ * @throws UnsupportedEncodingException\n+ */\n+ public TestSparseVector() throws UnsupportedEncodingException {\n+ super();\n+ }\n \n- for (int i = 0; i < 2; i++)\n- for (int j = 0; j < 4; j++)\n- m1.set(i, j, values[i][j]);\n+ public void setUp() throws Exception {\n+ super.setUp();\n+ m1 = new SparseMatrix(getConf(), 2, 4);\n \n- v1 = m1.getRow(0);\n- v2 = m1.getRow(1);\n- }\n+ for (int i = 0; i < 2; i++)\n+ for (int j = 0; j < 4; j++)\n+ m1.set(i, j, values[i][j]);\n \n- protected void tearDown() {\n- LOG.info(\"tearDown()\");\n- }\n- };\n- return setup;\n+ v1 = m1.getRow(0);\n+ v2 = m1.getRow(1);\n }\n \n /**\n@@ -72,23 +66,28 @@ public void testGetSet() throws IOException {\n assertEquals(v2.get(1), 0.0);\n \n HTable table = m1.getHTable();\n- Cell c = table.get(BytesUtil.getRowIndex(0), BytesUtil.getColumnIndex(1));\n- assertTrue(c == null);\n+ Get get = new Get(BytesUtil.getRowIndex(0));\n+ get.addColumn(BytesUtil.getColumnIndex(1));\n+ Result r = table.get(get);\n+ assertTrue(r.getCellValue() == null);\n+ \n+ addTest();\n }\n- \n+\n /**\n * Test add()\n */\n- public void testAdd() {\n+ public void addTest() {\n v1.add(v2);\n- \n- for(int i = 0; i < values[0].length; i++) {\n+\n+ for (int i = 0; i < values[0].length; i++) {\n assertEquals(v1.get(i), values[0][i] + values[1][i]);\n }\n \n v1.add(0.5, v2);\n- for(int i = 0; i < values[0].length; i++) {\n- assertEquals(v1.get(i), (values[0][i] + values[1][i]) + (0.5 * values[1][i]));\n+ for (int i = 0; i < values[0].length; i++) {\n+ assertEquals(v1.get(i), (values[0][i] + values[1][i])\n+ + (0.5 * values[1][i]));\n }\n }\n }","raw_url":"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseVector.java","sha":"abb2700c8077f6addd68fae88d631138039a2e5a","status":"modified"}],"string":"[\n {\n \"additions\": 1,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/CHANGES.txt\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/CHANGES.txt?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 0,\n \"filename\": \"CHANGES.txt\",\n \"new_code\": \" HAMA-188: Upgrade dependencies for hadoop/hbase 2.0 (edwardyoon)\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -40,6 +40,7 @@ Trunk (unreleased changes)\\n \\n IMPROVEMENTS\\n \\n+ HAMA-188: Upgrade dependencies for hadoop/hbase 2.0 (edwardyoon)\\n HAMA-192: Refactor top-level package (edwardyoon)\\n HAMA-189: Update website (edwardyoon)\\n HAMA-187: Add matrix subtraction test case (edwardyoon)\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/CHANGES.txt\",\n \"sha\": \"a0ae72a6a567226cb201224eda80907fb4e8931d\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 324,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/build.xml\",\n \"changes\": 651,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/build.xml?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 327,\n \"filename\": \"build.xml\",\n \"new_code\": \"\\n\\n\\n\\n\\n \\n \\n \\n \\n\\n \\n \\n \\n \\n\\n \\n \\n \\n \\n\\n \\n \\n \\n \\n\\n\\t\\n \\n\\n \\n \\n\\n\\t\\n\\t\\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n\\n \\n \\n\\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\t\\n\\t\\n \\n \\n \\n \\n \\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n\\n \\n \\n \\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n \\n \\n \\n \\n \\t\\n \\n \\n \\n \\n \\t\\n \\n\\n \\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n Tests failed!\\n \\n\\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n \\n\",\n \"new_methods\": [],\n \"old_code\": \"\\r\\n\\r\\n\\r\\n\\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n\\t\\r\\n \\r\\n\\r\\n \\r\\n \\r\\n\\r\\n\\t\\r\\n\\t\\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n\\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\t\\r\\n\\t\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\t\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\t\\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n Tests failed!\\r\\n \\r\\n\\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n \\r\\n\\r\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,327 +1,324 @@\\n-\\r\\n-\\r\\n-\\r\\n-\\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n-\\t\\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n-\\r\\n-\\t\\r\\n-\\t\\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\t\\r\\n-\\t\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\t\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\t\\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- Tests failed!\\r\\n- \\r\\n-\\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n- \\r\\n-\\r\\n+\\n+\\n+\\n+\\n+\\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+\\n+\\t\\n+ \\n+\\n+ \\n+ \\n+\\n+\\t\\n+\\t\\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+\\n+ \\n+ \\n+\\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\t\\n+\\t\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\t\\n+ \\n+ \\n+ \\n+ \\n+ \\t\\n+ \\n+\\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ Tests failed!\\n+ \\n+\\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+ \\n+\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/build.xml\",\n \"sha\": \"c45e160c5f4258d11573be997351b4718cf43a73\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2FHamaAdminImpl.java\",\n \"changes\": 2,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Fjava%2Forg%2Fapache%2Fhama%2FHamaAdminImpl.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 0,\n \"filename\": \"src/java/org/apache/hama/HamaAdminImpl.java\",\n \"new_code\": \"import org.apache.hadoop.hbase.client.Get;\\nimport org.apache.hadoop.hbase.client.Result;\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -25,8 +25,10 @@\\n import org.apache.hadoop.hbase.HTableDescriptor;\\n import org.apache.hadoop.hbase.MasterNotRunningException;\\n import org.apache.hadoop.hbase.RegionException;\\n+import org.apache.hadoop.hbase.client.Get;\\n import org.apache.hadoop.hbase.client.HBaseAdmin;\\n import org.apache.hadoop.hbase.client.HTable;\\n+import org.apache.hadoop.hbase.client.Result;\\n import org.apache.hadoop.hbase.io.BatchUpdate;\\n import org.apache.hadoop.hbase.io.Cell;\\n import org.apache.hadoop.hbase.util.Bytes;\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2FHamaAdminImpl.java\",\n \"sha\": \"39568b43f7cfa5c02867b88ec49d851a7c954faf\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 13,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FAbstractMatrix.java\",\n \"changes\": 14,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FAbstractMatrix.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 1,\n \"filename\": \"src/java/org/apache/hama/matrix/AbstractMatrix.java\",\n \"new_code\": \" this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.COLUMN)));\\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.ATTRIBUTE)));\\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.ALIASEFAMILY)));\\n \\n // It's a temporary data.\\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.BLOCK)));\\n // the following families are used in JacobiEigenValue computation\\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EI)));\\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EICOL)));\\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EIVEC)));\\n \\n /*\\n */\",\n \"new_methods\": [],\n \"old_code\": \"\",\n \"old_methods\": [],\n \"patch\": \"@@ -143,6 +143,18 @@ protected void tryToCreateTable(String table_prefix) throws IOException {\\n protected void create() throws IOException {\\n // It should run only when table doesn't exist.\\n if (!admin.tableExists(matrixPath)) {\\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.COLUMN)));\\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.ATTRIBUTE)));\\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.ALIASEFAMILY)));\\n+ \\n+ // It's a temporary data.\\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(Constants.BLOCK)));\\n+ // the following families are used in JacobiEigenValue computation\\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EI)));\\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EICOL)));\\n+ this.tableDesc.addFamily(new HColumnDescriptor(Bytes.toBytes(JacobiEigenValue.EIVEC)));\\n+ \\n+ /*\\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes\\n .toBytes(Constants.COLUMN), 3, CompressionType.NONE, false, false,\\n Integer.MAX_VALUE, HConstants.FOREVER, false));\\n@@ -162,7 +174,7 @@ protected void create() throws IOException {\\n this.tableDesc.addFamily(new HColumnDescriptor(Bytes\\n .toBytes(JacobiEigenValue.EIVEC), 10, CompressionType.NONE, false,\\n false, Integer.MAX_VALUE, HConstants.FOREVER, false));\\n-\\n+ */\\n LOG.info(\\\"Initializing the matrix storage.\\\");\\n this.admin.createTable(this.tableDesc);\\n LOG.info(\\\"Create Matrix \\\" + matrixPath);\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FAbstractMatrix.java\",\n \"sha\": \"54d9308ec83d3eccadce44883b70f367b07cd939\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 0,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FDenseMatrix.java\",\n \"changes\": 1,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FDenseMatrix.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 1,\n \"filename\": \"src/java/org/apache/hama/matrix/DenseMatrix.java\",\n \"new_code\": \"\",\n \"new_methods\": [],\n \"old_code\": \"import org.apache.hama.matrix.Matrix.Norm;\",\n \"old_methods\": [],\n \"patch\": \"@@ -59,7 +59,6 @@\\n import org.apache.hama.mapred.RandomMatrixMap;\\n import org.apache.hama.mapred.RandomMatrixReduce;\\n import org.apache.hama.mapred.VectorInputFormat;\\n-import org.apache.hama.matrix.Matrix.Norm;\\n import org.apache.hama.matrix.algebra.BlockMultiplyMap;\\n import org.apache.hama.matrix.algebra.BlockMultiplyReduce;\\n import org.apache.hama.matrix.algebra.DenseMatrixVectorMultMap;\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FDenseMatrix.java\",\n \"sha\": \"3e70326f6b8dc2c970255fed8d5db15c57d53609\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 185,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FSparseVector.java\",\n \"changes\": 371,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FSparseVector.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 186,\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"new_code\": \"/**\\n * Copyright 2007 The Apache Software Foundation\\n *\\n * Licensed to the Apache Software Foundation (ASF) under one\\n * or more contributor license agreements. See the NOTICE file\\n * distributed with this work for additional information\\n * regarding copyright ownership. The ASF licenses this file\\n * to you under the Apache License, Version 2.0 (the\\n * \\\"License\\\"); you may not use this file except in compliance\\n * with the License. You may obtain a copy of the License at\\n *\\n * http://www.apache.org/licenses/LICENSE-2.0\\n *\\n * Unless required by applicable law or agreed to in writing, software\\n * distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\n * See the License for the specific language governing permissions and\\n * limitations under the License.\\n */\\npackage org.apache.hama.matrix;\\n\\nimport java.io.IOException;\\nimport java.util.Map;\\n\\nimport org.apache.hadoop.hbase.io.RowResult;\\nimport org.apache.hadoop.io.IntWritable;\\nimport org.apache.hadoop.io.MapWritable;\\nimport org.apache.hadoop.io.Writable;\\nimport org.apache.hama.io.DoubleEntry;\\nimport org.apache.log4j.Logger;\\n\\n/**\\n * This class represents a sparse vector.\\n */\\npublic class SparseVector extends AbstractVector implements Vector {\\n static final Logger LOG = Logger.getLogger(SparseVector.class);\\n\\n public SparseVector() {\\n this(new MapWritable());\\n }\\n\\n public SparseVector(MapWritable m) {\\n this.entries = m;\\n }\\n\\n public SparseVector(RowResult row) {\\n this.initMap(row);\\n }\\n\\n @Override\\n public Vector add(double alpha, Vector v) {\\n if (alpha == 0)\\n return this;\\n\\n for (Map.Entry e : v.getEntries().entrySet()) {\\n if (this.entries.containsKey(e.getKey())) {\\n // add\\n double value = alpha * ((DoubleEntry) e.getValue()).getValue()\\n + this.get(((IntWritable) e.getKey()).get());\\n this.entries.put(e.getKey(), new DoubleEntry(value));\\n } else {\\n // put\\n double value = alpha * ((DoubleEntry) e.getValue()).getValue();\\n this.entries.put(e.getKey(), new DoubleEntry(value));\\n }\\n }\\n\\n return this;\\n }\\n\\n /**\\n * x = v + x\\n * \\n * @param v2\\n * @return x = v + x\\n */\\n public SparseVector add(Vector v2) {\\n\\n for (Map.Entry e : v2.getEntries().entrySet()) {\\n int key = ((IntWritable) e.getKey()).get();\\n if (this.entries.containsKey(e.getKey())) {\\n this.add(key, ((DoubleEntry) e.getValue()).getValue());\\n } else {\\n this.set(key, ((DoubleEntry) e.getValue()).getValue());\\n }\\n }\\n\\n return this;\\n }\\n\\n @Override\\n public double dot(Vector v) {\\n // TODO Auto-generated method stub\\n return 0;\\n }\\n\\n @Override\\n public double norm(Norm type) {\\n // TODO Auto-generated method stub\\n return 0;\\n }\\n\\n /**\\n * v = alpha*v\\n * \\n * @param alpha\\n * @return v = alpha*v\\n */\\n public SparseVector scale(double alpha) {\\n for (Map.Entry e : this.entries.entrySet()) {\\n this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\\n .getValue()\\n * alpha));\\n }\\n return this;\\n }\\n\\n /**\\n * Gets the value of index\\n * \\n * @param index\\n * @return the value of v(index)\\n * @throws IOException\\n */\\n public double get(int index) {\\n double value;\\n try {\\n value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\\n .getValue();\\n } catch (NullPointerException e) { // returns zero if there is no value\\n return 0;\\n }\\n\\n return value;\\n }\\n\\n /**\\n * Sets the value of index\\n * \\n * @param index\\n * @param value\\n */\\n public void set(int index, double value) {\\n // If entries are null, create new object\\n if (this.entries == null) {\\n this.entries = new MapWritable();\\n }\\n\\n if (value != 0) // only stores non-zero element\\n this.entries.put(new IntWritable(index), new DoubleEntry(value));\\n }\\n\\n /**\\n * Adds the value to v(index)\\n * \\n * @param index\\n * @param value\\n */\\n public void add(int index, double value) {\\n set(index, get(index) + value);\\n }\\n\\n /**\\n * Sets the vector\\n * \\n * @param v\\n * @return x = v\\n */\\n public SparseVector set(Vector v) {\\n return new SparseVector(v.getEntries());\\n }\\n\\n @Override\\n public Vector subVector(int i0, int i1) {\\n // TODO Auto-generated method stub\\n return null;\\n }\\n\\n @Override\\n public Vector set(double alpha, Vector v) {\\n // TODO Auto-generated method stub\\n return null;\\n }\\n\\n}\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"this(new MapWritable());\",\n \"signature\": \"public SparseVector()\"\n },\n {\n \"arguments\": [\n \"MapWritable m\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"this.entries = m;\",\n \"signature\": \"public SparseVector(MapWritable m)\"\n },\n {\n \"arguments\": [\n \"RowResult row\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"this.initMap(row);\",\n \"signature\": \"public SparseVector(RowResult row)\"\n },\n {\n \"arguments\": [\n \"double alpha\",\n \" Vector v\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"if (alpha == 0)\\n return this;\\n\\n for (Map.Entry e : v.getEntries().entrySet()) {\\n if (this.entries.containsKey(e.getKey())) {\\n // add\\n double value = alpha * ((DoubleEntry) e.getValue()).getValue()\\n + this.get(((IntWritable) e.getKey()).get());\\n this.entries.put(e.getKey(), new DoubleEntry(value));\",\n \"signature\": \"Vector add(double alpha, Vector v)\"\n },\n {\n \"arguments\": [\n \"Vector v2\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"for (Map.Entry e : v2.getEntries().entrySet()) {\\n int key = ((IntWritable) e.getKey()).get();\\n if (this.entries.containsKey(e.getKey())) {\\n this.add(key, ((DoubleEntry) e.getValue()).getValue());\",\n \"signature\": \"SparseVector add(Vector v2)\"\n },\n {\n \"arguments\": [\n \"Vector v\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"// TODO Auto-generated method stub\\n return 0;\",\n \"signature\": \"double dot(Vector v)\"\n },\n {\n \"arguments\": [\n \"Norm type\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"// TODO Auto-generated method stub\\n return 0;\",\n \"signature\": \"double norm(Norm type)\"\n },\n {\n \"arguments\": [\n \"double alpha\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"for (Map.Entry e : this.entries.entrySet()) {\\n this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\\n .getValue()\\n * alpha));\",\n \"signature\": \"SparseVector scale(double alpha)\"\n },\n {\n \"arguments\": [\n \"int index\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"double value;\\n try {\\n value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\\n .getValue();\",\n \"signature\": \"double get(int index)\"\n },\n {\n \"arguments\": [\n \"int index\",\n \" double value\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"// If entries are null, create new object\\n if (this.entries == null) {\\n this.entries = new MapWritable();\",\n \"signature\": \"void set(int index, double value)\"\n },\n {\n \"arguments\": [\n \"int index\",\n \" double value\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"set(index, get(index) + value);\",\n \"signature\": \"void add(int index, double value)\"\n },\n {\n \"arguments\": [\n \"Vector v\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"return new SparseVector(v.getEntries());\",\n \"signature\": \"SparseVector set(Vector v)\"\n },\n {\n \"arguments\": [\n \"int i0\",\n \" int i1\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"// TODO Auto-generated method stub\\n return null;\",\n \"signature\": \"Vector subVector(int i0, int i1)\"\n },\n {\n \"arguments\": [\n \"double alpha\",\n \" Vector v\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"// TODO Auto-generated method stub\\n return null;\",\n \"signature\": \"Vector set(double alpha, Vector v)\"\n }\n ],\n \"old_code\": \"/**\\r\\n * Copyright 2007 The Apache Software Foundation\\r\\n *\\r\\n * Licensed to the Apache Software Foundation (ASF) under one\\r\\n * or more contributor license agreements. See the NOTICE file\\r\\n * distributed with this work for additional information\\r\\n * regarding copyright ownership. The ASF licenses this file\\r\\n * to you under the Apache License, Version 2.0 (the\\r\\n * \\\"License\\\"); you may not use this file except in compliance\\r\\n * with the License. You may obtain a copy of the License at\\r\\n *\\r\\n * http://www.apache.org/licenses/LICENSE-2.0\\r\\n *\\r\\n * Unless required by applicable law or agreed to in writing, software\\r\\n * distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\r\\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\r\\n * See the License for the specific language governing permissions and\\r\\n * limitations under the License.\\r\\n */\\r\\npackage org.apache.hama.matrix;\\r\\n\\r\\nimport java.io.IOException;\\r\\nimport java.util.Map;\\r\\n\\r\\nimport org.apache.hadoop.hbase.io.RowResult;\\r\\nimport org.apache.hadoop.io.IntWritable;\\r\\nimport org.apache.hadoop.io.MapWritable;\\r\\nimport org.apache.hadoop.io.Writable;\\r\\nimport org.apache.hama.io.DoubleEntry;\\r\\nimport org.apache.hama.matrix.Vector.Norm;\\r\\nimport org.apache.log4j.Logger;\\r\\n\\r\\n/**\\r\\n * This class represents a sparse vector.\\r\\n */\\r\\npublic class SparseVector extends AbstractVector implements Vector {\\r\\n static final Logger LOG = Logger.getLogger(SparseVector.class);\\r\\n\\r\\n public SparseVector() {\\r\\n this(new MapWritable());\\r\\n }\\r\\n\\r\\n public SparseVector(MapWritable m) {\\r\\n this.entries = m;\\r\\n }\\r\\n\\r\\n public SparseVector(RowResult row) {\\r\\n this.initMap(row);\\r\\n }\\r\\n\\r\\n @Override\\r\\n public Vector add(double alpha, Vector v) {\\r\\n if (alpha == 0)\\r\\n return this;\\r\\n\\r\\n for (Map.Entry e : v.getEntries().entrySet()) {\\r\\n if (this.entries.containsKey(e.getKey())) {\\r\\n // add\\r\\n double value = alpha * ((DoubleEntry) e.getValue()).getValue()\\r\\n + this.get(((IntWritable) e.getKey()).get());\\r\\n this.entries.put(e.getKey(), new DoubleEntry(value));\\r\\n } else {\\r\\n // put\\r\\n double value = alpha * ((DoubleEntry) e.getValue()).getValue();\\r\\n this.entries.put(e.getKey(), new DoubleEntry(value));\\r\\n }\\r\\n }\\r\\n\\r\\n return this;\\r\\n }\\r\\n\\r\\n /**\\r\\n * x = v + x\\r\\n * \\r\\n * @param v2\\r\\n * @return x = v + x\\r\\n */\\r\\n public SparseVector add(Vector v2) {\\r\\n\\r\\n for (Map.Entry e : v2.getEntries().entrySet()) {\\r\\n int key = ((IntWritable) e.getKey()).get();\\r\\n if (this.entries.containsKey(e.getKey())) {\\r\\n this.add(key, ((DoubleEntry) e.getValue()).getValue());\\r\\n } else {\\r\\n this.set(key, ((DoubleEntry) e.getValue()).getValue());\\r\\n }\\r\\n }\\r\\n\\r\\n return this;\\r\\n }\\r\\n\\r\\n @Override\\r\\n public double dot(Vector v) {\\r\\n // TODO Auto-generated method stub\\r\\n return 0;\\r\\n }\\r\\n\\r\\n @Override\\r\\n public double norm(Norm type) {\\r\\n // TODO Auto-generated method stub\\r\\n return 0;\\r\\n }\\r\\n\\r\\n /**\\r\\n * v = alpha*v\\r\\n * \\r\\n * @param alpha\\r\\n * @return v = alpha*v\\r\\n */\\r\\n public SparseVector scale(double alpha) {\\r\\n for (Map.Entry e : this.entries.entrySet()) {\\r\\n this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\\r\\n .getValue()\\r\\n * alpha));\\r\\n }\\r\\n return this;\\r\\n }\\r\\n\\r\\n /**\\r\\n * Gets the value of index\\r\\n * \\r\\n * @param index\\r\\n * @return the value of v(index)\\r\\n * @throws IOException\\r\\n */\\r\\n public double get(int index) {\\r\\n double value;\\r\\n try {\\r\\n value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\\r\\n .getValue();\\r\\n } catch (NullPointerException e) { // returns zero if there is no value\\r\\n return 0;\\r\\n }\\r\\n\\r\\n return value;\\r\\n }\\r\\n\\r\\n /**\\r\\n * Sets the value of index\\r\\n * \\r\\n * @param index\\r\\n * @param value\\r\\n */\\r\\n public void set(int index, double value) {\\r\\n // If entries are null, create new object\\r\\n if (this.entries == null) {\\r\\n this.entries = new MapWritable();\\r\\n }\\r\\n\\r\\n if (value != 0) // only stores non-zero element\\r\\n this.entries.put(new IntWritable(index), new DoubleEntry(value));\\r\\n }\\r\\n\\r\\n /**\\r\\n * Adds the value to v(index)\\r\\n * \\r\\n * @param index\\r\\n * @param value\\r\\n */\\r\\n public void add(int index, double value) {\\r\\n set(index, get(index) + value);\\r\\n }\\r\\n\\r\\n /**\\r\\n * Sets the vector\\r\\n * \\r\\n * @param v\\r\\n * @return x = v\\r\\n */\\r\\n public SparseVector set(Vector v) {\\r\\n return new SparseVector(v.getEntries());\\r\\n }\\r\\n\\r\\n @Override\\r\\n public Vector subVector(int i0, int i1) {\\r\\n // TODO Auto-generated method stub\\r\\n return null;\\r\\n }\\r\\n\\r\\n @Override\\r\\n public Vector set(double alpha, Vector v) {\\r\\n // TODO Auto-generated method stub\\r\\n return null;\\r\\n }\\r\\n\\r\\n}\\r\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"this(new MapWritable());\",\n \"signature\": \"public SparseVector()\"\n },\n {\n \"arguments\": [\n \"MapWritable m\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"this.entries = m;\",\n \"signature\": \"public SparseVector(MapWritable m)\"\n },\n {\n \"arguments\": [\n \"RowResult row\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"this.initMap(row);\",\n \"signature\": \"public SparseVector(RowResult row)\"\n },\n {\n \"arguments\": [\n \"double alpha\",\n \" Vector v\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"if (alpha == 0)\\r\\n return this;\\r\\n\\r\\n for (Map.Entry e : v.getEntries().entrySet()) {\\r\\n if (this.entries.containsKey(e.getKey())) {\\r\\n // add\\r\\n double value = alpha * ((DoubleEntry) e.getValue()).getValue()\\r\\n + this.get(((IntWritable) e.getKey()).get());\\r\\n this.entries.put(e.getKey(), new DoubleEntry(value));\",\n \"signature\": \"Vector add(double alpha, Vector v)\"\n },\n {\n \"arguments\": [\n \"Vector v2\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"for (Map.Entry e : v2.getEntries().entrySet()) {\\r\\n int key = ((IntWritable) e.getKey()).get();\\r\\n if (this.entries.containsKey(e.getKey())) {\\r\\n this.add(key, ((DoubleEntry) e.getValue()).getValue());\",\n \"signature\": \"SparseVector add(Vector v2)\"\n },\n {\n \"arguments\": [\n \"Vector v\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"// TODO Auto-generated method stub\\r\\n return 0;\",\n \"signature\": \"double dot(Vector v)\"\n },\n {\n \"arguments\": [\n \"Norm type\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"// TODO Auto-generated method stub\\r\\n return 0;\",\n \"signature\": \"double norm(Norm type)\"\n },\n {\n \"arguments\": [\n \"double alpha\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"for (Map.Entry e : this.entries.entrySet()) {\\r\\n this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\\r\\n .getValue()\\r\\n * alpha));\",\n \"signature\": \"SparseVector scale(double alpha)\"\n },\n {\n \"arguments\": [\n \"int index\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"double value;\\r\\n try {\\r\\n value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\\r\\n .getValue();\",\n \"signature\": \"double get(int index)\"\n },\n {\n \"arguments\": [\n \"int index\",\n \" double value\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"// If entries are null, create new object\\r\\n if (this.entries == null) {\\r\\n this.entries = new MapWritable();\",\n \"signature\": \"void set(int index, double value)\"\n },\n {\n \"arguments\": [\n \"int index\",\n \" double value\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"set(index, get(index) + value);\",\n \"signature\": \"void add(int index, double value)\"\n },\n {\n \"arguments\": [\n \"Vector v\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"return new SparseVector(v.getEntries());\",\n \"signature\": \"SparseVector set(Vector v)\"\n },\n {\n \"arguments\": [\n \"int i0\",\n \" int i1\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"// TODO Auto-generated method stub\\r\\n return null;\",\n \"signature\": \"Vector subVector(int i0, int i1)\"\n },\n {\n \"arguments\": [\n \"double alpha\",\n \" Vector v\"\n ],\n \"filename\": \"src/java/org/apache/hama/matrix/SparseVector.java\",\n \"implementation\": \"// TODO Auto-generated method stub\\r\\n return null;\",\n \"signature\": \"Vector set(double alpha, Vector v)\"\n }\n ],\n \"patch\": \"@@ -1,186 +1,185 @@\\n-/**\\r\\n- * Copyright 2007 The Apache Software Foundation\\r\\n- *\\r\\n- * Licensed to the Apache Software Foundation (ASF) under one\\r\\n- * or more contributor license agreements. See the NOTICE file\\r\\n- * distributed with this work for additional information\\r\\n- * regarding copyright ownership. The ASF licenses this file\\r\\n- * to you under the Apache License, Version 2.0 (the\\r\\n- * \\\"License\\\"); you may not use this file except in compliance\\r\\n- * with the License. You may obtain a copy of the License at\\r\\n- *\\r\\n- * http://www.apache.org/licenses/LICENSE-2.0\\r\\n- *\\r\\n- * Unless required by applicable law or agreed to in writing, software\\r\\n- * distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\r\\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\r\\n- * See the License for the specific language governing permissions and\\r\\n- * limitations under the License.\\r\\n- */\\r\\n-package org.apache.hama.matrix;\\r\\n-\\r\\n-import java.io.IOException;\\r\\n-import java.util.Map;\\r\\n-\\r\\n-import org.apache.hadoop.hbase.io.RowResult;\\r\\n-import org.apache.hadoop.io.IntWritable;\\r\\n-import org.apache.hadoop.io.MapWritable;\\r\\n-import org.apache.hadoop.io.Writable;\\r\\n-import org.apache.hama.io.DoubleEntry;\\r\\n-import org.apache.hama.matrix.Vector.Norm;\\r\\n-import org.apache.log4j.Logger;\\r\\n-\\r\\n-/**\\r\\n- * This class represents a sparse vector.\\r\\n- */\\r\\n-public class SparseVector extends AbstractVector implements Vector {\\r\\n- static final Logger LOG = Logger.getLogger(SparseVector.class);\\r\\n-\\r\\n- public SparseVector() {\\r\\n- this(new MapWritable());\\r\\n- }\\r\\n-\\r\\n- public SparseVector(MapWritable m) {\\r\\n- this.entries = m;\\r\\n- }\\r\\n-\\r\\n- public SparseVector(RowResult row) {\\r\\n- this.initMap(row);\\r\\n- }\\r\\n-\\r\\n- @Override\\r\\n- public Vector add(double alpha, Vector v) {\\r\\n- if (alpha == 0)\\r\\n- return this;\\r\\n-\\r\\n- for (Map.Entry e : v.getEntries().entrySet()) {\\r\\n- if (this.entries.containsKey(e.getKey())) {\\r\\n- // add\\r\\n- double value = alpha * ((DoubleEntry) e.getValue()).getValue()\\r\\n- + this.get(((IntWritable) e.getKey()).get());\\r\\n- this.entries.put(e.getKey(), new DoubleEntry(value));\\r\\n- } else {\\r\\n- // put\\r\\n- double value = alpha * ((DoubleEntry) e.getValue()).getValue();\\r\\n- this.entries.put(e.getKey(), new DoubleEntry(value));\\r\\n- }\\r\\n- }\\r\\n-\\r\\n- return this;\\r\\n- }\\r\\n-\\r\\n- /**\\r\\n- * x = v + x\\r\\n- * \\r\\n- * @param v2\\r\\n- * @return x = v + x\\r\\n- */\\r\\n- public SparseVector add(Vector v2) {\\r\\n-\\r\\n- for (Map.Entry e : v2.getEntries().entrySet()) {\\r\\n- int key = ((IntWritable) e.getKey()).get();\\r\\n- if (this.entries.containsKey(e.getKey())) {\\r\\n- this.add(key, ((DoubleEntry) e.getValue()).getValue());\\r\\n- } else {\\r\\n- this.set(key, ((DoubleEntry) e.getValue()).getValue());\\r\\n- }\\r\\n- }\\r\\n-\\r\\n- return this;\\r\\n- }\\r\\n-\\r\\n- @Override\\r\\n- public double dot(Vector v) {\\r\\n- // TODO Auto-generated method stub\\r\\n- return 0;\\r\\n- }\\r\\n-\\r\\n- @Override\\r\\n- public double norm(Norm type) {\\r\\n- // TODO Auto-generated method stub\\r\\n- return 0;\\r\\n- }\\r\\n-\\r\\n- /**\\r\\n- * v = alpha*v\\r\\n- * \\r\\n- * @param alpha\\r\\n- * @return v = alpha*v\\r\\n- */\\r\\n- public SparseVector scale(double alpha) {\\r\\n- for (Map.Entry e : this.entries.entrySet()) {\\r\\n- this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\\r\\n- .getValue()\\r\\n- * alpha));\\r\\n- }\\r\\n- return this;\\r\\n- }\\r\\n-\\r\\n- /**\\r\\n- * Gets the value of index\\r\\n- * \\r\\n- * @param index\\r\\n- * @return the value of v(index)\\r\\n- * @throws IOException\\r\\n- */\\r\\n- public double get(int index) {\\r\\n- double value;\\r\\n- try {\\r\\n- value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\\r\\n- .getValue();\\r\\n- } catch (NullPointerException e) { // returns zero if there is no value\\r\\n- return 0;\\r\\n- }\\r\\n-\\r\\n- return value;\\r\\n- }\\r\\n-\\r\\n- /**\\r\\n- * Sets the value of index\\r\\n- * \\r\\n- * @param index\\r\\n- * @param value\\r\\n- */\\r\\n- public void set(int index, double value) {\\r\\n- // If entries are null, create new object\\r\\n- if (this.entries == null) {\\r\\n- this.entries = new MapWritable();\\r\\n- }\\r\\n-\\r\\n- if (value != 0) // only stores non-zero element\\r\\n- this.entries.put(new IntWritable(index), new DoubleEntry(value));\\r\\n- }\\r\\n-\\r\\n- /**\\r\\n- * Adds the value to v(index)\\r\\n- * \\r\\n- * @param index\\r\\n- * @param value\\r\\n- */\\r\\n- public void add(int index, double value) {\\r\\n- set(index, get(index) + value);\\r\\n- }\\r\\n-\\r\\n- /**\\r\\n- * Sets the vector\\r\\n- * \\r\\n- * @param v\\r\\n- * @return x = v\\r\\n- */\\r\\n- public SparseVector set(Vector v) {\\r\\n- return new SparseVector(v.getEntries());\\r\\n- }\\r\\n-\\r\\n- @Override\\r\\n- public Vector subVector(int i0, int i1) {\\r\\n- // TODO Auto-generated method stub\\r\\n- return null;\\r\\n- }\\r\\n-\\r\\n- @Override\\r\\n- public Vector set(double alpha, Vector v) {\\r\\n- // TODO Auto-generated method stub\\r\\n- return null;\\r\\n- }\\r\\n-\\r\\n-}\\r\\n+/**\\n+ * Copyright 2007 The Apache Software Foundation\\n+ *\\n+ * Licensed to the Apache Software Foundation (ASF) under one\\n+ * or more contributor license agreements. See the NOTICE file\\n+ * distributed with this work for additional information\\n+ * regarding copyright ownership. The ASF licenses this file\\n+ * to you under the Apache License, Version 2.0 (the\\n+ * \\\"License\\\"); you may not use this file except in compliance\\n+ * with the License. You may obtain a copy of the License at\\n+ *\\n+ * http://www.apache.org/licenses/LICENSE-2.0\\n+ *\\n+ * Unless required by applicable law or agreed to in writing, software\\n+ * distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\n+ * See the License for the specific language governing permissions and\\n+ * limitations under the License.\\n+ */\\n+package org.apache.hama.matrix;\\n+\\n+import java.io.IOException;\\n+import java.util.Map;\\n+\\n+import org.apache.hadoop.hbase.io.RowResult;\\n+import org.apache.hadoop.io.IntWritable;\\n+import org.apache.hadoop.io.MapWritable;\\n+import org.apache.hadoop.io.Writable;\\n+import org.apache.hama.io.DoubleEntry;\\n+import org.apache.log4j.Logger;\\n+\\n+/**\\n+ * This class represents a sparse vector.\\n+ */\\n+public class SparseVector extends AbstractVector implements Vector {\\n+ static final Logger LOG = Logger.getLogger(SparseVector.class);\\n+\\n+ public SparseVector() {\\n+ this(new MapWritable());\\n+ }\\n+\\n+ public SparseVector(MapWritable m) {\\n+ this.entries = m;\\n+ }\\n+\\n+ public SparseVector(RowResult row) {\\n+ this.initMap(row);\\n+ }\\n+\\n+ @Override\\n+ public Vector add(double alpha, Vector v) {\\n+ if (alpha == 0)\\n+ return this;\\n+\\n+ for (Map.Entry e : v.getEntries().entrySet()) {\\n+ if (this.entries.containsKey(e.getKey())) {\\n+ // add\\n+ double value = alpha * ((DoubleEntry) e.getValue()).getValue()\\n+ + this.get(((IntWritable) e.getKey()).get());\\n+ this.entries.put(e.getKey(), new DoubleEntry(value));\\n+ } else {\\n+ // put\\n+ double value = alpha * ((DoubleEntry) e.getValue()).getValue();\\n+ this.entries.put(e.getKey(), new DoubleEntry(value));\\n+ }\\n+ }\\n+\\n+ return this;\\n+ }\\n+\\n+ /**\\n+ * x = v + x\\n+ * \\n+ * @param v2\\n+ * @return x = v + x\\n+ */\\n+ public SparseVector add(Vector v2) {\\n+\\n+ for (Map.Entry e : v2.getEntries().entrySet()) {\\n+ int key = ((IntWritable) e.getKey()).get();\\n+ if (this.entries.containsKey(e.getKey())) {\\n+ this.add(key, ((DoubleEntry) e.getValue()).getValue());\\n+ } else {\\n+ this.set(key, ((DoubleEntry) e.getValue()).getValue());\\n+ }\\n+ }\\n+\\n+ return this;\\n+ }\\n+\\n+ @Override\\n+ public double dot(Vector v) {\\n+ // TODO Auto-generated method stub\\n+ return 0;\\n+ }\\n+\\n+ @Override\\n+ public double norm(Norm type) {\\n+ // TODO Auto-generated method stub\\n+ return 0;\\n+ }\\n+\\n+ /**\\n+ * v = alpha*v\\n+ * \\n+ * @param alpha\\n+ * @return v = alpha*v\\n+ */\\n+ public SparseVector scale(double alpha) {\\n+ for (Map.Entry e : this.entries.entrySet()) {\\n+ this.entries.put(e.getKey(), new DoubleEntry(((DoubleEntry) e.getValue())\\n+ .getValue()\\n+ * alpha));\\n+ }\\n+ return this;\\n+ }\\n+\\n+ /**\\n+ * Gets the value of index\\n+ * \\n+ * @param index\\n+ * @return the value of v(index)\\n+ * @throws IOException\\n+ */\\n+ public double get(int index) {\\n+ double value;\\n+ try {\\n+ value = ((DoubleEntry) this.entries.get(new IntWritable(index)))\\n+ .getValue();\\n+ } catch (NullPointerException e) { // returns zero if there is no value\\n+ return 0;\\n+ }\\n+\\n+ return value;\\n+ }\\n+\\n+ /**\\n+ * Sets the value of index\\n+ * \\n+ * @param index\\n+ * @param value\\n+ */\\n+ public void set(int index, double value) {\\n+ // If entries are null, create new object\\n+ if (this.entries == null) {\\n+ this.entries = new MapWritable();\\n+ }\\n+\\n+ if (value != 0) // only stores non-zero element\\n+ this.entries.put(new IntWritable(index), new DoubleEntry(value));\\n+ }\\n+\\n+ /**\\n+ * Adds the value to v(index)\\n+ * \\n+ * @param index\\n+ * @param value\\n+ */\\n+ public void add(int index, double value) {\\n+ set(index, get(index) + value);\\n+ }\\n+\\n+ /**\\n+ * Sets the vector\\n+ * \\n+ * @param v\\n+ * @return x = v\\n+ */\\n+ public SparseVector set(Vector v) {\\n+ return new SparseVector(v.getEntries());\\n+ }\\n+\\n+ @Override\\n+ public Vector subVector(int i0, int i1) {\\n+ // TODO Auto-generated method stub\\n+ return null;\\n+ }\\n+\\n+ @Override\\n+ public Vector set(double alpha, Vector v) {\\n+ // TODO Auto-generated method stub\\n+ return null;\\n+ }\\n+\\n+}\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Fjava%2Forg%2Fapache%2Fhama%2Fmatrix%2FSparseVector.java\",\n \"sha\": \"5480a4915ff8d739e87ae67063ba5a53e23a2112\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 13,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fgraph%2FTestGraph.java\",\n \"changes\": 32,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fgraph%2FTestGraph.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 19,\n \"filename\": \"src/test/org/apache/hama/graph/TestGraph.java\",\n \"new_code\": \"import java.io.UnsupportedEncodingException;\\nimport org.apache.hama.HamaCluster;\\npublic class TestGraph extends HamaCluster {\\n /**\\n * @throws UnsupportedEncodingException\\n */\\n public TestGraph() throws UnsupportedEncodingException {\\n super();\\n }\\n public void setUp() throws Exception {\\n super.setUp();\\n conf = getConf();\\n adj = new SparseGraph(conf);\",\n \"new_methods\": [],\n \"old_code\": \"import junit.extensions.TestSetup;\\nimport junit.framework.Test;\\nimport junit.framework.TestCase;\\nimport junit.framework.TestSuite;\\n\\nimport org.apache.hama.matrix.HCluster;\\npublic class TestGraph extends TestCase {\\n public static Test suite() {\\n TestSetup setup = new TestSetup(new TestSuite(TestGraph.class)) {\\n protected void setUp() throws Exception {\\n HCluster hCluster = new HCluster();\\n hCluster.setUp();\\n conf = hCluster.getConf();\\n adj = new SparseGraph(conf);\\n }\\n protected void tearDown() {\\n }\\n };\\n return setup;\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/graph/TestGraph.java\",\n \"implementation\": \"TestSetup setup = new TestSetup(new TestSuite(TestGraph.class)) {\\n protected void setUp() throws Exception {\\n HCluster hCluster = new HCluster();\\n hCluster.setUp();\\n conf = hCluster.getConf();\\n adj = new SparseGraph(conf);\",\n \"signature\": \"Test suite()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/graph/TestGraph.java\",\n \"implementation\": \"\",\n \"signature\": \"void tearDown()\"\n }\n ],\n \"patch\": \"@@ -20,38 +20,32 @@\\n package org.apache.hama.graph;\\n \\n import java.io.IOException;\\n+import java.io.UnsupportedEncodingException;\\n import java.util.HashMap;\\n import java.util.Map;\\n \\n-import junit.extensions.TestSetup;\\n-import junit.framework.Test;\\n-import junit.framework.TestCase;\\n-import junit.framework.TestSuite;\\n-\\n+import org.apache.hama.HamaCluster;\\n import org.apache.hama.HamaConfiguration;\\n-import org.apache.hama.matrix.HCluster;\\n import org.apache.log4j.Logger;\\n \\n-public class TestGraph extends TestCase {\\n+public class TestGraph extends HamaCluster {\\n static final Logger LOG = Logger.getLogger(TestGraph.class);\\n private static HamaConfiguration conf;\\n private static Graph adj;\\n private static int[] result = new int[] { 4, 3, 2, 0, 1 };\\n \\n- public static Test suite() {\\n- TestSetup setup = new TestSetup(new TestSuite(TestGraph.class)) {\\n- protected void setUp() throws Exception {\\n- HCluster hCluster = new HCluster();\\n- hCluster.setUp();\\n \\n- conf = hCluster.getConf();\\n- adj = new SparseGraph(conf);\\n- }\\n+ /**\\n+ * @throws UnsupportedEncodingException\\n+ */\\n+ public TestGraph() throws UnsupportedEncodingException {\\n+ super();\\n+ }\\n \\n- protected void tearDown() {\\n- }\\n- };\\n- return setup;\\n+ public void setUp() throws Exception {\\n+ super.setUp();\\n+ conf = getConf();\\n+ adj = new SparseGraph(conf);\\n }\\n \\n public void testAddEdge() throws IOException {\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fgraph%2FTestGraph.java\",\n \"sha\": \"3a22f64e33cbab0acadaf146bbb70b07f1698271\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 60,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestBlockMatrixMapReduce.java\",\n \"changes\": 120,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestBlockMatrixMapReduce.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 60,\n \"filename\": \"src/test/org/apache/hama/mapred/TestBlockMatrixMapReduce.java\",\n \"new_code\": \"/**\\n * Copyright 2007 The Apache Software Foundation\\n *\\n * Licensed to the Apache Software Foundation (ASF) under one\\n * or more contributor license agreements. See the NOTICE file\\n * distributed with this work for additional information\\n * regarding copyright ownership. The ASF licenses this file\\n * to you under the Apache License, Version 2.0 (the\\n * \\\"License\\\"); you may not use this file except in compliance\\n * with the License. You may obtain a copy of the License at\\n *\\n * http://www.apache.org/licenses/LICENSE-2.0\\n *\\n * Unless required by applicable law or agreed to in writing, software\\n * distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\n * See the License for the specific language governing permissions and\\n * limitations under the License.\\n */\\npackage org.apache.hama.mapred;\\n\\nimport java.io.IOException;\\n\\nimport org.apache.hama.HamaCluster;\\nimport org.apache.hama.matrix.DenseMatrix;\\nimport org.apache.log4j.Logger;\\n\\npublic class TestBlockMatrixMapReduce extends HamaCluster {\\n static final Logger LOG = Logger.getLogger(TestBlockMatrixMapReduce.class);\\n static final int SIZE = 32;\\n\\n /** constructor */\\n public TestBlockMatrixMapReduce() {\\n super();\\n }\\n\\n public void testBlockMatrixMapReduce() throws IOException,\\n ClassNotFoundException {\\n DenseMatrix m1 = DenseMatrix.random(conf, SIZE, SIZE);\\n DenseMatrix m2 = DenseMatrix.random(conf, SIZE, SIZE);\\n\\n DenseMatrix c = (DenseMatrix) m1.mult(m2, 16);\\n\\n double[][] mem = new double[SIZE][SIZE];\\n for (int i = 0; i < SIZE; i++) {\\n for (int j = 0; j < SIZE; j++) {\\n for (int k = 0; k < SIZE; k++) {\\n mem[i][k] += m1.get(i, j) * m2.get(j, k);\\n }\\n }\\n }\\n\\n for (int i = 0; i < SIZE; i++) {\\n for (int j = 0; j < SIZE; j++) {\\n double gap = (mem[i][j] - c.get(i, j));\\n assertTrue(gap < 0.000001 || gap < -0.000001);\\n }\\n }\\n }\\n}\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/mapred/TestBlockMatrixMapReduce.java\",\n \"implementation\": \"super();\",\n \"signature\": \"public TestBlockMatrixMapReduce()\"\n }\n ],\n \"old_code\": \"/**\\r\\n * Copyright 2007 The Apache Software Foundation\\r\\n *\\r\\n * Licensed to the Apache Software Foundation (ASF) under one\\r\\n * or more contributor license agreements. See the NOTICE file\\r\\n * distributed with this work for additional information\\r\\n * regarding copyright ownership. The ASF licenses this file\\r\\n * to you under the Apache License, Version 2.0 (the\\r\\n * \\\"License\\\"); you may not use this file except in compliance\\r\\n * with the License. You may obtain a copy of the License at\\r\\n *\\r\\n * http://www.apache.org/licenses/LICENSE-2.0\\r\\n *\\r\\n * Unless required by applicable law or agreed to in writing, software\\r\\n * distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\r\\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\r\\n * See the License for the specific language governing permissions and\\r\\n * limitations under the License.\\r\\n */\\r\\npackage org.apache.hama.mapred;\\r\\n\\r\\nimport java.io.IOException;\\r\\n\\r\\nimport org.apache.hama.matrix.DenseMatrix;\\r\\nimport org.apache.hama.matrix.HCluster;\\r\\nimport org.apache.log4j.Logger;\\r\\n\\r\\npublic class TestBlockMatrixMapReduce extends HCluster {\\r\\n static final Logger LOG = Logger.getLogger(TestBlockMatrixMapReduce.class);\\r\\n static final int SIZE = 32;\\r\\n\\r\\n /** constructor */\\r\\n public TestBlockMatrixMapReduce() {\\r\\n super();\\r\\n }\\r\\n\\r\\n public void testBlockMatrixMapReduce() throws IOException,\\r\\n ClassNotFoundException {\\r\\n DenseMatrix m1 = DenseMatrix.random(conf, SIZE, SIZE);\\r\\n DenseMatrix m2 = DenseMatrix.random(conf, SIZE, SIZE);\\r\\n\\r\\n DenseMatrix c = (DenseMatrix) m1.mult(m2, 16);\\r\\n\\r\\n double[][] mem = new double[SIZE][SIZE];\\r\\n for (int i = 0; i < SIZE; i++) {\\r\\n for (int j = 0; j < SIZE; j++) {\\r\\n for (int k = 0; k < SIZE; k++) {\\r\\n mem[i][k] += m1.get(i, j) * m2.get(j, k);\\r\\n }\\r\\n }\\r\\n }\\r\\n\\r\\n for (int i = 0; i < SIZE; i++) {\\r\\n for (int j = 0; j < SIZE; j++) {\\r\\n double gap = (mem[i][j] - c.get(i, j));\\r\\n assertTrue(gap < 0.000001 || gap < -0.000001);\\r\\n }\\r\\n }\\r\\n }\\r\\n}\\r\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/mapred/TestBlockMatrixMapReduce.java\",\n \"implementation\": \"super();\",\n \"signature\": \"public TestBlockMatrixMapReduce()\"\n }\n ],\n \"patch\": \"@@ -1,60 +1,60 @@\\n-/**\\r\\n- * Copyright 2007 The Apache Software Foundation\\r\\n- *\\r\\n- * Licensed to the Apache Software Foundation (ASF) under one\\r\\n- * or more contributor license agreements. See the NOTICE file\\r\\n- * distributed with this work for additional information\\r\\n- * regarding copyright ownership. The ASF licenses this file\\r\\n- * to you under the Apache License, Version 2.0 (the\\r\\n- * \\\"License\\\"); you may not use this file except in compliance\\r\\n- * with the License. You may obtain a copy of the License at\\r\\n- *\\r\\n- * http://www.apache.org/licenses/LICENSE-2.0\\r\\n- *\\r\\n- * Unless required by applicable law or agreed to in writing, software\\r\\n- * distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\r\\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\r\\n- * See the License for the specific language governing permissions and\\r\\n- * limitations under the License.\\r\\n- */\\r\\n-package org.apache.hama.mapred;\\r\\n-\\r\\n-import java.io.IOException;\\r\\n-\\r\\n-import org.apache.hama.matrix.DenseMatrix;\\r\\n-import org.apache.hama.matrix.HCluster;\\r\\n-import org.apache.log4j.Logger;\\r\\n-\\r\\n-public class TestBlockMatrixMapReduce extends HCluster {\\r\\n- static final Logger LOG = Logger.getLogger(TestBlockMatrixMapReduce.class);\\r\\n- static final int SIZE = 32;\\r\\n-\\r\\n- /** constructor */\\r\\n- public TestBlockMatrixMapReduce() {\\r\\n- super();\\r\\n- }\\r\\n-\\r\\n- public void testBlockMatrixMapReduce() throws IOException,\\r\\n- ClassNotFoundException {\\r\\n- DenseMatrix m1 = DenseMatrix.random(conf, SIZE, SIZE);\\r\\n- DenseMatrix m2 = DenseMatrix.random(conf, SIZE, SIZE);\\r\\n-\\r\\n- DenseMatrix c = (DenseMatrix) m1.mult(m2, 16);\\r\\n-\\r\\n- double[][] mem = new double[SIZE][SIZE];\\r\\n- for (int i = 0; i < SIZE; i++) {\\r\\n- for (int j = 0; j < SIZE; j++) {\\r\\n- for (int k = 0; k < SIZE; k++) {\\r\\n- mem[i][k] += m1.get(i, j) * m2.get(j, k);\\r\\n- }\\r\\n- }\\r\\n- }\\r\\n-\\r\\n- for (int i = 0; i < SIZE; i++) {\\r\\n- for (int j = 0; j < SIZE; j++) {\\r\\n- double gap = (mem[i][j] - c.get(i, j));\\r\\n- assertTrue(gap < 0.000001 || gap < -0.000001);\\r\\n- }\\r\\n- }\\r\\n- }\\r\\n-}\\r\\n+/**\\n+ * Copyright 2007 The Apache Software Foundation\\n+ *\\n+ * Licensed to the Apache Software Foundation (ASF) under one\\n+ * or more contributor license agreements. See the NOTICE file\\n+ * distributed with this work for additional information\\n+ * regarding copyright ownership. The ASF licenses this file\\n+ * to you under the Apache License, Version 2.0 (the\\n+ * \\\"License\\\"); you may not use this file except in compliance\\n+ * with the License. You may obtain a copy of the License at\\n+ *\\n+ * http://www.apache.org/licenses/LICENSE-2.0\\n+ *\\n+ * Unless required by applicable law or agreed to in writing, software\\n+ * distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\n+ * See the License for the specific language governing permissions and\\n+ * limitations under the License.\\n+ */\\n+package org.apache.hama.mapred;\\n+\\n+import java.io.IOException;\\n+\\n+import org.apache.hama.HamaCluster;\\n+import org.apache.hama.matrix.DenseMatrix;\\n+import org.apache.log4j.Logger;\\n+\\n+public class TestBlockMatrixMapReduce extends HamaCluster {\\n+ static final Logger LOG = Logger.getLogger(TestBlockMatrixMapReduce.class);\\n+ static final int SIZE = 32;\\n+\\n+ /** constructor */\\n+ public TestBlockMatrixMapReduce() {\\n+ super();\\n+ }\\n+\\n+ public void testBlockMatrixMapReduce() throws IOException,\\n+ ClassNotFoundException {\\n+ DenseMatrix m1 = DenseMatrix.random(conf, SIZE, SIZE);\\n+ DenseMatrix m2 = DenseMatrix.random(conf, SIZE, SIZE);\\n+\\n+ DenseMatrix c = (DenseMatrix) m1.mult(m2, 16);\\n+\\n+ double[][] mem = new double[SIZE][SIZE];\\n+ for (int i = 0; i < SIZE; i++) {\\n+ for (int j = 0; j < SIZE; j++) {\\n+ for (int k = 0; k < SIZE; k++) {\\n+ mem[i][k] += m1.get(i, j) * m2.get(j, k);\\n+ }\\n+ }\\n+ }\\n+\\n+ for (int i = 0; i < SIZE; i++) {\\n+ for (int j = 0; j < SIZE; j++) {\\n+ double gap = (mem[i][j] - c.get(i, j));\\n+ assertTrue(gap < 0.000001 || gap < -0.000001);\\n+ }\\n+ }\\n+ }\\n+}\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestBlockMatrixMapReduce.java\",\n \"sha\": \"96419f3cee20b7fd3167f286812a23d740564721\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 2,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestRandomMatrixMapReduce.java\",\n \"changes\": 4,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestRandomMatrixMapReduce.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 2,\n \"filename\": \"src/test/org/apache/hama/mapred/TestRandomMatrixMapReduce.java\",\n \"new_code\": \"import org.apache.hama.HamaCluster;\\npublic class TestRandomMatrixMapReduce extends HamaCluster {\",\n \"new_methods\": [],\n \"old_code\": \"import org.apache.hama.matrix.HCluster;\\npublic class TestRandomMatrixMapReduce extends HCluster {\",\n \"old_methods\": [],\n \"patch\": \"@@ -21,12 +21,12 @@\\n \\n import java.io.IOException;\\n \\n+import org.apache.hama.HamaCluster;\\n import org.apache.hama.matrix.DenseMatrix;\\n-import org.apache.hama.matrix.HCluster;\\n import org.apache.hama.matrix.SparseMatrix;\\n import org.apache.log4j.Logger;\\n \\n-public class TestRandomMatrixMapReduce extends HCluster {\\n+public class TestRandomMatrixMapReduce extends HamaCluster {\\n static final Logger LOG = Logger.getLogger(TestRandomMatrixMapReduce.class);\\n \\n public void testRandomMatrixMapReduce() throws IOException {\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmapred%2FTestRandomMatrixMapReduce.java\",\n \"sha\": \"7c2979b382bb14adec6e4f892915ef7d9b8e0899\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 74,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FMatrixTestCommon.java\",\n \"changes\": 148,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FMatrixTestCommon.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 74,\n \"filename\": \"src/test/org/apache/hama/matrix/MatrixTestCommon.java\",\n \"new_code\": \"/**\\n * Licensed to the Apache Software Foundation (ASF) under one or more\\n * contributor license agreements. See the NOTICE file distributed with this\\n * work for additional information regarding copyright ownership. The ASF\\n * licenses this file to you under the Apache License, Version 2.0 (the\\n * \\\"License\\\"); you may not use this file except in compliance with the License.\\n * You may obtain a copy of the License at\\n * \\n * http://www.apache.org/licenses/LICENSE-2.0\\n * \\n * Unless required by applicable law or agreed to in writing, software\\n * distributed under the License is distributed on an \\\"AS IS\\\" BASIS, WITHOUT\\n * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\\n * License for the specific language governing permissions and limitations under\\n * the License.\\n */\\npackage org.apache.hama.matrix;\\n\\nimport java.io.IOException;\\n\\nclass MatrixTestCommon {\\n\\n static double verifyNorm1(Matrix m1) throws IOException {\\n double[] colSum = new double[m1.getColumns()];\\n for (int j = 0; j < m1.getColumns(); j++) {\\n for (int i = 0; i < m1.getRows(); i++) {\\n colSum[j] += Math.abs(m1.get(i, j));\\n }\\n }\\n\\n double max = 0;\\n for (int i = 0; i < colSum.length; i++) {\\n max = Math.max(colSum[i], max);\\n }\\n return max;\\n }\\n\\n static double verifyNormInfinity(Matrix m1) throws IOException {\\n double[] rowSum = new double[m1.getRows()];\\n for (int i = 0; i < m1.getRows(); i++) {\\n for (int j = 0; j < m1.getColumns(); j++) {\\n rowSum[i] += Math.abs(m1.get(i, j));\\n }\\n }\\n\\n double max = 0;\\n for (int i = 0; i < rowSum.length; ++i)\\n max = Math.max(rowSum[i], max);\\n return max;\\n }\\n\\n static double verifyNormMaxValue(Matrix m1) throws IOException {\\n double max = 0;\\n for (int i = 0; i < m1.getRows(); i++) {\\n for (int j = 0; j < m1.getColumns(); j++) {\\n max = Math.max(Math.abs(m1.get(i, j)), max);\\n }\\n }\\n\\n return max;\\n }\\n\\n static double verifyNormFrobenius(Matrix m1) throws IOException {\\n double sqrtSum = 0;\\n for (int i = 0; i < m1.getRows(); i++) {\\n for (int j = 0; j < m1.getColumns(); j++) {\\n double cellValue = m1.get(i, j);\\n sqrtSum += (cellValue * cellValue);\\n }\\n }\\n return Math.sqrt(sqrtSum);\\n }\\n\\n}\",\n \"new_methods\": [],\n \"old_code\": \"/**\\r\\n * Licensed to the Apache Software Foundation (ASF) under one or more\\r\\n * contributor license agreements. See the NOTICE file distributed with this\\r\\n * work for additional information regarding copyright ownership. The ASF\\r\\n * licenses this file to you under the Apache License, Version 2.0 (the\\r\\n * \\\"License\\\"); you may not use this file except in compliance with the License.\\r\\n * You may obtain a copy of the License at\\r\\n * \\r\\n * http://www.apache.org/licenses/LICENSE-2.0\\r\\n * \\r\\n * Unless required by applicable law or agreed to in writing, software\\r\\n * distributed under the License is distributed on an \\\"AS IS\\\" BASIS, WITHOUT\\r\\n * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\\r\\n * License for the specific language governing permissions and limitations under\\r\\n * the License.\\r\\n */\\r\\npackage org.apache.hama.matrix;\\r\\n\\r\\nimport java.io.IOException;\\r\\n\\r\\nclass MatrixTestCommon {\\r\\n\\r\\n static double verifyNorm1(Matrix m1) throws IOException {\\r\\n double[] colSum = new double[m1.getColumns()];\\r\\n for (int j = 0; j < m1.getColumns(); j++) {\\r\\n for (int i = 0; i < m1.getRows(); i++) {\\r\\n colSum[j] += Math.abs(m1.get(i, j));\\r\\n }\\r\\n }\\r\\n \\r\\n double max = 0;\\r\\n for (int i=0; i < colSum.length; i++) {\\r\\n max = Math.max(colSum[i], max);\\r\\n }\\r\\n return max;\\r\\n }\\r\\n \\r\\n static double verifyNormInfinity(Matrix m1) throws IOException {\\r\\n double[] rowSum = new double[m1.getRows()];\\r\\n for (int i = 0; i < m1.getRows(); i++) {\\r\\n for (int j = 0; j < m1.getColumns(); j++) {\\r\\n rowSum[i] += Math.abs(m1.get(i, j));\\r\\n }\\r\\n }\\r\\n\\r\\n double max = 0;\\r\\n for (int i = 0; i < rowSum.length; ++i)\\r\\n max = Math.max(rowSum[i], max);\\r\\n return max;\\r\\n }\\r\\n \\r\\n static double verifyNormMaxValue(Matrix m1) throws IOException {\\r\\n double max = 0;\\r\\n for (int i = 0; i < m1.getRows(); i++) {\\r\\n for (int j = 0; j < m1.getColumns(); j++) {\\r\\n max = Math.max(Math.abs(m1.get(i, j)), max);\\r\\n }\\r\\n }\\r\\n \\r\\n return max;\\r\\n }\\r\\n \\r\\n static double verifyNormFrobenius(Matrix m1) throws IOException {\\r\\n double sqrtSum = 0;\\r\\n for (int i = 0; i < m1.getRows(); i++) {\\r\\n for (int j = 0; j < m1.getColumns(); j++) {\\r\\n double cellValue = m1.get(i, j);\\r\\n sqrtSum += ( cellValue * cellValue );\\r\\n }\\r\\n } \\r\\n return Math.sqrt(sqrtSum);\\r\\n }\\r\\n \\r\\n}\\r\",\n \"old_methods\": [],\n \"patch\": \"@@ -1,74 +1,74 @@\\n-/**\\r\\n- * Licensed to the Apache Software Foundation (ASF) under one or more\\r\\n- * contributor license agreements. See the NOTICE file distributed with this\\r\\n- * work for additional information regarding copyright ownership. The ASF\\r\\n- * licenses this file to you under the Apache License, Version 2.0 (the\\r\\n- * \\\"License\\\"); you may not use this file except in compliance with the License.\\r\\n- * You may obtain a copy of the License at\\r\\n- * \\r\\n- * http://www.apache.org/licenses/LICENSE-2.0\\r\\n- * \\r\\n- * Unless required by applicable law or agreed to in writing, software\\r\\n- * distributed under the License is distributed on an \\\"AS IS\\\" BASIS, WITHOUT\\r\\n- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\\r\\n- * License for the specific language governing permissions and limitations under\\r\\n- * the License.\\r\\n- */\\r\\n-package org.apache.hama.matrix;\\r\\n-\\r\\n-import java.io.IOException;\\r\\n-\\r\\n-class MatrixTestCommon {\\r\\n-\\r\\n- static double verifyNorm1(Matrix m1) throws IOException {\\r\\n- double[] colSum = new double[m1.getColumns()];\\r\\n- for (int j = 0; j < m1.getColumns(); j++) {\\r\\n- for (int i = 0; i < m1.getRows(); i++) {\\r\\n- colSum[j] += Math.abs(m1.get(i, j));\\r\\n- }\\r\\n- }\\r\\n- \\r\\n- double max = 0;\\r\\n- for (int i=0; i < colSum.length; i++) {\\r\\n- max = Math.max(colSum[i], max);\\r\\n- }\\r\\n- return max;\\r\\n- }\\r\\n- \\r\\n- static double verifyNormInfinity(Matrix m1) throws IOException {\\r\\n- double[] rowSum = new double[m1.getRows()];\\r\\n- for (int i = 0; i < m1.getRows(); i++) {\\r\\n- for (int j = 0; j < m1.getColumns(); j++) {\\r\\n- rowSum[i] += Math.abs(m1.get(i, j));\\r\\n- }\\r\\n- }\\r\\n-\\r\\n- double max = 0;\\r\\n- for (int i = 0; i < rowSum.length; ++i)\\r\\n- max = Math.max(rowSum[i], max);\\r\\n- return max;\\r\\n- }\\r\\n- \\r\\n- static double verifyNormMaxValue(Matrix m1) throws IOException {\\r\\n- double max = 0;\\r\\n- for (int i = 0; i < m1.getRows(); i++) {\\r\\n- for (int j = 0; j < m1.getColumns(); j++) {\\r\\n- max = Math.max(Math.abs(m1.get(i, j)), max);\\r\\n- }\\r\\n- }\\r\\n- \\r\\n- return max;\\r\\n- }\\r\\n- \\r\\n- static double verifyNormFrobenius(Matrix m1) throws IOException {\\r\\n- double sqrtSum = 0;\\r\\n- for (int i = 0; i < m1.getRows(); i++) {\\r\\n- for (int j = 0; j < m1.getColumns(); j++) {\\r\\n- double cellValue = m1.get(i, j);\\r\\n- sqrtSum += ( cellValue * cellValue );\\r\\n- }\\r\\n- } \\r\\n- return Math.sqrt(sqrtSum);\\r\\n- }\\r\\n- \\r\\n-}\\r\\n+/**\\n+ * Licensed to the Apache Software Foundation (ASF) under one or more\\n+ * contributor license agreements. See the NOTICE file distributed with this\\n+ * work for additional information regarding copyright ownership. The ASF\\n+ * licenses this file to you under the Apache License, Version 2.0 (the\\n+ * \\\"License\\\"); you may not use this file except in compliance with the License.\\n+ * You may obtain a copy of the License at\\n+ * \\n+ * http://www.apache.org/licenses/LICENSE-2.0\\n+ * \\n+ * Unless required by applicable law or agreed to in writing, software\\n+ * distributed under the License is distributed on an \\\"AS IS\\\" BASIS, WITHOUT\\n+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the\\n+ * License for the specific language governing permissions and limitations under\\n+ * the License.\\n+ */\\n+package org.apache.hama.matrix;\\n+\\n+import java.io.IOException;\\n+\\n+class MatrixTestCommon {\\n+\\n+ static double verifyNorm1(Matrix m1) throws IOException {\\n+ double[] colSum = new double[m1.getColumns()];\\n+ for (int j = 0; j < m1.getColumns(); j++) {\\n+ for (int i = 0; i < m1.getRows(); i++) {\\n+ colSum[j] += Math.abs(m1.get(i, j));\\n+ }\\n+ }\\n+\\n+ double max = 0;\\n+ for (int i = 0; i < colSum.length; i++) {\\n+ max = Math.max(colSum[i], max);\\n+ }\\n+ return max;\\n+ }\\n+\\n+ static double verifyNormInfinity(Matrix m1) throws IOException {\\n+ double[] rowSum = new double[m1.getRows()];\\n+ for (int i = 0; i < m1.getRows(); i++) {\\n+ for (int j = 0; j < m1.getColumns(); j++) {\\n+ rowSum[i] += Math.abs(m1.get(i, j));\\n+ }\\n+ }\\n+\\n+ double max = 0;\\n+ for (int i = 0; i < rowSum.length; ++i)\\n+ max = Math.max(rowSum[i], max);\\n+ return max;\\n+ }\\n+\\n+ static double verifyNormMaxValue(Matrix m1) throws IOException {\\n+ double max = 0;\\n+ for (int i = 0; i < m1.getRows(); i++) {\\n+ for (int j = 0; j < m1.getColumns(); j++) {\\n+ max = Math.max(Math.abs(m1.get(i, j)), max);\\n+ }\\n+ }\\n+\\n+ return max;\\n+ }\\n+\\n+ static double verifyNormFrobenius(Matrix m1) throws IOException {\\n+ double sqrtSum = 0;\\n+ for (int i = 0; i < m1.getRows(); i++) {\\n+ for (int j = 0; j < m1.getColumns(); j++) {\\n+ double cellValue = m1.get(i, j);\\n+ sqrtSum += (cellValue * cellValue);\\n+ }\\n+ }\\n+ return Math.sqrt(sqrtSum);\\n+ }\\n+\\n+}\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FMatrixTestCommon.java\",\n \"sha\": \"7c00eb66ef35f28a763649fb25b0b91e8ce6a138\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 90,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseMatrix.java\",\n \"changes\": 497,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseMatrix.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 407,\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseMatrix.java\",\n \"new_code\": \"import java.io.UnsupportedEncodingException;\\nimport org.apache.hama.HamaCluster;\\npublic class TestDenseMatrix extends HamaCluster {\\n private int SIZE = 10;\\n private Matrix m1;\\n private Matrix m2;\\n private HamaConfiguration conf;\\n * @throws UnsupportedEncodingException\\n public TestDenseMatrix() throws UnsupportedEncodingException {\\n super();\\n public void setUp() throws Exception {\\n super.setUp();\\n conf = getConf();\\n m1 = DenseMatrix.random(conf, SIZE, SIZE);\\n m2 = DenseMatrix.random(conf, SIZE, SIZE);\\n }\\n public void testAddMult() throws IOException {\\n Matrix m3 = DenseMatrix.random(conf, SIZE, SIZE);\\n Matrix m4 = DenseMatrix.random(conf, SIZE - 2, SIZE - 2);\\n try {\\n m1.add(m4);\\n fail(\\\"Matrix-Addition should be failed while rows and columns aren't same.\\\");\\n } catch (IOException e) {\\n LOG.info(e.toString());\\n try {\\n m1.mult(m4);\\n fail(\\\"Matrix-Mult should be failed while A.columns!=B.rows.\\\");\\n } catch (IOException e) {\\n LOG.info(e.toString());\\n \\n double origin = m1.get(1, 1);\\n m1.add(1, 1, 0.5);\\n assertEquals(m1.get(1, 1), origin + 0.5);\\n \\n matrixAdd(m1, m2);\\n multMatrixAdd(m1, m2, m3);\\n matrixMult(m1, m2);\\n addAlphaMatrix(m1, m2);\\n \\n getRowColumn();\\n setRowColumn();\\n setMatrix(m1);\\n setAlphaMatrix(m1);\\n public void matrixAdd(Matrix m1, Matrix m2) throws IOException {\\n public void multMatrixAdd(Matrix m1, Matrix m2, Matrix m3) throws IOException {\\n Matrix result = ((DenseMatrix) m1).add(m2, m3);\\n\\n\\n assertEquals(result.get(i, j), m1.get(i, j) + m2.get(i, j)\\n + m3.get(i, j));\\n public void matrixMult(Matrix m1, Matrix m2) throws IOException {\\n public void addAlphaMatrix(Matrix m1, Matrix m2) throws IOException {\\n double value = m1.get(0, 0) + (m2.get(0, 0) * 0.1);\\n Matrix result = m1.add(0.1, m2);\\n assertEquals(value, result.get(0, 0));\\n }\\n \\n public void setMatrix(Matrix m1) throws IOException {\\n public void setAlphaMatrix(Matrix m1) throws IOException {\\n\\n\\n public void getRowColumn() throws IOException {\\n boolean ex = false;\\n try {\\n m1.get(SIZE + 1, SIZE + 1);\\n } catch (ArrayIndexOutOfBoundsException e) {\\n ex = true;\\n }\\n assertTrue(ex);\\n assertTrue(m1.get(0, 0) > 0);\\n Vector v = m1.getColumn(0);\\n Iterator it = v.iterator();\\n int x = 0;\\n while (it.hasNext()) {\\n assertEquals(m1.get(x, 0), ((DoubleEntry) it.next()).getValue());\\n x++;\\n }\\n m1.setRowLabel(0, \\\"row1\\\");\\n assertEquals(m1.getRowLabel(0), \\\"row1\\\");\\n assertEquals(m1.getRowLabel(1), null);\\n\\n m1.setColumnLabel(0, \\\"column1\\\");\\n assertEquals(m1.getColumnLabel(0), \\\"column1\\\");\\n assertEquals(m1.getColumnLabel(1), null);\\n public void setRowColumn() throws IOException {\\n Iterator it2 = m1.getColumn(SIZE).iterator();\\n int x = 0;\\n while (it2.hasNext()) {\\n assertEquals(entries[x], ((DoubleEntry) it2.next()).getValue());\\n x++;\",\n \"new_methods\": [],\n \"old_code\": \"import junit.extensions.TestSetup;\\nimport junit.framework.Test;\\nimport junit.framework.TestCase;\\nimport junit.framework.TestSuite;\\n\\nimport org.apache.hadoop.hbase.client.HBaseAdmin;\\nimport org.apache.hama.HamaAdmin;\\nimport org.apache.hama.HamaAdminImpl;\\nimport org.apache.hama.matrix.Matrix.Norm;\\npublic class TestDenseMatrix extends TestCase {\\n private static int SIZE = 10;\\n private static Matrix m1;\\n private static Matrix m2;\\n private static Matrix m3;\\n private static Matrix m4, m5;\\n private final static String aliase1 = \\\"matrix_aliase_A\\\";\\n private final static String aliase2 = \\\"matrix_aliase_B\\\";\\n private static HamaConfiguration conf;\\n private static HBaseAdmin admin;\\n private static HamaAdmin hamaAdmin;\\n\\n public static Test suite() {\\n TestSetup setup = new TestSetup(new TestSuite(TestDenseMatrix.class)) {\\n protected void setUp() throws Exception {\\n HCluster hCluster = new HCluster();\\n hCluster.setUp();\\n\\n conf = hCluster.getConf();\\n admin = new HBaseAdmin(conf);\\n hamaAdmin = new HamaAdminImpl(conf, admin);\\n\\n m1 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n m2 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n m3 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n m4 = DenseMatrix.random(hCluster.getConf(), SIZE-2, SIZE-2);\\n m5 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n }\\n\\n protected void tearDown() {\\n try {\\n closeTest();\\n } catch (IOException e) {\\n e.printStackTrace();\\n }\\n }\\n };\\n return setup;\\n }\\n\\n public static void closeTest() throws IOException {\\n m1.close();\\n m2.close();\\n }\\n\\n public void testEntryAdd() throws IOException {\\n double origin = m1.get(1, 1);\\n m1.add(1, 1, 0.5);\\n\\n assertEquals(m1.get(1, 1), origin + 0.5);\\n }\\n\\n public void testGet() throws IOException {\\n boolean ex = false;\\n try {\\n m1.get(SIZE + 1, SIZE + 1);\\n } catch (ArrayIndexOutOfBoundsException e) {\\n ex = true;\\n }\\n assertTrue(ex);\\n assertTrue(m1.get(0, 0) > 0);\\n }\\n \\n public void testTranspose() throws IOException {\\n DenseMatrix trans = (DenseMatrix) m1.transpose();\\n for(int i = 0; i < trans.getRows(); i++) {\\n for(int j = 0; j < trans.getColumns(); j++) {\\n assertEquals(trans.get(i, j), m1.get(j, i));\\n }\\n }\\n }\\n * Column vector test.\\n * \\n * @param rand\\n * @throws IOException\\n public void testGetColumn() throws IOException {\\n Vector v = m1.getColumn(0);\\n Iterator it = v.iterator();\\n int x = 0;\\n while (it.hasNext()) {\\n assertEquals(m1.get(x, 0), ((DoubleEntry) it.next()).getValue());\\n x++;\\n }\\n public void testGetSetAttribute() throws IOException {\\n m1.setRowLabel(0, \\\"row1\\\");\\n assertEquals(m1.getRowLabel(0), \\\"row1\\\");\\n assertEquals(m1.getRowLabel(1), null);\\n\\n m1.setColumnLabel(0, \\\"column1\\\");\\n assertEquals(m1.getColumnLabel(0), \\\"column1\\\");\\n assertEquals(m1.getColumnLabel(1), null);\\n }\\n public void testSubMatrix() throws IOException {\\n SubMatrix a = m1.subMatrix(2, 4, 2, 5); // A : 3 * 4\\n for (int i = 0; i < a.getRows(); i++) {\\n for (int j = 0; j < a.getColumns(); j++) {\\n assertEquals(a.get(i, j), m1.get(i + 2, j + 2));\\n }\\n }\\n SubMatrix b = m2.subMatrix(0, 3, 0, 2); // B : 4 * 3\\n SubMatrix c = a.mult(b);\\n double[][] C = new double[3][3]; // A * B\\n for (int i = 0; i < 3; i++) {\\n for (int j = 0; j < 3; j++) {\\n for (int k = 0; k < 4; k++) {\\n C[i][j] += m1.get(i + 2, k + 2) * m2.get(k, j);\\n }\\n }\\n for (int i = 0; i < 3; i++) {\\n for (int j = 0; j < 3; j++) {\\n assertEquals(C[i][j], c.get(i, j));\\n }\\n public void testMatrixAdd() throws IOException {\\n public void testMultiMatrixAdd() throws IOException {\\n Matrix result = ((DenseMatrix)m1).add(m2, m3);\\n \\n \\n assertEquals(result.get(i, j), m1.get(i, j) + m2.get(i, j) + m3.get(i, j));\\n public void testMatrixMult() throws IOException {\\n public void testSetMatrix() throws IOException {\\n public void testSetAlphaMatrix() throws IOException {\\n \\n \\n public void testAddAlphaMatrix() throws IOException {\\n double value = m1.get(0, 0) + (m2.get(0, 0) * 0.1);\\n Matrix result = m1.add(0.1, m2);\\n assertEquals(value, result.get(0, 0));\\n }\\n \\n public void testNorm() throws IOException {\\n double gap = 0.000001;\\n \\n double norm1 = m1.norm(Norm.One);\\n double verify_norm1 = MatrixTestCommon.verifyNorm1(m1);\\n gap = norm1 - verify_norm1;\\n LOG.info(\\\"Norm One : gap \\\" + gap);\\n assertTrue(gap < 0.000001 && gap > -0.000001);\\n \\n double normInfinity = m1.norm(Norm.Infinity);\\n double verify_normInf = MatrixTestCommon.verifyNormInfinity(m1);\\n gap = normInfinity - verify_normInf;\\n LOG.info(\\\"Norm Infinity : gap \\\" + gap);\\n assertTrue(gap < 0.000001 && gap > -0.000001);\\n double normMaxValue = m1.norm(Norm.Maxvalue);\\n double verify_normMV = MatrixTestCommon.verifyNormMaxValue(m1);\\n gap = normMaxValue - verify_normMV;\\n LOG.info(\\\"Norm MaxValue : gap \\\" + gap);\\n assertTrue(gap < 0.000001 && gap > -0.000001);\\n double normFrobenius = m1.norm(Norm.Frobenius);\\n double verify_normFrobenius = MatrixTestCommon.verifyNormFrobenius(m1);\\n gap = normFrobenius - verify_normFrobenius;\\n LOG.info(\\\"Norm Frobenius : \\\" + normFrobenius + \\\"(map/reduce) - \\\" + verify_normFrobenius + \\\" expected\\\");\\n LOG.info(\\\"Norm Frobenius : gap \\\" + gap);\\n assertTrue(gap < 0.000001 && gap > -0.000001);\\n public void testSetRow() throws IOException {\\n }\\n\\n public void testSetColumn() throws IOException {\\n Vector v = new DenseVector();\\n double[] entries = new double[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };\\n\\n for (int i = 0; i < SIZE; i++) {\\n v.set(i, entries[i]);\\n }\\n Iterator it = m1.getColumn(SIZE).iterator();\\n\\n int i = 0;\\n while (it.hasNext()) {\\n assertEquals(entries[i], ((DoubleEntry) it.next()).getValue());\\n i++;\\n }\\n }\\n\\n public void testJacobiEigenValue() throws IOException {\\n // copy Matrix m5 to the array\\n double[][] S = new double[SIZE][SIZE];\\n \\n for (int i = 0; i < SIZE; i++) {\\n for (int j = 0; j < SIZE; j++) {\\n S[i][j] = m5.get(i, j);\\n }\\n }\\n \\n // do m/r jacobi eigen value computation\\n DenseMatrix dm = (DenseMatrix)m5;\\n dm.jacobiEigenValue(3);\\n \\n // do jacobi egien value over S array\\n int i, j, k, l, m, state;\\n double s, c, t, p, y;\\n double e1, e2;\\n // index array\\n int[] ind = new int[SIZE];\\n boolean[] changed = new boolean[SIZE];\\n \\n // output\\n double[] e = new double[SIZE];\\n double[][] E = new double[SIZE][SIZE];\\n \\n // init e & E; ind & changed\\n for(i=0; i 0) {\\n // find index(k, l) for pivot p\\n m = 0;\\n for(k = 1; k <= SIZE-2; k++) {\\n if(Math.abs(S[m][ind[m]]) < Math.abs(S[k][ind[k]])) {\\n m = k;\\n }\\n }\\n \\n k = m; l = ind[m]; p = S[k][l];\\n \\n // calculate c = cos, s = sin\\n y = (e[l] - e[k]) / 2;\\n t = Math.abs(y) + Math.sqrt(p * p + y * y);\\n s = Math.sqrt(p * p + t * t);\\n c = t / s;\\n s = p / s;\\n t = (p * p) / t;\\n if(y < 0) {\\n s = -s;\\n t = -t;\\n }\\n \\n S[k][l] = 0.0;\\n state = update(e, changed, k, -t, state);\\n state = update(e, changed, l, t, state);\\n \\n for(i = 0; i <= k-1; i++) \\n rotate(S, i, k, i, l, c, s);\\n \\n for(i = l+1; i < SIZE; i++)\\n rotate(S, k, i, l, i, c, s);\\n \\n for(i = k+1; i <= l-1; i++)\\n rotate(S, k, i, i, l, c, s);\\n \\n // rotate eigenvectors\\n for(i = 0; i < SIZE; i++) {\\n e1 = E[k][i];\\n e2 = E[l][i];\\n \\n E[k][i] = c * e1 - s * e2;\\n E[l][i] = s * e1 + c * e2;\\n }\\n \\n ind[k] = maxind(S, k, SIZE);\\n ind[l] = maxind(S, l, SIZE);\\n \\n loops --;\\n }\\n \\n // verify the results\\n assertTrue(dm.verifyEigenValue(e, E));\\n }\\n\\n public void testEnsureForAddition() {\\n try {\\n m1.add(m4);\\n fail(\\\"Matrix-Addition should be failed while rows and columns aren't same.\\\");\\n } catch (IOException e) {\\n LOG.info(e.toString());\\n }\\n }\\n\\n public void testEnsureForMultiplication() {\\n try {\\n m1.mult(m4);\\n fail(\\\"Matrix-Mult should be failed while A.columns!=B.rows.\\\");\\n } catch (IOException e) {\\n LOG.info(e.toString());\\n }\\n }\\n \\n public void testLoadSave() throws IOException {\\n String path1 = m1.getPath();\\n // save m1 to aliase1\\n m1.save(aliase1);\\n // load matrix m1 using aliase1\\n DenseMatrix loadTest = new DenseMatrix(conf, aliase1, false);\\n for (int i = 0; i < SIZE; i++) {\\n for (int j = 0; j < SIZE; j++) {\\n assertEquals(m1.get(i, j), loadTest.get(i, j));\\n }\\n }\\n\\n assertEquals(path1, loadTest.getPath());\\n // close loadTest, it just disconnect to the table but didn't delete it.\\n loadTest.close();\\n\\n // try to close m1 & load matrix m1 using aliase1 again.\\n m1.close();\\n DenseMatrix loadTest2 = new DenseMatrix(conf, aliase1, false);\\n assertEquals(path1, loadTest2.getPath());\\n // remove aliase1\\n // because loadTest2 connect the aliase1, so we just remove aliase entry\\n // but didn't delete the table.\\n hamaAdmin.delete(aliase1);\\n assertEquals(true, admin.tableExists(path1));\\n // close loadTest2, because it is the last one who reference table 'path1'\\n // it will do the gc!\\n loadTest2.close();\\n assertEquals(false, admin.tableExists(path1));\\n\\n // if we try to load non-existed matrix using aliase name, it should fail.\\n DenseMatrix loadTest3 = null;\\n try {\\n loadTest3 = new DenseMatrix(conf, aliase1, false);\\n fail(\\\"Try to load a non-existed matrix should fail!\\\");\\n } catch (IOException e) {\\n\\n } finally {\\n if (loadTest3 != null)\\n loadTest3.close();\\n \\n public void testForceCreate() throws IOException {\\n String path2 = m2.getPath();\\n // save m2 to aliase2\\n m2.save(aliase2);\\n // load matrix m2 using aliase2\\n DenseMatrix loadTest = new DenseMatrix(conf, aliase2, false);\\n\\n for (int i = 0; i < loadTest.getRows(); i++) {\\n for (int j = 0; j < loadTest.getColumns(); j++) {\\n assertEquals(m2.get(i, j), loadTest.get(i, j));\\n }\\n }\\n\\n assertEquals(path2, loadTest.getPath());\\n\\n Matrix test = hamaAdmin.getMatrix(aliase2);\\n assertEquals(test.getType(), \\\"DenseMatrix\\\");\\n \\n // force to create matrix loadTest2 using aliasename 'aliase2'\\n DenseMatrix loadTest2 = new DenseMatrix(conf, aliase2, true);\\n String loadPath2 = loadTest2.getPath();\\n assertFalse(path2.equals(loadPath2));\\n assertEquals(loadPath2, hamaAdmin.getPath(aliase2));\\n assertFalse(path2.equals(hamaAdmin.getPath(aliase2)));\\n\\n // try to close m2 & loadTest, it table will be deleted finally\\n m2.close();\\n assertEquals(true, admin.tableExists(path2));\\n loadTest.close();\\n assertEquals(false, admin.tableExists(path2));\\n\\n // remove 'aliase2' & close loadTest2\\n loadTest2.close();\\n assertEquals(true, admin.tableExists(loadPath2));\\n hamaAdmin.delete(aliase2);\\n assertEquals(false, admin.tableExists(loadPath2));\\n }\\n \\n //index of largest off-diagonal element in row k\\n int maxind(double[][] S, int row, int size) {\\n int m = row + 1;\\n for(int i=row + 2; i Math.abs(S[row][m]))\\n m = i;\\n }\\n return m;\\n }\\n \\n int update(double[] e, boolean[] changed, int row, double value, int state) {\\n double y = e[row];\\n e[row] += value;\\n \\n if(changed[row] && y == e[row]) {\\n changed[row] = false;\\n return state - 1;\\n } else if(!changed[row] && y != e[row]) {\\n changed[row] = true;\\n return state + 1;\\n } else\\n return state;\\n }\\n \\n void rotate(double[][] S, int k, int l, int i, int j, double c, double s) {\\n double s1 = S[k][l], s2 = S[i][j];\\n S[k][l] = c * s1 - s * s2;\\n S[i][j] = s * s1 + c * s2;\\n }\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseMatrix.java\",\n \"implementation\": \"TestSetup setup = new TestSetup(new TestSuite(TestDenseMatrix.class)) {\\n protected void setUp() throws Exception {\\n HCluster hCluster = new HCluster();\\n hCluster.setUp();\\n\\n conf = hCluster.getConf();\\n admin = new HBaseAdmin(conf);\\n hamaAdmin = new HamaAdminImpl(conf, admin);\\n\\n m1 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n m2 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n m3 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n m4 = DenseMatrix.random(hCluster.getConf(), SIZE-2, SIZE-2);\\n m5 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\",\n \"signature\": \"Test suite()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseMatrix.java\",\n \"implementation\": \"try {\\n closeTest();\",\n \"signature\": \"void tearDown()\"\n },\n {\n \"arguments\": [\n \"int i = 0; i < 3; i++\"\n ],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseMatrix.java\",\n \"implementation\": \"for (int j = 0; j < 3; j++) {\\n for (int k = 0; k < 4; k++) {\\n C[i][j] += m1.get(i + 2, k + 2) * m2.get(k, j);\",\n \"signature\": \"B\\n for (int i = 0; i < 3; i++)\"\n },\n {\n \"arguments\": [\n \"i=0; i 0\"\n ],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseMatrix.java\",\n \"implementation\": \"// find index(k, l) for pivot p\\n m = 0;\\n for(k = 1; k <= SIZE-2; k++) {\\n if(Math.abs(S[m][ind[m]]) < Math.abs(S[k][ind[k]])) {\\n m = k;\",\n \"signature\": \"rotation\\n while(state != 0 && loops > 0)\"\n },\n {\n \"arguments\": [\n \"i = 0; i < SIZE; i++\"\n ],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseMatrix.java\",\n \"implementation\": \"e1 = E[k][i];\\n e2 = E[l][i];\\n \\n E[k][i] = c * e1 - s * e2;\\n E[l][i] = s * e1 + c * e2;\",\n \"signature\": \"eigenvectors\\n for(i = 0; i < SIZE; i++)\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseMatrix.java\",\n \"implementation\": \"try {\\n m1.add(m4);\\n fail(\\\"Matrix-Addition should be failed while rows and columns aren't same.\\\");\",\n \"signature\": \"void testEnsureForAddition()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseMatrix.java\",\n \"implementation\": \"try {\\n m1.mult(m4);\\n fail(\\\"Matrix-Mult should be failed while A.columns!=B.rows.\\\");\",\n \"signature\": \"void testEnsureForMultiplication()\"\n },\n {\n \"arguments\": [\n \"double[][] S\",\n \" int row\",\n \" int size\"\n ],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseMatrix.java\",\n \"implementation\": \"int m = row + 1;\\n for(int i=row + 2; i Math.abs(S[row][m]))\\n m = i;\",\n \"signature\": \"int maxind(double[][] S, int row, int size)\"\n },\n {\n \"arguments\": [\n \"double[] e\",\n \" boolean[] changed\",\n \" int row\",\n \" double value\",\n \" int state\"\n ],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseMatrix.java\",\n \"implementation\": \"double y = e[row];\\n e[row] += value;\\n \\n if(changed[row] && y == e[row]) {\\n changed[row] = false;\\n return state - 1;\",\n \"signature\": \"int update(double[] e, boolean[] changed, int row, double value, int state)\"\n },\n {\n \"arguments\": [\n \"!changed[row] && y != e[row]\"\n ],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseMatrix.java\",\n \"implementation\": \"changed[row] = true;\\n return state + 1;\",\n \"signature\": \"else if(!changed[row] && y != e[row])\"\n },\n {\n \"arguments\": [\n \"double[][] S\",\n \" int k\",\n \" int l\",\n \" int i\",\n \" int j\",\n \" double c\",\n \" double s\"\n ],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseMatrix.java\",\n \"implementation\": \"double s1 = S[k][l], s2 = S[i][j];\\n S[k][l] = c * s1 - s * s2;\\n S[i][j] = s * s1 + c * s2;\",\n \"signature\": \"void rotate(double[][] S, int k, int l, int i, int j, double c, double s)\"\n }\n ],\n \"patch\": \"@@ -20,158 +20,80 @@\\n package org.apache.hama.matrix;\\n \\n import java.io.IOException;\\n+import java.io.UnsupportedEncodingException;\\n import java.util.Iterator;\\n \\n-import junit.extensions.TestSetup;\\n-import junit.framework.Test;\\n-import junit.framework.TestCase;\\n-import junit.framework.TestSuite;\\n-\\n-import org.apache.hadoop.hbase.client.HBaseAdmin;\\n import org.apache.hadoop.io.Writable;\\n-import org.apache.hama.HamaAdmin;\\n-import org.apache.hama.HamaAdminImpl;\\n+import org.apache.hama.HamaCluster;\\n import org.apache.hama.HamaConfiguration;\\n import org.apache.hama.io.DoubleEntry;\\n-import org.apache.hama.matrix.Matrix.Norm;\\n import org.apache.hama.util.RandomVariable;\\n import org.apache.log4j.Logger;\\n \\n /**\\n * Matrix test\\n */\\n-public class TestDenseMatrix extends TestCase {\\n+public class TestDenseMatrix extends HamaCluster {\\n static final Logger LOG = Logger.getLogger(TestDenseMatrix.class);\\n- private static int SIZE = 10;\\n- private static Matrix m1;\\n- private static Matrix m2;\\n- private static Matrix m3;\\n- private static Matrix m4, m5;\\n- private final static String aliase1 = \\\"matrix_aliase_A\\\";\\n- private final static String aliase2 = \\\"matrix_aliase_B\\\";\\n- private static HamaConfiguration conf;\\n- private static HBaseAdmin admin;\\n- private static HamaAdmin hamaAdmin;\\n-\\n- public static Test suite() {\\n- TestSetup setup = new TestSetup(new TestSuite(TestDenseMatrix.class)) {\\n- protected void setUp() throws Exception {\\n- HCluster hCluster = new HCluster();\\n- hCluster.setUp();\\n-\\n- conf = hCluster.getConf();\\n- admin = new HBaseAdmin(conf);\\n- hamaAdmin = new HamaAdminImpl(conf, admin);\\n-\\n- m1 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n- m2 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n- m3 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n- m4 = DenseMatrix.random(hCluster.getConf(), SIZE-2, SIZE-2);\\n- m5 = DenseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n- }\\n-\\n- protected void tearDown() {\\n- try {\\n- closeTest();\\n- } catch (IOException e) {\\n- e.printStackTrace();\\n- }\\n- }\\n- };\\n- return setup;\\n- }\\n-\\n- public static void closeTest() throws IOException {\\n- m1.close();\\n- m2.close();\\n- }\\n-\\n- public void testEntryAdd() throws IOException {\\n- double origin = m1.get(1, 1);\\n- m1.add(1, 1, 0.5);\\n-\\n- assertEquals(m1.get(1, 1), origin + 0.5);\\n- }\\n-\\n- public void testGet() throws IOException {\\n- boolean ex = false;\\n- try {\\n- m1.get(SIZE + 1, SIZE + 1);\\n- } catch (ArrayIndexOutOfBoundsException e) {\\n- ex = true;\\n- }\\n- assertTrue(ex);\\n- assertTrue(m1.get(0, 0) > 0);\\n- }\\n- \\n- public void testTranspose() throws IOException {\\n- DenseMatrix trans = (DenseMatrix) m1.transpose();\\n- for(int i = 0; i < trans.getRows(); i++) {\\n- for(int j = 0; j < trans.getColumns(); j++) {\\n- assertEquals(trans.get(i, j), m1.get(j, i));\\n- }\\n- }\\n- }\\n+ private int SIZE = 10;\\n+ private Matrix m1;\\n+ private Matrix m2;\\n+ private HamaConfiguration conf;\\n \\n /**\\n- * Column vector test.\\n- * \\n- * @param rand\\n- * @throws IOException\\n+ * @throws UnsupportedEncodingException\\n */\\n- public void testGetColumn() throws IOException {\\n- Vector v = m1.getColumn(0);\\n- Iterator it = v.iterator();\\n- int x = 0;\\n- while (it.hasNext()) {\\n- assertEquals(m1.get(x, 0), ((DoubleEntry) it.next()).getValue());\\n- x++;\\n- }\\n+ public TestDenseMatrix() throws UnsupportedEncodingException {\\n+ super();\\n }\\n \\n- public void testGetSetAttribute() throws IOException {\\n- m1.setRowLabel(0, \\\"row1\\\");\\n- assertEquals(m1.getRowLabel(0), \\\"row1\\\");\\n- assertEquals(m1.getRowLabel(1), null);\\n-\\n- m1.setColumnLabel(0, \\\"column1\\\");\\n- assertEquals(m1.getColumnLabel(0), \\\"column1\\\");\\n- assertEquals(m1.getColumnLabel(1), null);\\n- }\\n+ public void setUp() throws Exception {\\n+ super.setUp();\\n \\n- public void testSubMatrix() throws IOException {\\n- SubMatrix a = m1.subMatrix(2, 4, 2, 5); // A : 3 * 4\\n- for (int i = 0; i < a.getRows(); i++) {\\n- for (int j = 0; j < a.getColumns(); j++) {\\n- assertEquals(a.get(i, j), m1.get(i + 2, j + 2));\\n- }\\n- }\\n+ conf = getConf();\\n \\n- SubMatrix b = m2.subMatrix(0, 3, 0, 2); // B : 4 * 3\\n- SubMatrix c = a.mult(b);\\n+ m1 = DenseMatrix.random(conf, SIZE, SIZE);\\n+ m2 = DenseMatrix.random(conf, SIZE, SIZE);\\n+ }\\n \\n- double[][] C = new double[3][3]; // A * B\\n- for (int i = 0; i < 3; i++) {\\n- for (int j = 0; j < 3; j++) {\\n- for (int k = 0; k < 4; k++) {\\n- C[i][j] += m1.get(i + 2, k + 2) * m2.get(k, j);\\n- }\\n- }\\n+ public void testAddMult() throws IOException {\\n+ Matrix m3 = DenseMatrix.random(conf, SIZE, SIZE);\\n+ Matrix m4 = DenseMatrix.random(conf, SIZE - 2, SIZE - 2);\\n+ try {\\n+ m1.add(m4);\\n+ fail(\\\"Matrix-Addition should be failed while rows and columns aren't same.\\\");\\n+ } catch (IOException e) {\\n+ LOG.info(e.toString());\\n }\\n \\n- for (int i = 0; i < 3; i++) {\\n- for (int j = 0; j < 3; j++) {\\n- assertEquals(C[i][j], c.get(i, j));\\n- }\\n+ try {\\n+ m1.mult(m4);\\n+ fail(\\\"Matrix-Mult should be failed while A.columns!=B.rows.\\\");\\n+ } catch (IOException e) {\\n+ LOG.info(e.toString());\\n }\\n+ \\n+ double origin = m1.get(1, 1);\\n+ m1.add(1, 1, 0.5);\\n+ assertEquals(m1.get(1, 1), origin + 0.5);\\n+ \\n+ matrixAdd(m1, m2);\\n+ multMatrixAdd(m1, m2, m3);\\n+ matrixMult(m1, m2);\\n+ addAlphaMatrix(m1, m2);\\n+ \\n+ getRowColumn();\\n+ setRowColumn();\\n+ setMatrix(m1);\\n+ setAlphaMatrix(m1);\\n }\\n \\n /**\\n * Test matrices addition\\n * \\n * @throws IOException\\n */\\n- public void testMatrixAdd() throws IOException {\\n+ public void matrixAdd(Matrix m1, Matrix m2) throws IOException {\\n Matrix result = m1.add(m2);\\n \\n assertEquals(result.getRows(), SIZE);\\n@@ -193,15 +115,16 @@ public void testMatrixAdd() throws IOException {\\n }\\n }\\n \\n- public void testMultiMatrixAdd() throws IOException {\\n- Matrix result = ((DenseMatrix)m1).add(m2, m3);\\n- \\n+ public void multMatrixAdd(Matrix m1, Matrix m2, Matrix m3) throws IOException {\\n+ Matrix result = ((DenseMatrix) m1).add(m2, m3);\\n+\\n assertEquals(result.getRows(), SIZE);\\n assertEquals(result.getColumns(), SIZE);\\n- \\n+\\n for (int i = 0; i < SIZE; i++) {\\n for (int j = 0; j < SIZE; j++) {\\n- assertEquals(result.get(i, j), m1.get(i, j) + m2.get(i, j) + m3.get(i, j));\\n+ assertEquals(result.get(i, j), m1.get(i, j) + m2.get(i, j)\\n+ + m3.get(i, j));\\n }\\n }\\n }\\n@@ -211,7 +134,7 @@ public void testMultiMatrixAdd() throws IOException {\\n * \\n * @throws IOException\\n */\\n- public void testMatrixMult() throws IOException {\\n+ public void matrixMult(Matrix m1, Matrix m2) throws IOException {\\n Matrix result = m1.mult(m2);\\n \\n assertEquals(result.getRows(), SIZE);\\n@@ -220,7 +143,13 @@ public void testMatrixMult() throws IOException {\\n verifyMultResult(m1, m2, result);\\n }\\n \\n- public void testSetMatrix() throws IOException {\\n+ public void addAlphaMatrix(Matrix m1, Matrix m2) throws IOException {\\n+ double value = m1.get(0, 0) + (m2.get(0, 0) * 0.1);\\n+ Matrix result = m1.add(0.1, m2);\\n+ assertEquals(value, result.get(0, 0));\\n+ }\\n+ \\n+ public void setMatrix(Matrix m1) throws IOException {\\n Matrix a = new DenseMatrix(conf, m1.getRows(), m1.getColumns());\\n a.set(m1);\\n \\n@@ -232,53 +161,45 @@ public void testSetMatrix() throws IOException {\\n }\\n }\\n \\n- public void testSetAlphaMatrix() throws IOException {\\n+ public void setAlphaMatrix(Matrix m1) throws IOException {\\n Matrix a = new DenseMatrix(conf, m1.getRows(), m1.getColumns());\\n a.set(0.5, m1);\\n- \\n+\\n for (int i = 0; i < 5; i++) {\\n int x = RandomVariable.randInt(0, SIZE - 1);\\n int y = RandomVariable.randInt(0, SIZE - 1);\\n assertEquals(a.get(x, y), (m1.get(x, y) * 0.5));\\n }\\n }\\n- \\n- public void testAddAlphaMatrix() throws IOException {\\n- double value = m1.get(0, 0) + (m2.get(0, 0) * 0.1);\\n- Matrix result = m1.add(0.1, m2);\\n- assertEquals(value, result.get(0, 0));\\n- }\\n- \\n- public void testNorm() throws IOException {\\n- double gap = 0.000001;\\n- \\n- double norm1 = m1.norm(Norm.One);\\n- double verify_norm1 = MatrixTestCommon.verifyNorm1(m1);\\n- gap = norm1 - verify_norm1;\\n- LOG.info(\\\"Norm One : gap \\\" + gap);\\n- assertTrue(gap < 0.000001 && gap > -0.000001);\\n- \\n- double normInfinity = m1.norm(Norm.Infinity);\\n- double verify_normInf = MatrixTestCommon.verifyNormInfinity(m1);\\n- gap = normInfinity - verify_normInf;\\n- LOG.info(\\\"Norm Infinity : gap \\\" + gap);\\n- assertTrue(gap < 0.000001 && gap > -0.000001);\\n+\\n+ public void getRowColumn() throws IOException {\\n+ boolean ex = false;\\n+ try {\\n+ m1.get(SIZE + 1, SIZE + 1);\\n+ } catch (ArrayIndexOutOfBoundsException e) {\\n+ ex = true;\\n+ }\\n+ assertTrue(ex);\\n+ assertTrue(m1.get(0, 0) > 0);\\n \\n- double normMaxValue = m1.norm(Norm.Maxvalue);\\n- double verify_normMV = MatrixTestCommon.verifyNormMaxValue(m1);\\n- gap = normMaxValue - verify_normMV;\\n- LOG.info(\\\"Norm MaxValue : gap \\\" + gap);\\n- assertTrue(gap < 0.000001 && gap > -0.000001);\\n+ Vector v = m1.getColumn(0);\\n+ Iterator it = v.iterator();\\n+ int x = 0;\\n+ while (it.hasNext()) {\\n+ assertEquals(m1.get(x, 0), ((DoubleEntry) it.next()).getValue());\\n+ x++;\\n+ }\\n \\n- double normFrobenius = m1.norm(Norm.Frobenius);\\n- double verify_normFrobenius = MatrixTestCommon.verifyNormFrobenius(m1);\\n- gap = normFrobenius - verify_normFrobenius;\\n- LOG.info(\\\"Norm Frobenius : \\\" + normFrobenius + \\\"(map/reduce) - \\\" + verify_normFrobenius + \\\" expected\\\");\\n- LOG.info(\\\"Norm Frobenius : gap \\\" + gap);\\n- assertTrue(gap < 0.000001 && gap > -0.000001);\\n+ m1.setRowLabel(0, \\\"row1\\\");\\n+ assertEquals(m1.getRowLabel(0), \\\"row1\\\");\\n+ assertEquals(m1.getRowLabel(1), null);\\n+\\n+ m1.setColumnLabel(0, \\\"column1\\\");\\n+ assertEquals(m1.getColumnLabel(0), \\\"column1\\\");\\n+ assertEquals(m1.getColumnLabel(1), null);\\n }\\n \\n- public void testSetRow() throws IOException {\\n+ public void setRowColumn() throws IOException {\\n Vector v = new DenseVector();\\n double[] entries = new double[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };\\n \\n@@ -294,224 +215,16 @@ public void testSetRow() throws IOException {\\n assertEquals(entries[i], ((DoubleEntry) it.next()).getValue());\\n i++;\\n }\\n- }\\n-\\n- public void testSetColumn() throws IOException {\\n- Vector v = new DenseVector();\\n- double[] entries = new double[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };\\n-\\n- for (int i = 0; i < SIZE; i++) {\\n- v.set(i, entries[i]);\\n- }\\n \\n m1.setColumn(SIZE, v);\\n- Iterator it = m1.getColumn(SIZE).iterator();\\n-\\n- int i = 0;\\n- while (it.hasNext()) {\\n- assertEquals(entries[i], ((DoubleEntry) it.next()).getValue());\\n- i++;\\n- }\\n- }\\n-\\n- public void testJacobiEigenValue() throws IOException {\\n- // copy Matrix m5 to the array\\n- double[][] S = new double[SIZE][SIZE];\\n- \\n- for (int i = 0; i < SIZE; i++) {\\n- for (int j = 0; j < SIZE; j++) {\\n- S[i][j] = m5.get(i, j);\\n- }\\n- }\\n- \\n- // do m/r jacobi eigen value computation\\n- DenseMatrix dm = (DenseMatrix)m5;\\n- dm.jacobiEigenValue(3);\\n- \\n- // do jacobi egien value over S array\\n- int i, j, k, l, m, state;\\n- double s, c, t, p, y;\\n- double e1, e2;\\n- // index array\\n- int[] ind = new int[SIZE];\\n- boolean[] changed = new boolean[SIZE];\\n- \\n- // output\\n- double[] e = new double[SIZE];\\n- double[][] E = new double[SIZE][SIZE];\\n- \\n- // init e & E; ind & changed\\n- for(i=0; i 0) {\\n- // find index(k, l) for pivot p\\n- m = 0;\\n- for(k = 1; k <= SIZE-2; k++) {\\n- if(Math.abs(S[m][ind[m]]) < Math.abs(S[k][ind[k]])) {\\n- m = k;\\n- }\\n- }\\n- \\n- k = m; l = ind[m]; p = S[k][l];\\n- \\n- // calculate c = cos, s = sin\\n- y = (e[l] - e[k]) / 2;\\n- t = Math.abs(y) + Math.sqrt(p * p + y * y);\\n- s = Math.sqrt(p * p + t * t);\\n- c = t / s;\\n- s = p / s;\\n- t = (p * p) / t;\\n- if(y < 0) {\\n- s = -s;\\n- t = -t;\\n- }\\n- \\n- S[k][l] = 0.0;\\n- state = update(e, changed, k, -t, state);\\n- state = update(e, changed, l, t, state);\\n- \\n- for(i = 0; i <= k-1; i++) \\n- rotate(S, i, k, i, l, c, s);\\n- \\n- for(i = l+1; i < SIZE; i++)\\n- rotate(S, k, i, l, i, c, s);\\n- \\n- for(i = k+1; i <= l-1; i++)\\n- rotate(S, k, i, i, l, c, s);\\n- \\n- // rotate eigenvectors\\n- for(i = 0; i < SIZE; i++) {\\n- e1 = E[k][i];\\n- e2 = E[l][i];\\n- \\n- E[k][i] = c * e1 - s * e2;\\n- E[l][i] = s * e1 + c * e2;\\n- }\\n- \\n- ind[k] = maxind(S, k, SIZE);\\n- ind[l] = maxind(S, l, SIZE);\\n- \\n- loops --;\\n- }\\n- \\n- // verify the results\\n- assertTrue(dm.verifyEigenValue(e, E));\\n- }\\n-\\n- public void testEnsureForAddition() {\\n- try {\\n- m1.add(m4);\\n- fail(\\\"Matrix-Addition should be failed while rows and columns aren't same.\\\");\\n- } catch (IOException e) {\\n- LOG.info(e.toString());\\n- }\\n- }\\n-\\n- public void testEnsureForMultiplication() {\\n- try {\\n- m1.mult(m4);\\n- fail(\\\"Matrix-Mult should be failed while A.columns!=B.rows.\\\");\\n- } catch (IOException e) {\\n- LOG.info(e.toString());\\n- }\\n- }\\n- \\n- public void testLoadSave() throws IOException {\\n- String path1 = m1.getPath();\\n- // save m1 to aliase1\\n- m1.save(aliase1);\\n- // load matrix m1 using aliase1\\n- DenseMatrix loadTest = new DenseMatrix(conf, aliase1, false);\\n+ Iterator it2 = m1.getColumn(SIZE).iterator();\\n \\n- for (int i = 0; i < SIZE; i++) {\\n- for (int j = 0; j < SIZE; j++) {\\n- assertEquals(m1.get(i, j), loadTest.get(i, j));\\n- }\\n- }\\n-\\n- assertEquals(path1, loadTest.getPath());\\n- // close loadTest, it just disconnect to the table but didn't delete it.\\n- loadTest.close();\\n-\\n- // try to close m1 & load matrix m1 using aliase1 again.\\n- m1.close();\\n- DenseMatrix loadTest2 = new DenseMatrix(conf, aliase1, false);\\n- assertEquals(path1, loadTest2.getPath());\\n- // remove aliase1\\n- // because loadTest2 connect the aliase1, so we just remove aliase entry\\n- // but didn't delete the table.\\n- hamaAdmin.delete(aliase1);\\n- assertEquals(true, admin.tableExists(path1));\\n- // close loadTest2, because it is the last one who reference table 'path1'\\n- // it will do the gc!\\n- loadTest2.close();\\n- assertEquals(false, admin.tableExists(path1));\\n-\\n- // if we try to load non-existed matrix using aliase name, it should fail.\\n- DenseMatrix loadTest3 = null;\\n- try {\\n- loadTest3 = new DenseMatrix(conf, aliase1, false);\\n- fail(\\\"Try to load a non-existed matrix should fail!\\\");\\n- } catch (IOException e) {\\n-\\n- } finally {\\n- if (loadTest3 != null)\\n- loadTest3.close();\\n+ int x = 0;\\n+ while (it2.hasNext()) {\\n+ assertEquals(entries[x], ((DoubleEntry) it2.next()).getValue());\\n+ x++;\\n }\\n }\\n- \\n- public void testForceCreate() throws IOException {\\n- String path2 = m2.getPath();\\n- // save m2 to aliase2\\n- m2.save(aliase2);\\n- // load matrix m2 using aliase2\\n- DenseMatrix loadTest = new DenseMatrix(conf, aliase2, false);\\n-\\n- for (int i = 0; i < loadTest.getRows(); i++) {\\n- for (int j = 0; j < loadTest.getColumns(); j++) {\\n- assertEquals(m2.get(i, j), loadTest.get(i, j));\\n- }\\n- }\\n-\\n- assertEquals(path2, loadTest.getPath());\\n-\\n- Matrix test = hamaAdmin.getMatrix(aliase2);\\n- assertEquals(test.getType(), \\\"DenseMatrix\\\");\\n- \\n- // force to create matrix loadTest2 using aliasename 'aliase2'\\n- DenseMatrix loadTest2 = new DenseMatrix(conf, aliase2, true);\\n- String loadPath2 = loadTest2.getPath();\\n- assertFalse(path2.equals(loadPath2));\\n- assertEquals(loadPath2, hamaAdmin.getPath(aliase2));\\n- assertFalse(path2.equals(hamaAdmin.getPath(aliase2)));\\n-\\n- // try to close m2 & loadTest, it table will be deleted finally\\n- m2.close();\\n- assertEquals(true, admin.tableExists(path2));\\n- loadTest.close();\\n- assertEquals(false, admin.tableExists(path2));\\n-\\n- // remove 'aliase2' & close loadTest2\\n- loadTest2.close();\\n- assertEquals(true, admin.tableExists(loadPath2));\\n- hamaAdmin.delete(aliase2);\\n- assertEquals(false, admin.tableExists(loadPath2));\\n- }\\n \\n /**\\n * Verifying multiplication result\\n@@ -539,34 +252,4 @@ private void verifyMultResult(Matrix m1, Matrix m2, Matrix result)\\n }\\n }\\n }\\n- \\n- //index of largest off-diagonal element in row k\\n- int maxind(double[][] S, int row, int size) {\\n- int m = row + 1;\\n- for(int i=row + 2; i Math.abs(S[row][m]))\\n- m = i;\\n- }\\n- return m;\\n- }\\n- \\n- int update(double[] e, boolean[] changed, int row, double value, int state) {\\n- double y = e[row];\\n- e[row] += value;\\n- \\n- if(changed[row] && y == e[row]) {\\n- changed[row] = false;\\n- return state - 1;\\n- } else if(!changed[row] && y != e[row]) {\\n- changed[row] = true;\\n- return state + 1;\\n- } else\\n- return state;\\n- }\\n- \\n- void rotate(double[][] S, int k, int l, int i, int j, double c, double s) {\\n- double s1 = S[k][l], s2 = S[i][j];\\n- S[k][l] = c * s1 - s * s2;\\n- S[i][j] = s * s1 + c * s2;\\n- }\\n }\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseMatrix.java\",\n \"sha\": \"463f6c1a10d2611bb386cdb08ffac4a4cc167fe3\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 204,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseVector.java\",\n \"changes\": 433,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseVector.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 229,\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"new_code\": \"/**\\n * Copyright 2007 The Apache Software Foundation\\n *\\n * Licensed to the Apache Software Foundation (ASF) under one\\n * or more contributor license agreements. See the NOTICE file\\n * distributed with this work for additional information\\n * regarding copyright ownership. The ASF licenses this file\\n * to you under the Apache License, Version 2.0 (the\\n * \\\"License\\\"); you may not use this file except in compliance\\n * with the License. You may obtain a copy of the License at\\n *\\n * http://www.apache.org/licenses/LICENSE-2.0\\n *\\n * Unless required by applicable law or agreed to in writing, software\\n * distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\n * See the License for the specific language governing permissions and\\n * limitations under the License.\\n */\\npackage org.apache.hama.matrix;\\n\\nimport java.io.IOException;\\nimport java.io.UnsupportedEncodingException;\\nimport java.util.Iterator;\\n\\nimport org.apache.commons.logging.Log;\\nimport org.apache.commons.logging.LogFactory;\\nimport org.apache.hadoop.io.Writable;\\nimport org.apache.hama.HamaCluster;\\nimport org.apache.hama.io.DoubleEntry;\\n\\npublic class TestDenseVector extends HamaCluster {\\n final static Log LOG = LogFactory.getLog(TestDenseVector.class.getName());\\n\\n private final double cosine = 0.6978227007909176;\\n private final double norm1 = 12.0;\\n private final double norm2 = 6.782329983125268;\\n private final double normInf = 5.0;\\n private final double norm2Robust = 6.782329983125269;\\n private double[][] values = { { 2, 5, 1, 4 }, { 4, 1, 3, 3 } };\\n private DenseMatrix m1;\\n private DenseVector v1;\\n private DenseVector v2;\\n private DenseVector smallSize = new DenseVector();\\n\\n /**\\n * @throws UnsupportedEncodingException\\n */\\n public TestDenseVector() throws UnsupportedEncodingException {\\n super();\\n }\\n\\n public void setUp() throws Exception {\\n super.setUp();\\n\\n m1 = new DenseMatrix(getConf(), 2, 4);\\n\\n for (int i = 0; i < 2; i++)\\n for (int j = 0; j < 4; j++)\\n m1.set(i, j, values[i][j]);\\n\\n v1 = m1.getRow(0);\\n v2 = m1.getRow(1);\\n smallSize.set(0, 0.5);\\n }\\n\\n /**\\n * @throws IOException \\n */\\n public void testDenseVector() throws IOException {\\n double cos = v1.dot(v2);\\n assertEquals(cos, cosine);\\n\\n boolean except = false;\\n try {\\n v1.dot(smallSize);\\n } catch (IndexOutOfBoundsException e) {\\n except = true;\\n }\\n \\n assertTrue(except);\\n subVector();\\n \\n assertEquals(norm1, v1.norm(Vector.Norm.One));\\n assertEquals(norm2, v1.norm(Vector.Norm.Two));\\n assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\\n assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\\n\\n getSetTest();\\n add();\\n scalingTest();\\n setTest();\\n clear();\\n }\\n\\n /**\\n * Test scaling\\n */\\n public void scalingTest() {\\n v2.scale(0.5);\\n\\n for (int i = 0; i < v2.size(); i++) {\\n assertEquals(values[1][i] * 0.5, v2.get(i));\\n }\\n }\\n\\n /**\\n * Test get/set methods\\n * @throws IOException \\n */\\n public void getSetTest() throws IOException {\\n assertEquals(v1.get(0), values[0][0]);\\n boolean ex = false;\\n try {\\n v1.get(5);\\n } catch (NullPointerException e) {\\n ex = true;\\n }\\n assertTrue(ex);\\n assertEquals(m1.getColumn(0).size(), 2);\\n }\\n\\n /**\\n * Test add()\\n */\\n public void add() {\\n v1.add(v2);\\n int i = 0;\\n Iterator it = v1.iterator();\\n while (it.hasNext()) {\\n DoubleEntry c = (DoubleEntry) it.next();\\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\\n i++;\\n }\\n\\n v1.add(0.5, v2);\\n int j = 0;\\n Iterator itt = v1.iterator();\\n while (itt.hasNext()) {\\n DoubleEntry c = (DoubleEntry) itt.next();\\n assertEquals(c.getValue(), (values[0][j] + values[1][j]) + (0.5 * values[1][j]));\\n j++;\\n }\\n \\n double old = v1.get(0);\\n v1.add(0, norm1);\\n assertEquals(v1.get(0), old + norm1);\\n \\n boolean except = false;\\n try {\\n v1.add(smallSize);\\n } catch (IndexOutOfBoundsException e) {\\n except = true;\\n }\\n \\n assertTrue(except);\\n \\n except = false;\\n try {\\n v1.add(0.6, smallSize);\\n } catch (IndexOutOfBoundsException e) {\\n except = true;\\n }\\n \\n assertTrue(except);\\n }\\n \\n public void setTest() {\\n v1.set(v2);\\n\\n for(int i = 0; i < v1.size(); i ++) {\\n assertEquals(v2.get(i), v1.get(i));\\n }\\n \\n boolean except = false;\\n try {\\n v1.set(0.6, smallSize);\\n } catch (IndexOutOfBoundsException e) {\\n except = true;\\n }\\n \\n assertTrue(except);\\n }\\n \\n public void subVector() {\\n int start = 2;\\n Vector subVector = v1.subVector(start, v1.size() - 1);\\n Iterator it = subVector.iterator();\\n\\n int i = start;\\n while (it.hasNext()) {\\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\\n i++;\\n }\\n }\\n \\n /**\\n * Clear test\\n */\\n public void clear() {\\n ((DenseVector) v1).clear();\\n assertEquals(v1.size(), 0);\\n }\\n}\",\n \"new_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"v2.scale(0.5);\\n\\n for (int i = 0; i < v2.size(); i++) {\\n assertEquals(values[1][i] * 0.5, v2.get(i));\",\n \"signature\": \"void scalingTest()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"v1.add(v2);\\n int i = 0;\\n Iterator it = v1.iterator();\\n while (it.hasNext()) {\\n DoubleEntry c = (DoubleEntry) it.next();\\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\\n i++;\",\n \"signature\": \"void add()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"v1.set(v2);\\n\\n for(int i = 0; i < v1.size(); i ++) {\\n assertEquals(v2.get(i), v1.get(i));\",\n \"signature\": \"void setTest()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"int start = 2;\\n Vector subVector = v1.subVector(start, v1.size() - 1);\\n Iterator it = subVector.iterator();\\n\\n int i = start;\\n while (it.hasNext()) {\\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\\n i++;\",\n \"signature\": \"void subVector()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"((DenseVector) v1).clear();\\n assertEquals(v1.size(), 0);\",\n \"signature\": \"void clear()\"\n }\n ],\n \"old_code\": \"/**\\r\\n * Copyright 2007 The Apache Software Foundation\\r\\n *\\r\\n * Licensed to the Apache Software Foundation (ASF) under one\\r\\n * or more contributor license agreements. See the NOTICE file\\r\\n * distributed with this work for additional information\\r\\n * regarding copyright ownership. The ASF licenses this file\\r\\n * to you under the Apache License, Version 2.0 (the\\r\\n * \\\"License\\\"); you may not use this file except in compliance\\r\\n * with the License. You may obtain a copy of the License at\\r\\n *\\r\\n * http://www.apache.org/licenses/LICENSE-2.0\\r\\n *\\r\\n * Unless required by applicable law or agreed to in writing, software\\r\\n * distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\r\\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\r\\n * See the License for the specific language governing permissions and\\r\\n * limitations under the License.\\r\\n */\\r\\npackage org.apache.hama.matrix;\\r\\n\\r\\nimport java.io.IOException;\\r\\nimport java.util.Iterator;\\r\\n\\r\\nimport junit.extensions.TestSetup;\\r\\nimport junit.framework.Test;\\r\\nimport junit.framework.TestCase;\\r\\nimport junit.framework.TestSuite;\\r\\n\\r\\nimport org.apache.commons.logging.Log;\\r\\nimport org.apache.commons.logging.LogFactory;\\r\\nimport org.apache.hadoop.io.Writable;\\r\\nimport org.apache.hama.io.DoubleEntry;\\r\\nimport org.apache.hama.matrix.DenseMatrix;\\r\\nimport org.apache.hama.matrix.DenseVector;\\r\\nimport org.apache.hama.matrix.Vector;\\r\\n\\r\\npublic class TestDenseVector extends TestCase {\\r\\n final static Log LOG = LogFactory.getLog(TestDenseVector.class.getName());\\r\\n \\r\\n private static final double cosine = 0.6978227007909176;\\r\\n private static final double norm1 = 12.0;\\r\\n private static final double norm2 = 6.782329983125268;\\r\\n private static final double normInf = 5.0;\\r\\n private static final double norm2Robust = 6.782329983125269;\\r\\n private static double[][] values = { { 2, 5, 1, 4 }, { 4, 1, 3, 3 } };\\r\\n private static DenseMatrix m1;\\r\\n private static DenseVector v1;\\r\\n private static DenseVector v2;\\r\\n private static DenseVector smallSize = new DenseVector();\\r\\n \\r\\n public static Test suite() {\\r\\n TestSetup setup = new TestSetup(new TestSuite(TestDenseVector.class)) {\\r\\n protected void setUp() throws Exception {\\r\\n HCluster hCluster = new HCluster();\\r\\n hCluster.setUp();\\r\\n\\r\\n m1 = new DenseMatrix(hCluster.getConf(), 2, 4);\\r\\n\\r\\n for (int i = 0; i < 2; i++)\\r\\n for (int j = 0; j < 4; j++)\\r\\n m1.set(i, j, values[i][j]);\\r\\n\\r\\n v1 = m1.getRow(0);\\r\\n v2 = m1.getRow(1);\\r\\n smallSize.set(0, 0.5);\\r\\n }\\r\\n\\r\\n protected void tearDown() {\\r\\n LOG.info(\\\"tearDown()\\\");\\r\\n }\\r\\n };\\r\\n return setup;\\r\\n }\\r\\n\\r\\n /**\\r\\n * Test |a| dot |b|\\r\\n */\\r\\n public void testDot() {\\r\\n double cos = v1.dot(v2);\\r\\n assertEquals(cos, cosine);\\r\\n \\r\\n boolean except = false;\\r\\n try {\\r\\n v1.dot(smallSize);\\r\\n } catch (IndexOutOfBoundsException e) {\\r\\n except = true;\\r\\n }\\r\\n \\r\\n assertTrue(except);\\r\\n }\\r\\n\\r\\n public void testSubVector() {\\r\\n int start = 2;\\r\\n Vector subVector = v1.subVector(start, v1.size() - 1);\\r\\n Iterator it = subVector.iterator();\\r\\n\\r\\n int i = start;\\r\\n while (it.hasNext()) {\\r\\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\\r\\n i++;\\r\\n }\\r\\n }\\r\\n\\r\\n /**\\r\\n * Test norm one\\r\\n */\\r\\n public void testNom1() {\\r\\n assertEquals(norm1, v1.norm(Vector.Norm.One));\\r\\n }\\r\\n\\r\\n /**\\r\\n * Test norm two\\r\\n */\\r\\n public void testNom2() {\\r\\n assertEquals(norm2, v1.norm(Vector.Norm.Two));\\r\\n }\\r\\n\\r\\n /**\\r\\n * Test infinity norm\\r\\n */\\r\\n public void testNormInf() {\\r\\n assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\\r\\n }\\r\\n \\r\\n /**\\r\\n * Test infinity norm\\r\\n */\\r\\n public void testNorm2Robust() {\\r\\n assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\\r\\n }\\r\\n \\r\\n /**\\r\\n * Test scaling\\r\\n */\\r\\n public void scalingTest() {\\r\\n v2.scale(0.5);\\r\\n\\r\\n for (int i = 0; i < v2.size(); i++) {\\r\\n assertEquals(values[1][i] * 0.5, v2.get(i));\\r\\n }\\r\\n }\\r\\n\\r\\n /**\\r\\n * Test get/set methods\\r\\n * @throws IOException \\r\\n */\\r\\n public void testGetSet() throws IOException {\\r\\n assertEquals(v1.get(0), values[0][0]);\\r\\n boolean ex = false;\\r\\n try {\\r\\n v1.get(5);\\r\\n } catch (NullPointerException e) {\\r\\n ex = true;\\r\\n }\\r\\n assertTrue(ex);\\r\\n assertEquals(m1.getColumn(0).size(), 2);\\r\\n }\\r\\n\\r\\n /**\\r\\n * Test add()\\r\\n */\\r\\n public void testAdd() {\\r\\n v1.add(v2);\\r\\n int i = 0;\\r\\n Iterator it = v1.iterator();\\r\\n while (it.hasNext()) {\\r\\n DoubleEntry c = (DoubleEntry) it.next();\\r\\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\\r\\n i++;\\r\\n }\\r\\n\\r\\n v1.add(0.5, v2);\\r\\n int j = 0;\\r\\n Iterator itt = v1.iterator();\\r\\n while (itt.hasNext()) {\\r\\n DoubleEntry c = (DoubleEntry) itt.next();\\r\\n assertEquals(c.getValue(), (values[0][j] + values[1][j]) + (0.5 * values[1][j]));\\r\\n j++;\\r\\n }\\r\\n \\r\\n double old = v1.get(0);\\r\\n v1.add(0, norm1);\\r\\n assertEquals(v1.get(0), old + norm1);\\r\\n \\r\\n boolean except = false;\\r\\n try {\\r\\n v1.add(smallSize);\\r\\n } catch (IndexOutOfBoundsException e) {\\r\\n except = true;\\r\\n }\\r\\n \\r\\n assertTrue(except);\\r\\n \\r\\n except = false;\\r\\n try {\\r\\n v1.add(0.6, smallSize);\\r\\n } catch (IndexOutOfBoundsException e) {\\r\\n except = true;\\r\\n }\\r\\n \\r\\n assertTrue(except);\\r\\n }\\r\\n \\r\\n public void testSet() {\\r\\n v1.set(v2);\\r\\n \\r\\n for(int i = 0; i < v1.size(); i ++) {\\r\\n assertEquals(v2.get(i), v1.get(i));\\r\\n }\\r\\n \\r\\n boolean except = false;\\r\\n try {\\r\\n v1.set(0.6, smallSize);\\r\\n } catch (IndexOutOfBoundsException e) {\\r\\n except = true;\\r\\n }\\r\\n \\r\\n assertTrue(except);\\r\\n }\\r\\n \\r\\n /**\\r\\n * Clear test\\r\\n */\\r\\n public void testClear() {\\r\\n ((DenseVector) v1).clear();\\r\\n assertEquals(v1.size(), 0);\\r\\n }\\r\\n}\\r\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"TestSetup setup = new TestSetup(new TestSuite(TestDenseVector.class)) {\\r\\n protected void setUp() throws Exception {\\r\\n HCluster hCluster = new HCluster();\\r\\n hCluster.setUp();\\r\\n\\r\\n m1 = new DenseMatrix(hCluster.getConf(), 2, 4);\\r\\n\\r\\n for (int i = 0; i < 2; i++)\\r\\n for (int j = 0; j < 4; j++)\\r\\n m1.set(i, j, values[i][j]);\\r\\n\\r\\n v1 = m1.getRow(0);\\r\\n v2 = m1.getRow(1);\\r\\n smallSize.set(0, 0.5);\",\n \"signature\": \"Test suite()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"LOG.info(\\\"tearDown()\\\");\",\n \"signature\": \"void tearDown()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"double cos = v1.dot(v2);\\r\\n assertEquals(cos, cosine);\\r\\n \\r\\n boolean except = false;\\r\\n try {\\r\\n v1.dot(smallSize);\",\n \"signature\": \"void testDot()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"int start = 2;\\r\\n Vector subVector = v1.subVector(start, v1.size() - 1);\\r\\n Iterator it = subVector.iterator();\\r\\n\\r\\n int i = start;\\r\\n while (it.hasNext()) {\\r\\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\\r\\n i++;\",\n \"signature\": \"void testSubVector()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"assertEquals(norm1, v1.norm(Vector.Norm.One));\",\n \"signature\": \"void testNom1()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"assertEquals(norm2, v1.norm(Vector.Norm.Two));\",\n \"signature\": \"void testNom2()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\",\n \"signature\": \"void testNormInf()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\",\n \"signature\": \"void testNorm2Robust()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"v2.scale(0.5);\\r\\n\\r\\n for (int i = 0; i < v2.size(); i++) {\\r\\n assertEquals(values[1][i] * 0.5, v2.get(i));\",\n \"signature\": \"void scalingTest()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"v1.add(v2);\\r\\n int i = 0;\\r\\n Iterator it = v1.iterator();\\r\\n while (it.hasNext()) {\\r\\n DoubleEntry c = (DoubleEntry) it.next();\\r\\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\\r\\n i++;\",\n \"signature\": \"void testAdd()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"v1.set(v2);\\r\\n \\r\\n for(int i = 0; i < v1.size(); i ++) {\\r\\n assertEquals(v2.get(i), v1.get(i));\",\n \"signature\": \"void testSet()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestDenseVector.java\",\n \"implementation\": \"((DenseVector) v1).clear();\\r\\n assertEquals(v1.size(), 0);\",\n \"signature\": \"void testClear()\"\n }\n ],\n \"patch\": \"@@ -1,229 +1,204 @@\\n-/**\\r\\n- * Copyright 2007 The Apache Software Foundation\\r\\n- *\\r\\n- * Licensed to the Apache Software Foundation (ASF) under one\\r\\n- * or more contributor license agreements. See the NOTICE file\\r\\n- * distributed with this work for additional information\\r\\n- * regarding copyright ownership. The ASF licenses this file\\r\\n- * to you under the Apache License, Version 2.0 (the\\r\\n- * \\\"License\\\"); you may not use this file except in compliance\\r\\n- * with the License. You may obtain a copy of the License at\\r\\n- *\\r\\n- * http://www.apache.org/licenses/LICENSE-2.0\\r\\n- *\\r\\n- * Unless required by applicable law or agreed to in writing, software\\r\\n- * distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\r\\n- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\r\\n- * See the License for the specific language governing permissions and\\r\\n- * limitations under the License.\\r\\n- */\\r\\n-package org.apache.hama.matrix;\\r\\n-\\r\\n-import java.io.IOException;\\r\\n-import java.util.Iterator;\\r\\n-\\r\\n-import junit.extensions.TestSetup;\\r\\n-import junit.framework.Test;\\r\\n-import junit.framework.TestCase;\\r\\n-import junit.framework.TestSuite;\\r\\n-\\r\\n-import org.apache.commons.logging.Log;\\r\\n-import org.apache.commons.logging.LogFactory;\\r\\n-import org.apache.hadoop.io.Writable;\\r\\n-import org.apache.hama.io.DoubleEntry;\\r\\n-import org.apache.hama.matrix.DenseMatrix;\\r\\n-import org.apache.hama.matrix.DenseVector;\\r\\n-import org.apache.hama.matrix.Vector;\\r\\n-\\r\\n-public class TestDenseVector extends TestCase {\\r\\n- final static Log LOG = LogFactory.getLog(TestDenseVector.class.getName());\\r\\n- \\r\\n- private static final double cosine = 0.6978227007909176;\\r\\n- private static final double norm1 = 12.0;\\r\\n- private static final double norm2 = 6.782329983125268;\\r\\n- private static final double normInf = 5.0;\\r\\n- private static final double norm2Robust = 6.782329983125269;\\r\\n- private static double[][] values = { { 2, 5, 1, 4 }, { 4, 1, 3, 3 } };\\r\\n- private static DenseMatrix m1;\\r\\n- private static DenseVector v1;\\r\\n- private static DenseVector v2;\\r\\n- private static DenseVector smallSize = new DenseVector();\\r\\n- \\r\\n- public static Test suite() {\\r\\n- TestSetup setup = new TestSetup(new TestSuite(TestDenseVector.class)) {\\r\\n- protected void setUp() throws Exception {\\r\\n- HCluster hCluster = new HCluster();\\r\\n- hCluster.setUp();\\r\\n-\\r\\n- m1 = new DenseMatrix(hCluster.getConf(), 2, 4);\\r\\n-\\r\\n- for (int i = 0; i < 2; i++)\\r\\n- for (int j = 0; j < 4; j++)\\r\\n- m1.set(i, j, values[i][j]);\\r\\n-\\r\\n- v1 = m1.getRow(0);\\r\\n- v2 = m1.getRow(1);\\r\\n- smallSize.set(0, 0.5);\\r\\n- }\\r\\n-\\r\\n- protected void tearDown() {\\r\\n- LOG.info(\\\"tearDown()\\\");\\r\\n- }\\r\\n- };\\r\\n- return setup;\\r\\n- }\\r\\n-\\r\\n- /**\\r\\n- * Test |a| dot |b|\\r\\n- */\\r\\n- public void testDot() {\\r\\n- double cos = v1.dot(v2);\\r\\n- assertEquals(cos, cosine);\\r\\n- \\r\\n- boolean except = false;\\r\\n- try {\\r\\n- v1.dot(smallSize);\\r\\n- } catch (IndexOutOfBoundsException e) {\\r\\n- except = true;\\r\\n- }\\r\\n- \\r\\n- assertTrue(except);\\r\\n- }\\r\\n-\\r\\n- public void testSubVector() {\\r\\n- int start = 2;\\r\\n- Vector subVector = v1.subVector(start, v1.size() - 1);\\r\\n- Iterator it = subVector.iterator();\\r\\n-\\r\\n- int i = start;\\r\\n- while (it.hasNext()) {\\r\\n- assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\\r\\n- i++;\\r\\n- }\\r\\n- }\\r\\n-\\r\\n- /**\\r\\n- * Test norm one\\r\\n- */\\r\\n- public void testNom1() {\\r\\n- assertEquals(norm1, v1.norm(Vector.Norm.One));\\r\\n- }\\r\\n-\\r\\n- /**\\r\\n- * Test norm two\\r\\n- */\\r\\n- public void testNom2() {\\r\\n- assertEquals(norm2, v1.norm(Vector.Norm.Two));\\r\\n- }\\r\\n-\\r\\n- /**\\r\\n- * Test infinity norm\\r\\n- */\\r\\n- public void testNormInf() {\\r\\n- assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\\r\\n- }\\r\\n- \\r\\n- /**\\r\\n- * Test infinity norm\\r\\n- */\\r\\n- public void testNorm2Robust() {\\r\\n- assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\\r\\n- }\\r\\n- \\r\\n- /**\\r\\n- * Test scaling\\r\\n- */\\r\\n- public void scalingTest() {\\r\\n- v2.scale(0.5);\\r\\n-\\r\\n- for (int i = 0; i < v2.size(); i++) {\\r\\n- assertEquals(values[1][i] * 0.5, v2.get(i));\\r\\n- }\\r\\n- }\\r\\n-\\r\\n- /**\\r\\n- * Test get/set methods\\r\\n- * @throws IOException \\r\\n- */\\r\\n- public void testGetSet() throws IOException {\\r\\n- assertEquals(v1.get(0), values[0][0]);\\r\\n- boolean ex = false;\\r\\n- try {\\r\\n- v1.get(5);\\r\\n- } catch (NullPointerException e) {\\r\\n- ex = true;\\r\\n- }\\r\\n- assertTrue(ex);\\r\\n- assertEquals(m1.getColumn(0).size(), 2);\\r\\n- }\\r\\n-\\r\\n- /**\\r\\n- * Test add()\\r\\n- */\\r\\n- public void testAdd() {\\r\\n- v1.add(v2);\\r\\n- int i = 0;\\r\\n- Iterator it = v1.iterator();\\r\\n- while (it.hasNext()) {\\r\\n- DoubleEntry c = (DoubleEntry) it.next();\\r\\n- assertEquals(c.getValue(), values[0][i] + values[1][i]);\\r\\n- i++;\\r\\n- }\\r\\n-\\r\\n- v1.add(0.5, v2);\\r\\n- int j = 0;\\r\\n- Iterator itt = v1.iterator();\\r\\n- while (itt.hasNext()) {\\r\\n- DoubleEntry c = (DoubleEntry) itt.next();\\r\\n- assertEquals(c.getValue(), (values[0][j] + values[1][j]) + (0.5 * values[1][j]));\\r\\n- j++;\\r\\n- }\\r\\n- \\r\\n- double old = v1.get(0);\\r\\n- v1.add(0, norm1);\\r\\n- assertEquals(v1.get(0), old + norm1);\\r\\n- \\r\\n- boolean except = false;\\r\\n- try {\\r\\n- v1.add(smallSize);\\r\\n- } catch (IndexOutOfBoundsException e) {\\r\\n- except = true;\\r\\n- }\\r\\n- \\r\\n- assertTrue(except);\\r\\n- \\r\\n- except = false;\\r\\n- try {\\r\\n- v1.add(0.6, smallSize);\\r\\n- } catch (IndexOutOfBoundsException e) {\\r\\n- except = true;\\r\\n- }\\r\\n- \\r\\n- assertTrue(except);\\r\\n- }\\r\\n- \\r\\n- public void testSet() {\\r\\n- v1.set(v2);\\r\\n- \\r\\n- for(int i = 0; i < v1.size(); i ++) {\\r\\n- assertEquals(v2.get(i), v1.get(i));\\r\\n- }\\r\\n- \\r\\n- boolean except = false;\\r\\n- try {\\r\\n- v1.set(0.6, smallSize);\\r\\n- } catch (IndexOutOfBoundsException e) {\\r\\n- except = true;\\r\\n- }\\r\\n- \\r\\n- assertTrue(except);\\r\\n- }\\r\\n- \\r\\n- /**\\r\\n- * Clear test\\r\\n- */\\r\\n- public void testClear() {\\r\\n- ((DenseVector) v1).clear();\\r\\n- assertEquals(v1.size(), 0);\\r\\n- }\\r\\n-}\\r\\n+/**\\n+ * Copyright 2007 The Apache Software Foundation\\n+ *\\n+ * Licensed to the Apache Software Foundation (ASF) under one\\n+ * or more contributor license agreements. See the NOTICE file\\n+ * distributed with this work for additional information\\n+ * regarding copyright ownership. The ASF licenses this file\\n+ * to you under the Apache License, Version 2.0 (the\\n+ * \\\"License\\\"); you may not use this file except in compliance\\n+ * with the License. You may obtain a copy of the License at\\n+ *\\n+ * http://www.apache.org/licenses/LICENSE-2.0\\n+ *\\n+ * Unless required by applicable law or agreed to in writing, software\\n+ * distributed under the License is distributed on an \\\"AS IS\\\" BASIS,\\n+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\\n+ * See the License for the specific language governing permissions and\\n+ * limitations under the License.\\n+ */\\n+package org.apache.hama.matrix;\\n+\\n+import java.io.IOException;\\n+import java.io.UnsupportedEncodingException;\\n+import java.util.Iterator;\\n+\\n+import org.apache.commons.logging.Log;\\n+import org.apache.commons.logging.LogFactory;\\n+import org.apache.hadoop.io.Writable;\\n+import org.apache.hama.HamaCluster;\\n+import org.apache.hama.io.DoubleEntry;\\n+\\n+public class TestDenseVector extends HamaCluster {\\n+ final static Log LOG = LogFactory.getLog(TestDenseVector.class.getName());\\n+\\n+ private final double cosine = 0.6978227007909176;\\n+ private final double norm1 = 12.0;\\n+ private final double norm2 = 6.782329983125268;\\n+ private final double normInf = 5.0;\\n+ private final double norm2Robust = 6.782329983125269;\\n+ private double[][] values = { { 2, 5, 1, 4 }, { 4, 1, 3, 3 } };\\n+ private DenseMatrix m1;\\n+ private DenseVector v1;\\n+ private DenseVector v2;\\n+ private DenseVector smallSize = new DenseVector();\\n+\\n+ /**\\n+ * @throws UnsupportedEncodingException\\n+ */\\n+ public TestDenseVector() throws UnsupportedEncodingException {\\n+ super();\\n+ }\\n+\\n+ public void setUp() throws Exception {\\n+ super.setUp();\\n+\\n+ m1 = new DenseMatrix(getConf(), 2, 4);\\n+\\n+ for (int i = 0; i < 2; i++)\\n+ for (int j = 0; j < 4; j++)\\n+ m1.set(i, j, values[i][j]);\\n+\\n+ v1 = m1.getRow(0);\\n+ v2 = m1.getRow(1);\\n+ smallSize.set(0, 0.5);\\n+ }\\n+\\n+ /**\\n+ * @throws IOException \\n+ */\\n+ public void testDenseVector() throws IOException {\\n+ double cos = v1.dot(v2);\\n+ assertEquals(cos, cosine);\\n+\\n+ boolean except = false;\\n+ try {\\n+ v1.dot(smallSize);\\n+ } catch (IndexOutOfBoundsException e) {\\n+ except = true;\\n+ }\\n+ \\n+ assertTrue(except);\\n+ subVector();\\n+ \\n+ assertEquals(norm1, v1.norm(Vector.Norm.One));\\n+ assertEquals(norm2, v1.norm(Vector.Norm.Two));\\n+ assertEquals(normInf, v1.norm(Vector.Norm.Infinity));\\n+ assertEquals(norm2Robust, v1.norm(Vector.Norm.TwoRobust));\\n+\\n+ getSetTest();\\n+ add();\\n+ scalingTest();\\n+ setTest();\\n+ clear();\\n+ }\\n+\\n+ /**\\n+ * Test scaling\\n+ */\\n+ public void scalingTest() {\\n+ v2.scale(0.5);\\n+\\n+ for (int i = 0; i < v2.size(); i++) {\\n+ assertEquals(values[1][i] * 0.5, v2.get(i));\\n+ }\\n+ }\\n+\\n+ /**\\n+ * Test get/set methods\\n+ * @throws IOException \\n+ */\\n+ public void getSetTest() throws IOException {\\n+ assertEquals(v1.get(0), values[0][0]);\\n+ boolean ex = false;\\n+ try {\\n+ v1.get(5);\\n+ } catch (NullPointerException e) {\\n+ ex = true;\\n+ }\\n+ assertTrue(ex);\\n+ assertEquals(m1.getColumn(0).size(), 2);\\n+ }\\n+\\n+ /**\\n+ * Test add()\\n+ */\\n+ public void add() {\\n+ v1.add(v2);\\n+ int i = 0;\\n+ Iterator it = v1.iterator();\\n+ while (it.hasNext()) {\\n+ DoubleEntry c = (DoubleEntry) it.next();\\n+ assertEquals(c.getValue(), values[0][i] + values[1][i]);\\n+ i++;\\n+ }\\n+\\n+ v1.add(0.5, v2);\\n+ int j = 0;\\n+ Iterator itt = v1.iterator();\\n+ while (itt.hasNext()) {\\n+ DoubleEntry c = (DoubleEntry) itt.next();\\n+ assertEquals(c.getValue(), (values[0][j] + values[1][j]) + (0.5 * values[1][j]));\\n+ j++;\\n+ }\\n+ \\n+ double old = v1.get(0);\\n+ v1.add(0, norm1);\\n+ assertEquals(v1.get(0), old + norm1);\\n+ \\n+ boolean except = false;\\n+ try {\\n+ v1.add(smallSize);\\n+ } catch (IndexOutOfBoundsException e) {\\n+ except = true;\\n+ }\\n+ \\n+ assertTrue(except);\\n+ \\n+ except = false;\\n+ try {\\n+ v1.add(0.6, smallSize);\\n+ } catch (IndexOutOfBoundsException e) {\\n+ except = true;\\n+ }\\n+ \\n+ assertTrue(except);\\n+ }\\n+ \\n+ public void setTest() {\\n+ v1.set(v2);\\n+\\n+ for(int i = 0; i < v1.size(); i ++) {\\n+ assertEquals(v2.get(i), v1.get(i));\\n+ }\\n+ \\n+ boolean except = false;\\n+ try {\\n+ v1.set(0.6, smallSize);\\n+ } catch (IndexOutOfBoundsException e) {\\n+ except = true;\\n+ }\\n+ \\n+ assertTrue(except);\\n+ }\\n+ \\n+ public void subVector() {\\n+ int start = 2;\\n+ Vector subVector = v1.subVector(start, v1.size() - 1);\\n+ Iterator it = subVector.iterator();\\n+\\n+ int i = start;\\n+ while (it.hasNext()) {\\n+ assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\\n+ i++;\\n+ }\\n+ }\\n+ \\n+ /**\\n+ * Clear test\\n+ */\\n+ public void clear() {\\n+ ((DenseVector) v1).clear();\\n+ assertEquals(v1.size(), 0);\\n+ }\\n+}\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestDenseVector.java\",\n \"sha\": \"5abfb33047adfd7dbd1a8699cd5e5f261bf37fea\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 25,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestMatrixVectorMult.java\",\n \"changes\": 66,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestMatrixVectorMult.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 41,\n \"filename\": \"src/test/org/apache/hama/matrix/TestMatrixVectorMult.java\",\n \"new_code\": \"import java.io.UnsupportedEncodingException;\\nimport org.apache.hama.HamaCluster;\\npublic class TestMatrixVectorMult extends HamaCluster {\\n private Matrix m1, m2;\\n private HamaConfiguration conf;\\n private double[][] result = { { 5 }, { 11 } };\\n /**\\n * @throws UnsupportedEncodingException\\n */\\n public TestMatrixVectorMult() throws UnsupportedEncodingException {\\n super();\\n }\\n public void setUp() throws Exception {\\n super.setUp();\\n conf = getConf();\\n m1 = new DenseMatrix(conf, \\\"A\\\", true);\\n m1.setDimension(2, 2);\\n m1.set(0, 0, 1);\\n m1.set(0, 1, 2);\\n m1.set(1, 0, 3);\\n m1.set(1, 1, 4);\\n m2 = new DenseMatrix(conf, \\\"B\\\", true);\\n m2.setDimension(2, 1);\\n m2.set(0, 0, 1);\\n m2.set(1, 0, 2);\",\n \"new_methods\": [],\n \"old_code\": \"import junit.extensions.TestSetup;\\nimport junit.framework.Test;\\nimport junit.framework.TestCase;\\nimport junit.framework.TestSuite;\\n\\npublic class TestMatrixVectorMult extends TestCase {\\n private static Matrix m1;\\n private static Matrix m2;\\n private static HamaConfiguration conf;\\n private static double[][] result = { { 5 }, { 11 } };\\n\\n public static Test suite() {\\n TestSetup setup = new TestSetup(new TestSuite(TestMatrixVectorMult.class)) {\\n protected void setUp() throws Exception {\\n HCluster hCluster = new HCluster();\\n hCluster.setUp();\\n conf = hCluster.getConf();\\n m1 = new DenseMatrix(conf, \\\"A\\\", true);\\n m1.setDimension(2, 2);\\n m1.set(0, 0, 1);\\n m1.set(0, 1, 2);\\n m1.set(1, 0, 3);\\n m1.set(1, 1, 4);\\n m2 = new DenseMatrix(conf, \\\"B\\\", true);\\n m2.setDimension(2, 1);\\n m2.set(0, 0, 1);\\n m2.set(1, 0, 2);\\n }\\n protected void tearDown() {\\n try {\\n closeTest();\\n } catch (IOException e) {\\n e.printStackTrace();\\n }\\n }\\n };\\n return setup;\\n }\\n public static void closeTest() throws IOException {\\n m1.close();\\n m2.close();\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestMatrixVectorMult.java\",\n \"implementation\": \"TestSetup setup = new TestSetup(new TestSuite(TestMatrixVectorMult.class)) {\\n protected void setUp() throws Exception {\\n HCluster hCluster = new HCluster();\\n hCluster.setUp();\\n conf = hCluster.getConf();\\n m1 = new DenseMatrix(conf, \\\"A\\\", true);\\n m1.setDimension(2, 2);\\n m1.set(0, 0, 1);\\n m1.set(0, 1, 2);\\n m1.set(1, 0, 3);\\n m1.set(1, 1, 4);\\n m2 = new DenseMatrix(conf, \\\"B\\\", true);\\n m2.setDimension(2, 1);\\n m2.set(0, 0, 1);\\n m2.set(1, 0, 2);\",\n \"signature\": \"Test suite()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestMatrixVectorMult.java\",\n \"implementation\": \"try {\\n closeTest();\",\n \"signature\": \"void tearDown()\"\n }\n ],\n \"patch\": \"@@ -20,56 +20,40 @@\\n package org.apache.hama.matrix;\\n \\n import java.io.IOException;\\n+import java.io.UnsupportedEncodingException;\\n \\n-import junit.extensions.TestSetup;\\n-import junit.framework.Test;\\n-import junit.framework.TestCase;\\n-import junit.framework.TestSuite;\\n-\\n+import org.apache.hama.HamaCluster;\\n import org.apache.hama.HamaConfiguration;\\n import org.apache.log4j.Logger;\\n \\n-public class TestMatrixVectorMult extends TestCase {\\n+public class TestMatrixVectorMult extends HamaCluster {\\n static final Logger LOG = Logger.getLogger(TestMatrixVectorMult.class);\\n- private static Matrix m1;\\n- private static Matrix m2;\\n- private static HamaConfiguration conf;\\n- private static double[][] result = { { 5 }, { 11 } };\\n-\\n- public static Test suite() {\\n- TestSetup setup = new TestSetup(new TestSuite(TestMatrixVectorMult.class)) {\\n- protected void setUp() throws Exception {\\n- HCluster hCluster = new HCluster();\\n- hCluster.setUp();\\n+ private Matrix m1, m2;\\n+ private HamaConfiguration conf;\\n+ private double[][] result = { { 5 }, { 11 } };\\n \\n- conf = hCluster.getConf();\\n+ /**\\n+ * @throws UnsupportedEncodingException\\n+ */\\n+ public TestMatrixVectorMult() throws UnsupportedEncodingException {\\n+ super();\\n+ }\\n \\n- m1 = new DenseMatrix(conf, \\\"A\\\", true);\\n- m1.setDimension(2, 2);\\n- m1.set(0, 0, 1);\\n- m1.set(0, 1, 2);\\n- m1.set(1, 0, 3);\\n- m1.set(1, 1, 4);\\n- m2 = new DenseMatrix(conf, \\\"B\\\", true);\\n- m2.setDimension(2, 1);\\n- m2.set(0, 0, 1);\\n- m2.set(1, 0, 2);\\n- }\\n+ public void setUp() throws Exception {\\n+ super.setUp();\\n \\n- protected void tearDown() {\\n- try {\\n- closeTest();\\n- } catch (IOException e) {\\n- e.printStackTrace();\\n- }\\n- }\\n- };\\n- return setup;\\n- }\\n+ conf = getConf();\\n \\n- public static void closeTest() throws IOException {\\n- m1.close();\\n- m2.close();\\n+ m1 = new DenseMatrix(conf, \\\"A\\\", true);\\n+ m1.setDimension(2, 2);\\n+ m1.set(0, 0, 1);\\n+ m1.set(0, 1, 2);\\n+ m1.set(1, 0, 3);\\n+ m1.set(1, 1, 4);\\n+ m2 = new DenseMatrix(conf, \\\"B\\\", true);\\n+ m2.setDimension(2, 1);\\n+ m2.set(0, 0, 1);\\n+ m2.set(1, 0, 2);\\n }\\n \\n public void testMatVectorMult() throws IOException {\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestMatrixVectorMult.java\",\n \"sha\": \"e547dfc18dd947678d685721bd988a41037d017f\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 43,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSingularValueDecomposition.java\",\n \"changes\": 88,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSingularValueDecomposition.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 45,\n \"filename\": \"src/test/org/apache/hama/matrix/TestSingularValueDecomposition.java\",\n \"new_code\": \"import java.io.UnsupportedEncodingException;\\nimport org.apache.hadoop.hbase.client.Get;\\nimport org.apache.hama.HamaCluster;\\npublic class TestSingularValueDecomposition extends HamaCluster {\\n static final Logger LOG = Logger\\n .getLogger(TestSingularValueDecomposition.class);\\n private DenseMatrix m1;\\n private HamaConfiguration conf;\\n /**\\n * @throws UnsupportedEncodingException\\n */\\n public TestSingularValueDecomposition() throws UnsupportedEncodingException {\\n super();\\n }\\n public void setUp() throws Exception {\\n super.setUp();\\n conf = getConf();\\n m1 = new DenseMatrix(conf, 2, 2);\\n for (int i = 0; i < 2; i++)\\n for (int j = 0; j < 2; j++)\\n m1.set(i, j, matrixA[i][j]);\\n // Let's assume the A = [4 0; 3-5]\\n private double[][] matrixA = { { 4, 0 }, { 3, -5 } };\\n // A'A = [25 -15; -15 25]\\n private double[][] values = { { 25, -15 }, { -15, 25 } };\\n // Then, eigenvalues of A'A are 10, 40\\n private double[] eigenvalues = { 10, 40 };\\n // And, Singular values are 3.1623, 6.3246\\n private double[] singularvalues = { 3.1622776601683795, 6.324555320336759 };\\n\\n\\n for (int i = 0; i < m1.getRows(); i++) {\\n for (int j = 0; j < m1.getRows(); j++) {\\n\\n for (int x = 0; x < 2; x++) {\\n Get get = new Get(BytesUtil.getRowIndex(x));\\n get.addColumn(Bytes.toBytes(JacobiEigenValue.EIVAL));\\n double eigenvalue = BytesUtil.bytesToDouble(table.get(get).getCellValue()\\n .getValue());\\n\\n // TODO: need to compute the inverse of S, S(-1)\\n // TODO: need to find out the V(T)\\n\",\n \"new_methods\": [],\n \"old_code\": \"import junit.extensions.TestSetup;\\nimport junit.framework.Test;\\nimport junit.framework.TestCase;\\nimport junit.framework.TestSuite;\\n\\npublic class TestSingularValueDecomposition extends TestCase {\\n static final Logger LOG = Logger.getLogger(TestSingularValueDecomposition.class);\\n private static DenseMatrix m1;\\n private static HamaConfiguration conf;\\n // Let's assume the A = [4 0; 3-5]\\n private static double[][] matrixA = {{4, 0}, {3, -5}};\\n // A'A = [25 -15; -15 25]\\n private static double[][] values = { { 25, -15 }, { -15, 25 } };\\n // Then, eigenvalues of A'A are 10, 40 \\n private static double[] eigenvalues = { 10, 40};\\n // And, Singular values are 3.1623, 6.3246\\n private static double[] singularvalues = { 3.1622776601683795, 6.324555320336759 };\\n \\n public static Test suite() {\\n TestSetup setup = new TestSetup(new TestSuite(TestSingularValueDecomposition.class)) {\\n protected void setUp() throws Exception {\\n HCluster hCluster = new HCluster();\\n hCluster.setUp();\\n conf = hCluster.getConf();\\n m1 = new DenseMatrix(conf, 2, 2);\\n for (int i = 0; i < 2; i++)\\n for (int j = 0; j < 2; j++)\\n m1.set(i, j, matrixA[i][j]);\\n }\\n protected void tearDown() {\\n // do nothing\\n }\\n };\\n return setup;\\n \\n for(int i = 0; i < m1.getRows(); i++) {\\n for(int j = 0; j < m1.getRows(); j++) {\\n \\n for(int x=0; x<2; x++) {\\n double eigenvalue = BytesUtil.bytesToDouble(table.get(BytesUtil.getRowIndex(x), \\n Bytes.toBytes(JacobiEigenValue.EIVAL)).getValue());\\n \\n //TODO: need to compute the inverse of S, S(-1)\\n //TODO: need to find out the V(T)\\n \",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestSingularValueDecomposition.java\",\n \"implementation\": \"TestSetup setup = new TestSetup(new TestSuite(TestSingularValueDecomposition.class)) {\\n protected void setUp() throws Exception {\\n HCluster hCluster = new HCluster();\\n hCluster.setUp();\\n conf = hCluster.getConf();\\n m1 = new DenseMatrix(conf, 2, 2);\\n for (int i = 0; i < 2; i++)\\n for (int j = 0; j < 2; j++)\\n m1.set(i, j, matrixA[i][j]);\",\n \"signature\": \"Test suite()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestSingularValueDecomposition.java\",\n \"implementation\": \"// do nothing\",\n \"signature\": \"void tearDown()\"\n }\n ],\n \"patch\": \"@@ -20,77 +20,75 @@\\n package org.apache.hama.matrix;\\n \\n import java.io.IOException;\\n+import java.io.UnsupportedEncodingException;\\n \\n-import junit.extensions.TestSetup;\\n-import junit.framework.Test;\\n-import junit.framework.TestCase;\\n-import junit.framework.TestSuite;\\n-\\n+import org.apache.hadoop.hbase.client.Get;\\n import org.apache.hadoop.hbase.client.HTable;\\n import org.apache.hadoop.hbase.util.Bytes;\\n+import org.apache.hama.HamaCluster;\\n import org.apache.hama.HamaConfiguration;\\n import org.apache.hama.matrix.algebra.JacobiEigenValue;\\n import org.apache.hama.util.BytesUtil;\\n import org.apache.log4j.Logger;\\n \\n-public class TestSingularValueDecomposition extends TestCase {\\n- static final Logger LOG = Logger.getLogger(TestSingularValueDecomposition.class);\\n- private static DenseMatrix m1;\\n- private static HamaConfiguration conf;\\n+public class TestSingularValueDecomposition extends HamaCluster {\\n+ static final Logger LOG = Logger\\n+ .getLogger(TestSingularValueDecomposition.class);\\n+ private DenseMatrix m1;\\n+ private HamaConfiguration conf;\\n \\n- // Let's assume the A = [4 0; 3-5]\\n- private static double[][] matrixA = {{4, 0}, {3, -5}};\\n- // A'A = [25 -15; -15 25]\\n- private static double[][] values = { { 25, -15 }, { -15, 25 } };\\n- // Then, eigenvalues of A'A are 10, 40 \\n- private static double[] eigenvalues = { 10, 40};\\n- // And, Singular values are 3.1623, 6.3246\\n- private static double[] singularvalues = { 3.1622776601683795, 6.324555320336759 };\\n- \\n- public static Test suite() {\\n- TestSetup setup = new TestSetup(new TestSuite(TestSingularValueDecomposition.class)) {\\n- protected void setUp() throws Exception {\\n- HCluster hCluster = new HCluster();\\n- hCluster.setUp();\\n+ /**\\n+ * @throws UnsupportedEncodingException\\n+ */\\n+ public TestSingularValueDecomposition() throws UnsupportedEncodingException {\\n+ super();\\n+ }\\n \\n- conf = hCluster.getConf();\\n- m1 = new DenseMatrix(conf, 2, 2);\\n- for (int i = 0; i < 2; i++)\\n- for (int j = 0; j < 2; j++)\\n- m1.set(i, j, matrixA[i][j]);\\n- }\\n+ public void setUp() throws Exception {\\n+ super.setUp();\\n \\n- protected void tearDown() {\\n- // do nothing\\n- }\\n- };\\n- return setup;\\n+ conf = getConf();\\n+ m1 = new DenseMatrix(conf, 2, 2);\\n+ for (int i = 0; i < 2; i++)\\n+ for (int j = 0; j < 2; j++)\\n+ m1.set(i, j, matrixA[i][j]);\\n }\\n \\n+ // Let's assume the A = [4 0; 3-5]\\n+ private double[][] matrixA = { { 4, 0 }, { 3, -5 } };\\n+ // A'A = [25 -15; -15 25]\\n+ private double[][] values = { { 25, -15 }, { -15, 25 } };\\n+ // Then, eigenvalues of A'A are 10, 40\\n+ private double[] eigenvalues = { 10, 40 };\\n+ // And, Singular values are 3.1623, 6.3246\\n+ private double[] singularvalues = { 3.1622776601683795, 6.324555320336759 };\\n+\\n public void testEigenSingularValues() throws IOException {\\n Matrix aT = m1.transpose();\\n DenseMatrix aTa = (DenseMatrix) aT.mult(m1);\\n- \\n- for(int i = 0; i < m1.getRows(); i++) {\\n- for(int j = 0; j < m1.getRows(); j++) {\\n+\\n+ for (int i = 0; i < m1.getRows(); i++) {\\n+ for (int j = 0; j < m1.getRows(); j++) {\\n assertEquals(aTa.get(i, j), values[i][j]);\\n }\\n }\\n- \\n+\\n // Find the eigen/singular values and vectors of A'A\\n aTa.jacobiEigenValue(1);\\n HTable table = aTa.getHTable();\\n \\n- for(int x=0; x<2; x++) {\\n- double eigenvalue = BytesUtil.bytesToDouble(table.get(BytesUtil.getRowIndex(x), \\n- Bytes.toBytes(JacobiEigenValue.EIVAL)).getValue());\\n+ for (int x = 0; x < 2; x++) {\\n+ Get get = new Get(BytesUtil.getRowIndex(x));\\n+ get.addColumn(Bytes.toBytes(JacobiEigenValue.EIVAL));\\n+ double eigenvalue = BytesUtil.bytesToDouble(table.get(get).getCellValue()\\n+ .getValue());\\n assertTrue(Math.abs(eigenvalues[x] - eigenvalue) < .0000001);\\n assertTrue(Math.abs(Math.pow(eigenvalue, 0.5) - singularvalues[x]) < .0000001);\\n }\\n- \\n- //TODO: need to compute the inverse of S, S(-1)\\n- //TODO: need to find out the V(T)\\n- \\n+\\n+ // TODO: need to compute the inverse of S, S(-1)\\n+ // TODO: need to find out the V(T)\\n+\\n // Therefore, U= AVS'1=[-0.8944 -0.4472; 0.4472 -0.8944]\\n // A = USV'=[4 0; 3 -5]\\n }\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSingularValueDecomposition.java\",\n \"sha\": \"2f5732ddd544ca667283c33d3248d0e164e4b315\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 23,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseMatrix.java\",\n \"changes\": 103,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseMatrix.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 80,\n \"filename\": \"src/test/org/apache/hama/matrix/TestSparseMatrix.java\",\n \"new_code\": \"import java.io.UnsupportedEncodingException;\\nimport org.apache.hama.HamaCluster;\\npublic class TestSparseMatrix extends HamaCluster {\\n private int SIZE = 10;\\n private SparseMatrix m1;\\n private SparseMatrix m2;\\n /**\\n * @throws UnsupportedEncodingException\\n */\\n public TestSparseMatrix() throws UnsupportedEncodingException {\\n super();\\n public void setUp() throws Exception {\\n super.setUp();\\n m1 = SparseMatrix.random(getConf(), SIZE, SIZE);\\n m2 = SparseMatrix.random(getConf(), SIZE, SIZE);\\n public void testMult() throws IOException {\\n assertTrue(m1.getRows() > 0);\\n sparsity();\\n \\n SparseMatrix result = m1.mult(m2);\\n verifyMultResult(m1, m2, result);\\n \\n public void sparsity() throws IOException {\",\n \"new_methods\": [],\n \"old_code\": \"import junit.extensions.TestSetup;\\nimport junit.framework.Test;\\nimport junit.framework.TestCase;\\nimport junit.framework.TestSuite;\\n\\nimport org.apache.hama.matrix.Matrix.Norm;\\npublic class TestSparseMatrix extends TestCase {\\n private static int SIZE = 10;\\n private static SparseMatrix m1;\\n private static SparseMatrix m2;\\n\\n public static Test suite() {\\n TestSetup setup = new TestSetup(new TestSuite(TestSparseMatrix.class)) {\\n protected void setUp() throws Exception {\\n HCluster hCluster = new HCluster();\\n hCluster.setUp();\\n\\n m1 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n m2 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n }\\n protected void tearDown() {\\n try {\\n closeTest();\\n } catch (IOException e) {\\n e.printStackTrace();\\n }\\n }\\n };\\n return setup;\\n public static void closeTest() throws IOException {\\n m1.close();\\n m2.close();\\n public void testTranspose() throws IOException {\\n SparseMatrix trans = (SparseMatrix) m1.transpose();\\n for (int i = 0; i < trans.getRows(); i++) {\\n for (int j = 0; j < trans.getColumns(); j++) {\\n assertEquals(trans.get(i, j), m1.get(j, i));\\n }\\n }\\n\\n public void testSparsity() throws IOException {\\n /**\\n * Test matrices multiplication\\n * \\n * @throws IOException\\n */\\n public void testMatrixMult() throws IOException {\\n SparseMatrix result = m1.mult(m2);\\n verifyMultResult(m1, m2, result);\\n }\\n\\n public void testNorm1() throws IOException {\\n double gap = 0.000001;\\n \\n double norm1 = m1.norm(Norm.One);\\n double verify_norm1 = MatrixTestCommon.verifyNorm1(m1);\\n gap = norm1 - verify_norm1;\\n LOG.info(\\\"Norm One : gap \\\" + gap);\\n assertTrue(gap < 0.000001 && gap > -0.000001);\\n \\n double normInfinity = m1.norm(Norm.Infinity);\\n double verify_normInf = MatrixTestCommon.verifyNormInfinity(m1);\\n gap = normInfinity - verify_normInf;\\n LOG.info(\\\"Norm Infinity : gap \\\" + gap);\\n assertTrue(gap < 0.000001 && gap > -0.000001);\\n \\n double normMaxValue = m1.norm(Norm.Maxvalue);\\n double verify_normMV = MatrixTestCommon.verifyNormMaxValue(m1);\\n gap = normMaxValue - verify_normMV;\\n LOG.info(\\\"Norm MaxValue : gap \\\" + gap);\\n assertTrue(gap < 0.000001 && gap > -0.000001);\\n \\n double normFrobenius = m1.norm(Norm.Frobenius);\\n double verify_normFrobenius = MatrixTestCommon.verifyNormFrobenius(m1);\\n gap = normFrobenius - verify_normFrobenius;\\n LOG.info(\\\"Norm Frobenius : gap \\\" + gap);\\n assertTrue(gap < 0.000001 && gap > -0.000001);\\n }\\n\\n \",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestSparseMatrix.java\",\n \"implementation\": \"TestSetup setup = new TestSetup(new TestSuite(TestSparseMatrix.class)) {\\n protected void setUp() throws Exception {\\n HCluster hCluster = new HCluster();\\n hCluster.setUp();\\n\\n m1 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n m2 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\",\n \"signature\": \"Test suite()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestSparseMatrix.java\",\n \"implementation\": \"try {\\n closeTest();\",\n \"signature\": \"void tearDown()\"\n }\n ],\n \"patch\": \"@@ -20,57 +20,39 @@\\n package org.apache.hama.matrix;\\n \\n import java.io.IOException;\\n+import java.io.UnsupportedEncodingException;\\n \\n-import junit.extensions.TestSetup;\\n-import junit.framework.Test;\\n-import junit.framework.TestCase;\\n-import junit.framework.TestSuite;\\n-\\n-import org.apache.hama.matrix.Matrix.Norm;\\n+import org.apache.hama.HamaCluster;\\n import org.apache.log4j.Logger;\\n \\n-public class TestSparseMatrix extends TestCase {\\n+public class TestSparseMatrix extends HamaCluster {\\n static final Logger LOG = Logger.getLogger(TestSparseMatrix.class);\\n- private static int SIZE = 10;\\n- private static SparseMatrix m1;\\n- private static SparseMatrix m2;\\n-\\n- public static Test suite() {\\n- TestSetup setup = new TestSetup(new TestSuite(TestSparseMatrix.class)) {\\n- protected void setUp() throws Exception {\\n- HCluster hCluster = new HCluster();\\n- hCluster.setUp();\\n-\\n- m1 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n- m2 = SparseMatrix.random(hCluster.getConf(), SIZE, SIZE);\\n- }\\n+ private int SIZE = 10;\\n+ private SparseMatrix m1;\\n+ private SparseMatrix m2;\\n \\n- protected void tearDown() {\\n- try {\\n- closeTest();\\n- } catch (IOException e) {\\n- e.printStackTrace();\\n- }\\n- }\\n- };\\n- return setup;\\n+ /**\\n+ * @throws UnsupportedEncodingException\\n+ */\\n+ public TestSparseMatrix() throws UnsupportedEncodingException {\\n+ super();\\n }\\n \\n- public static void closeTest() throws IOException {\\n- m1.close();\\n- m2.close();\\n+ public void setUp() throws Exception {\\n+ super.setUp();\\n+ m1 = SparseMatrix.random(getConf(), SIZE, SIZE);\\n+ m2 = SparseMatrix.random(getConf(), SIZE, SIZE);\\n }\\n \\n- public void testTranspose() throws IOException {\\n- SparseMatrix trans = (SparseMatrix) m1.transpose();\\n- for (int i = 0; i < trans.getRows(); i++) {\\n- for (int j = 0; j < trans.getColumns(); j++) {\\n- assertEquals(trans.get(i, j), m1.get(j, i));\\n- }\\n- }\\n+ public void testMult() throws IOException {\\n+ assertTrue(m1.getRows() > 0);\\n+ sparsity();\\n+ \\n+ SparseMatrix result = m1.mult(m2);\\n+ verifyMultResult(m1, m2, result);\\n }\\n-\\n- public void testSparsity() throws IOException {\\n+ \\n+ public void sparsity() throws IOException {\\n boolean appeared = false;\\n for (int i = 0; i < m1.getRows(); i++) {\\n for (int j = 0; j < m1.getColumns(); j++) {\\n@@ -82,44 +64,6 @@ public void testSparsity() throws IOException {\\n assertTrue(appeared);\\n }\\n \\n- /**\\n- * Test matrices multiplication\\n- * \\n- * @throws IOException\\n- */\\n- public void testMatrixMult() throws IOException {\\n- SparseMatrix result = m1.mult(m2);\\n- verifyMultResult(m1, m2, result);\\n- }\\n-\\n- public void testNorm1() throws IOException {\\n- double gap = 0.000001;\\n- \\n- double norm1 = m1.norm(Norm.One);\\n- double verify_norm1 = MatrixTestCommon.verifyNorm1(m1);\\n- gap = norm1 - verify_norm1;\\n- LOG.info(\\\"Norm One : gap \\\" + gap);\\n- assertTrue(gap < 0.000001 && gap > -0.000001);\\n- \\n- double normInfinity = m1.norm(Norm.Infinity);\\n- double verify_normInf = MatrixTestCommon.verifyNormInfinity(m1);\\n- gap = normInfinity - verify_normInf;\\n- LOG.info(\\\"Norm Infinity : gap \\\" + gap);\\n- assertTrue(gap < 0.000001 && gap > -0.000001);\\n- \\n- double normMaxValue = m1.norm(Norm.Maxvalue);\\n- double verify_normMV = MatrixTestCommon.verifyNormMaxValue(m1);\\n- gap = normMaxValue - verify_normMV;\\n- LOG.info(\\\"Norm MaxValue : gap \\\" + gap);\\n- assertTrue(gap < 0.000001 && gap > -0.000001);\\n- \\n- double normFrobenius = m1.norm(Norm.Frobenius);\\n- double verify_normFrobenius = MatrixTestCommon.verifyNormFrobenius(m1);\\n- gap = normFrobenius - verify_normFrobenius;\\n- LOG.info(\\\"Norm Frobenius : gap \\\" + gap);\\n- assertTrue(gap < 0.000001 && gap > -0.000001);\\n- }\\n-\\n /**\\n * Verifying multiplication result\\n * \\n@@ -147,5 +91,4 @@ private void verifyMultResult(SparseMatrix m1, SparseMatrix m2,\\n }\\n }\\n }\\n- \\n }\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseMatrix.java\",\n \"sha\": \"f7d19b275967c37c12bdf3dbeb363b9feb41406c\",\n \"status\": \"modified\"\n },\n {\n \"additions\": 36,\n \"blob_url\": \"https://github.com/apache/hama/blob/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseVector.java\",\n \"changes\": 73,\n \"contents_url\": \"https://api.github.com/repos/apache/hama/contents/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseVector.java?ref=42584cd5328fc55a499d318dda6fefff6459242c\",\n \"deletions\": 37,\n \"filename\": \"src/test/org/apache/hama/matrix/TestSparseVector.java\",\n \"new_code\": \"import java.io.UnsupportedEncodingException;\\nimport org.apache.hadoop.hbase.client.Get;\\nimport org.apache.hadoop.hbase.client.Result;\\nimport org.apache.hama.HamaCluster;\\npublic class TestSparseVector extends HamaCluster {\\n private SparseMatrix m1;\\n private SparseVector v1;\\n private SparseVector v2;\\n private double[][] values = { { 2, 0, 0, 4 }, { 0, 0, 3, 3 } };\\n /**\\n * @throws UnsupportedEncodingException\\n */\\n public TestSparseVector() throws UnsupportedEncodingException {\\n super();\\n }\\n public void setUp() throws Exception {\\n super.setUp();\\n m1 = new SparseMatrix(getConf(), 2, 4);\\n for (int i = 0; i < 2; i++)\\n for (int j = 0; j < 4; j++)\\n m1.set(i, j, values[i][j]);\\n v1 = m1.getRow(0);\\n v2 = m1.getRow(1);\\n Get get = new Get(BytesUtil.getRowIndex(0));\\n get.addColumn(BytesUtil.getColumnIndex(1));\\n Result r = table.get(get);\\n assertTrue(r.getCellValue() == null);\\n \\n addTest();\\n\\n public void addTest() {\\n\\n for (int i = 0; i < values[0].length; i++) {\\n for (int i = 0; i < values[0].length; i++) {\\n assertEquals(v1.get(i), (values[0][i] + values[1][i])\\n + (0.5 * values[1][i]));\",\n \"new_methods\": [],\n \"old_code\": \"\\nimport junit.extensions.TestSetup;\\nimport junit.framework.Test;\\nimport junit.framework.TestCase;\\nimport junit.framework.TestSuite;\\nimport org.apache.hadoop.hbase.io.Cell;\\npublic class TestSparseVector extends TestCase {\\n private static SparseMatrix m1;\\n private static SparseVector v1;\\n private static SparseVector v2;\\n private static double[][] values = { { 2, 0, 0, 4 }, { 0, 0, 3, 3 } };\\n\\n public static Test suite() {\\n TestSetup setup = new TestSetup(new TestSuite(TestSparseVector.class)) {\\n protected void setUp() throws Exception {\\n HCluster hCluster = new HCluster();\\n hCluster.setUp();\\n m1 = new SparseMatrix(hCluster.getConf(), 2, 4);\\n for (int i = 0; i < 2; i++)\\n for (int j = 0; j < 4; j++)\\n m1.set(i, j, values[i][j]);\\n v1 = m1.getRow(0);\\n v2 = m1.getRow(1);\\n }\\n protected void tearDown() {\\n LOG.info(\\\"tearDown()\\\");\\n }\\n };\\n return setup;\\n Cell c = table.get(BytesUtil.getRowIndex(0), BytesUtil.getColumnIndex(1));\\n assertTrue(c == null);\\n \\n public void testAdd() {\\n \\n for(int i = 0; i < values[0].length; i++) {\\n for(int i = 0; i < values[0].length; i++) {\\n assertEquals(v1.get(i), (values[0][i] + values[1][i]) + (0.5 * values[1][i]));\",\n \"old_methods\": [\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestSparseVector.java\",\n \"implementation\": \"TestSetup setup = new TestSetup(new TestSuite(TestSparseVector.class)) {\\n protected void setUp() throws Exception {\\n HCluster hCluster = new HCluster();\\n hCluster.setUp();\\n m1 = new SparseMatrix(hCluster.getConf(), 2, 4);\\n for (int i = 0; i < 2; i++)\\n for (int j = 0; j < 4; j++)\\n m1.set(i, j, values[i][j]);\\n v1 = m1.getRow(0);\\n v2 = m1.getRow(1);\",\n \"signature\": \"Test suite()\"\n },\n {\n \"arguments\": [],\n \"filename\": \"src/test/org/apache/hama/matrix/TestSparseVector.java\",\n \"implementation\": \"LOG.info(\\\"tearDown()\\\");\",\n \"signature\": \"void tearDown()\"\n }\n ],\n \"patch\": \"@@ -20,46 +20,40 @@\\n package org.apache.hama.matrix;\\n \\n import java.io.IOException;\\n-\\n-import junit.extensions.TestSetup;\\n-import junit.framework.Test;\\n-import junit.framework.TestCase;\\n-import junit.framework.TestSuite;\\n+import java.io.UnsupportedEncodingException;\\n \\n import org.apache.commons.logging.Log;\\n import org.apache.commons.logging.LogFactory;\\n+import org.apache.hadoop.hbase.client.Get;\\n import org.apache.hadoop.hbase.client.HTable;\\n-import org.apache.hadoop.hbase.io.Cell;\\n+import org.apache.hadoop.hbase.client.Result;\\n+import org.apache.hama.HamaCluster;\\n import org.apache.hama.util.BytesUtil;\\n \\n-public class TestSparseVector extends TestCase {\\n+public class TestSparseVector extends HamaCluster {\\n final static Log LOG = LogFactory.getLog(TestSparseVector.class.getName());\\n- private static SparseMatrix m1;\\n- private static SparseVector v1;\\n- private static SparseVector v2;\\n- private static double[][] values = { { 2, 0, 0, 4 }, { 0, 0, 3, 3 } };\\n-\\n- public static Test suite() {\\n- TestSetup setup = new TestSetup(new TestSuite(TestSparseVector.class)) {\\n- protected void setUp() throws Exception {\\n- HCluster hCluster = new HCluster();\\n- hCluster.setUp();\\n+ private SparseMatrix m1;\\n+ private SparseVector v1;\\n+ private SparseVector v2;\\n+ private double[][] values = { { 2, 0, 0, 4 }, { 0, 0, 3, 3 } };\\n \\n- m1 = new SparseMatrix(hCluster.getConf(), 2, 4);\\n+ /**\\n+ * @throws UnsupportedEncodingException\\n+ */\\n+ public TestSparseVector() throws UnsupportedEncodingException {\\n+ super();\\n+ }\\n \\n- for (int i = 0; i < 2; i++)\\n- for (int j = 0; j < 4; j++)\\n- m1.set(i, j, values[i][j]);\\n+ public void setUp() throws Exception {\\n+ super.setUp();\\n+ m1 = new SparseMatrix(getConf(), 2, 4);\\n \\n- v1 = m1.getRow(0);\\n- v2 = m1.getRow(1);\\n- }\\n+ for (int i = 0; i < 2; i++)\\n+ for (int j = 0; j < 4; j++)\\n+ m1.set(i, j, values[i][j]);\\n \\n- protected void tearDown() {\\n- LOG.info(\\\"tearDown()\\\");\\n- }\\n- };\\n- return setup;\\n+ v1 = m1.getRow(0);\\n+ v2 = m1.getRow(1);\\n }\\n \\n /**\\n@@ -72,23 +66,28 @@ public void testGetSet() throws IOException {\\n assertEquals(v2.get(1), 0.0);\\n \\n HTable table = m1.getHTable();\\n- Cell c = table.get(BytesUtil.getRowIndex(0), BytesUtil.getColumnIndex(1));\\n- assertTrue(c == null);\\n+ Get get = new Get(BytesUtil.getRowIndex(0));\\n+ get.addColumn(BytesUtil.getColumnIndex(1));\\n+ Result r = table.get(get);\\n+ assertTrue(r.getCellValue() == null);\\n+ \\n+ addTest();\\n }\\n- \\n+\\n /**\\n * Test add()\\n */\\n- public void testAdd() {\\n+ public void addTest() {\\n v1.add(v2);\\n- \\n- for(int i = 0; i < values[0].length; i++) {\\n+\\n+ for (int i = 0; i < values[0].length; i++) {\\n assertEquals(v1.get(i), values[0][i] + values[1][i]);\\n }\\n \\n v1.add(0.5, v2);\\n- for(int i = 0; i < values[0].length; i++) {\\n- assertEquals(v1.get(i), (values[0][i] + values[1][i]) + (0.5 * values[1][i]));\\n+ for (int i = 0; i < values[0].length; i++) {\\n+ assertEquals(v1.get(i), (values[0][i] + values[1][i])\\n+ + (0.5 * values[1][i]));\\n }\\n }\\n }\",\n \"raw_url\": \"https://github.com/apache/hama/raw/42584cd5328fc55a499d318dda6fefff6459242c/src%2Ftest%2Forg%2Fapache%2Fhama%2Fmatrix%2FTestSparseVector.java\",\n \"sha\": \"abb2700c8077f6addd68fae88d631138039a2e5a\",\n \"status\": \"modified\"\n }\n]"},"file_patch_count":{"kind":"number","value":16,"string":"16"},"enhanced_diffs":{"kind":"list like","value":[{"name":"apache$hama","new_args":"","new_implementation":"v1.add(v2);\n int i = 0;\n Iterator it = v1.iterator();\n while (it.hasNext()) {\n DoubleEntry c = (DoubleEntry) it.next();\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\n i++;","new_return_type":"void","new_signature":"void add()","old_args":"","old_implementation":"v1.add(v2);\r\n int i = 0;\r\n Iterator it = v1.iterator();\r\n while (it.hasNext()) {\r\n DoubleEntry c = (DoubleEntry) it.next();\r\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\r\n i++;","old_return_type":"void","old_signature":"void testAdd()"},{"name":"apache$hama","new_args":"","new_implementation":"((DenseVector) v1).clear();\n assertEquals(v1.size(), 0);","new_return_type":"void","new_signature":"void clear()","old_args":"","old_implementation":"((DenseVector) v1).clear();\r\n assertEquals(v1.size(), 0);","old_return_type":"void","old_signature":"void testClear()"},{"name":"apache$hama","new_args":"","new_implementation":"v1.set(v2);\n\n for(int i = 0; i < v1.size(); i ++) {\n assertEquals(v2.get(i), v1.get(i));","new_return_type":"void","new_signature":"void setTest()","old_args":"","old_implementation":"v1.set(v2);\r\n \r\n for(int i = 0; i < v1.size(); i ++) {\r\n assertEquals(v2.get(i), v1.get(i));","old_return_type":"void","old_signature":"void testSet()"},{"name":"apache$hama","new_args":"","new_implementation":"int start = 2;\n Vector subVector = v1.subVector(start, v1.size() - 1);\n Iterator it = subVector.iterator();\n\n int i = start;\n while (it.hasNext()) {\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\n i++;","new_return_type":"void","new_signature":"void subVector()","old_args":"","old_implementation":"int start = 2;\r\n Vector subVector = v1.subVector(start, v1.size() - 1);\r\n Iterator it = subVector.iterator();\r\n\r\n int i = start;\r\n while (it.hasNext()) {\r\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\r\n i++;","old_return_type":"void","old_signature":"void testSubVector()"}],"string":"[\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": \"v1.add(v2);\\n int i = 0;\\n Iterator it = v1.iterator();\\n while (it.hasNext()) {\\n DoubleEntry c = (DoubleEntry) it.next();\\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\\n i++;\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void add()\",\n \"old_args\": \"\",\n \"old_implementation\": \"v1.add(v2);\\r\\n int i = 0;\\r\\n Iterator it = v1.iterator();\\r\\n while (it.hasNext()) {\\r\\n DoubleEntry c = (DoubleEntry) it.next();\\r\\n assertEquals(c.getValue(), values[0][i] + values[1][i]);\\r\\n i++;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testAdd()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": \"((DenseVector) v1).clear();\\n assertEquals(v1.size(), 0);\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void clear()\",\n \"old_args\": \"\",\n \"old_implementation\": \"((DenseVector) v1).clear();\\r\\n assertEquals(v1.size(), 0);\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testClear()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": \"v1.set(v2);\\n\\n for(int i = 0; i < v1.size(); i ++) {\\n assertEquals(v2.get(i), v1.get(i));\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void setTest()\",\n \"old_args\": \"\",\n \"old_implementation\": \"v1.set(v2);\\r\\n \\r\\n for(int i = 0; i < v1.size(); i ++) {\\r\\n assertEquals(v2.get(i), v1.get(i));\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testSet()\"\n },\n {\n \"name\": \"apache$hama\",\n \"new_args\": \"\",\n \"new_implementation\": \"int start = 2;\\n Vector subVector = v1.subVector(start, v1.size() - 1);\\n Iterator it = subVector.iterator();\\n\\n int i = start;\\n while (it.hasNext()) {\\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\\n i++;\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void subVector()\",\n \"old_args\": \"\",\n \"old_implementation\": \"int start = 2;\\r\\n Vector subVector = v1.subVector(start, v1.size() - 1);\\r\\n Iterator it = subVector.iterator();\\r\\n\\r\\n int i = start;\\r\\n while (it.hasNext()) {\\r\\n assertEquals(v1.get(i), ((DoubleEntry) it.next()).getValue());\\r\\n i++;\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void testSubVector()\"\n }\n]"},"enhanced_diffs_count":{"kind":"number","value":4,"string":"4"},"diff_count":{"kind":"number","value":16,"string":"16"}}},{"rowIdx":18,"cells":{"commit_sha":{"kind":"string","value":"5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd"},"modifications":{"kind":"list like","value":[{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":"assertThat(fluentWebElement).isInstanceOf(FluentWebElement.class);\n Filter[] filters = new Filter[] {filter1, filter2","new_return_type":"void","new_signature":"void canLoopIntoFluentWebElementAfterASearch()","old_args":"","old_implementation":"Filter[] filters = new Filter[] { filter1, filter2","old_return_type":"void","old_signature":"void can_loop_into_fluentWebElement_after_a_search()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void checkDollarAndIndexWorks()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void check$AndIndexWorks()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void checkDollarWorks()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void check$Works()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void deletagesToWebDriverWhenInitialized()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void deletages_to_webdriver_when_initialized()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void doNotUseOverridableMethodsInAConstructor()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void do_not_use_overridable_methods_in_a_constructor()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void getOrCreateDriverWithDifferentTestClassesCreatesDistinctInstances()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void getOrCreateDriver_with_different_test_classes_creates_distinct_instances()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void getOrCreateDriverWithDifferentTestNamesAndDifferentTestClassAndStrategyOnceCreatesOneInstance()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void getOrCreateDriver_with_different_test_names_and_different_test_class_and_strategy_once_creates_one_instance()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void getOrCreateDriverWithDifferentTestNamesAndDifferentTestClassAndStrategyPerClassCreatesDistinctInstance()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void getOrCreateDriver_with_different_test_names_and_different_test_class_and_strategy_per_class_creates_distinct_instance()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void getOrCreateDriverWithDifferentTestNamesAndStrategyPerClassCreatesOneInstance()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void getOrCreateDriver_with_different_test_names_and_strategy_per_class_creates_one_instance()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void getOrCreateDriverWithDifferentTestNamesCreatesDistinctInstances()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void getOrCreateDriver_with_different_test_names_creates_distinct_instances()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void getOrCreateDriverWithSameTestNamesCreatesOneInstance()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void getOrCreateDriver_with_same_test_names_creates_one_instance()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void isDriverAvailableBehavesAsExpected()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void is_driver_available_behaves_as_expected()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void pagesShouldBeInjected()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void pages_should_be_injected()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void pagesShouldBeInjected()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void pages_should_be_injected()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void pagesShouldBeInjected()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void pages_should_be_injected()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void quitAllShouldQuitAllDrivers()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void quitAll_should_quit_all_drivers()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void registeringAnotherDriverThrowException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void registering_another_driver_throw_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void registeringSameDriverDoesntThrowException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void registering_same_driver_doesnt_throw_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void registeringSameDriverMultipleTimeDoesntThrowException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void registering_same_driver_multiple_time_doesnt_throw_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldConfigureProperly()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_configure_properly()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldExecuteAsyncScriptReturnString()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_executeAsyncScript_return_String()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldExecuteScriptReturnBoolean()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_executeScript_return_Boolean()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldExecuteScriptReturnDouble()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_executeScript_return_Double()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldExecuteScriptReturnList()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_executeScript_return_List()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldExecuteScriptReturnLong()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_executeScript_return_Long()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldExecuteScriptReturnString()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_executeScript_return_String()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldFindAllFindByRetrieveList()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_findAll_findBy_retrieve_list()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldFindAllFindByRetrieveList()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_findAll_findBy_retrieve_list()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldFindByRetrieveElement()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_findBy_retrieve_element()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldFindByRetrieveList()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_findBy_retrieve_list()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldFindByRetrieveList()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_findBy_retrieve_list()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldFindByRetrievedObjectWorkForSeleniumActions()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_findBy_retrieved_object_work_for_selenium_actions()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldGetElementIntoAFrameWithFluentSwitchTo()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_get_element_into_a_frame_with_Fluent_switchTo()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldGetElementIntoAFrameWithFluentSwitchToDefault()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_get_element_into_a_frame_with_Fluent_switchToDefault()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldGetElementIntoAFrameWithFluentSwitchToBis()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_get_element_into_a_frame_with_Fluent_switchTo_bis()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldGetElementIntoAFrameWithNativeInstructions()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_get_element_into_a_frame_with_native_instructions()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void shouldNewWebDriverCreateNewInstances()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void should_new_web_driver_create_new_instances()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testIgnoreAllNegative()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void test_ignoreAll_negative()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testIgnoreAllPositive()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void test_ignoreAll_positive()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testIgnoring1Negative()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void test_ignoring_1_negative()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testIgnoring1Positive()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void test_ignoring_1_positive()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testIgnoring2Negative()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void test_ignoring_2_negative()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testIgnoring2Positive()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void test_ignoring_2_positive()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testInternalFluentWebElementInstantiate()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void test_internal_fluentwebelement_instantiate()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testNoException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void test_no_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testNoException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void test_no_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testNoExceptionWhenInnerClass()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void test_no_exception_when_inner_class()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void testSuperclassFluentWebElementInstantiate()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void test_superclass_fluentwebelement_instantiate()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void titleOfDuckDuckGoShouldContainSearchQueryName()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void title_of_duck_duck_go_should_contain_search_query_name()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenAElementIsNotPresentThenIsNotPresentReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_a_element_is_not_present_then_isNotPresent_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenAElementIsPresentThenIsNotPresentThrowAnException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_a_element_is_present_then_isNotPresent_throw_an_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenBrowserDoNotImplementsJavascriptExecutorThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_browser_do_not_implemets_Javascript_executor_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenBrowserDoesAcceptScreenshotThenNoException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_browser_does_accept_screenshot_then_no_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenBrowserDoesntAcceptScreenshotThenCustomError()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_browser_doesnt_accept_screenshot_then_custom_error()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenBrowserImplementsJavascriptExecutorThenGoToPredicate()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_browser_implemets_Javascript_executor_then_go_to_predicate()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenDefaultSharedDriverThenDriverIsClosedAfterMethodCall()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_default_shared_driver_then_driver_is_closed_after_method_call()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsDisplayedThenAreNotDisplayedThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_displayed_then_areNotDisplayed_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsDisplayedThenAreNotDisplayedThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_displayed_then_areNotDisplayed_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsDisplayedThenIsNotDisplayedThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_displayed_then_isNotDisplayed_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsDisplayedThenIsNotDisplayedThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_displayed_then_isNotDisplayed_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsEnabledThenAreEnabledReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_enabled_then_areEnabled_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsEnabledThenAreEnabledReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_enabled_then_areEnabled_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsEnabledThenIsEnabledReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_enabled_then_isEnabled_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsEnabledThenIsEnabledReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_enabled_then_isEnabled_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotDisplayedThenAreDisplayedThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_displayed_then_areDisplayed_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotDisplayedThenAreDisplayedThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_displayed_then_areDisplayed_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotDisplayedThenAreNotDisplayedReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_displayed_then_areNotDisplayed_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotDisplayedThenAreNotDisplayedReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_displayed_then_areNotDisplayed_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotDisplayedThenIsDisplayedThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_displayed_then_isDisplayed_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotDisplayedThenIsDisplayedThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_displayed_then_isDisplayed_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotDisplayedThenIsNotDisplayedReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_displayed_then_isNotDisplayed_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotDisplayedThenIsNotDisplayedReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_displayed_then_isNotDisplayed_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotDisplayedThenIsPresentReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_displayed_then_isPresent_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotDisplayedThenIsPresentReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_displayed_then_isPresent_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotEnabledThenAreEnabledThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_enabled_then_areEnabled_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotEnabledThenAreEnabledThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_enabled_then_areEnabled_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotEnabledThenIsEnabledThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_enabled_then_isEnabled_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotEnabledThenIsEnabledThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_enabled_then_isEnabled_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotEnabledThenIsNotEnabledReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_enabled_then_isNotEnabled_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotPresentThenAreNotDisplayedReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_present_then_areNotDisplayed_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotPresentThenAreNotDisplayedReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_present_then_areNotDisplayed_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotPresentThenIsNotDisplayedReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_present_then_isNotDisplayed_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsNotPresentThenIsNotDisplayedReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_not_present_then_isNotDisplayed_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsPresentThenAreDisplayedReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_present_then_areDisplayed_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsPresentThenAreDisplayedReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_present_then_areDisplayed_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsPresentThenIsDisplayedReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_present_then_isDisplayed_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenElementIsPresentThenIsDisplayedReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_element_is_present_then_isDisplayed_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenInitFailsTestIsNotCalled()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_init_fails_test_is_not_called()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenNoErrorEverythingIsCalled()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_no_error_everything_is_called()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenSingleElementIsEnabledThenIsEnabledReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_single_element_is_enabled_then_isEnabled_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenSingleElementIsNotEnabledThenIsEnabledThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_single_element_is_not_enabled_then_isEnabled_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenSingleElementIsNotEnabledThenIsNotEnabledReturnTrue()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_single_element_is_not_enabled_then_isNotEnabled_return_true()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenSingleNonexistingElementThenIsEnabledThrowsException()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_single_nonexisting_element_then_isEnabled_throws_exception()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenWebElementInTestThenTheyAreInstanciated()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_web_element_in_test_then_they_are_instanciated()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenWebElementInTestThenTheyAreInstanciated()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_web_element_in_test_then_they_are_instanciated()"},{"name":"fluentlenium$fluentlenium","new_args":"","new_implementation":null,"new_return_type":"void","new_signature":"void whenWebElementInTestThenTheyAreInstanciated()","old_args":"","old_implementation":null,"old_return_type":"void","old_signature":"void when_web_element_in_test_then_they_are_instanciated()"}],"string":"[\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": \"assertThat(fluentWebElement).isInstanceOf(FluentWebElement.class);\\n Filter[] filters = new Filter[] {filter1, filter2\",\n \"new_return_type\": \"void\",\n \"new_signature\": \"void canLoopIntoFluentWebElementAfterASearch()\",\n \"old_args\": \"\",\n \"old_implementation\": \"Filter[] filters = new Filter[] { filter1, filter2\",\n \"old_return_type\": \"void\",\n \"old_signature\": \"void can_loop_into_fluentWebElement_after_a_search()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void checkDollarAndIndexWorks()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void check$AndIndexWorks()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void checkDollarWorks()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void check$Works()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void deletagesToWebDriverWhenInitialized()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void deletages_to_webdriver_when_initialized()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void doNotUseOverridableMethodsInAConstructor()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void do_not_use_overridable_methods_in_a_constructor()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void getOrCreateDriverWithDifferentTestClassesCreatesDistinctInstances()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void getOrCreateDriver_with_different_test_classes_creates_distinct_instances()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void getOrCreateDriverWithDifferentTestNamesAndDifferentTestClassAndStrategyOnceCreatesOneInstance()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void getOrCreateDriver_with_different_test_names_and_different_test_class_and_strategy_once_creates_one_instance()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void getOrCreateDriverWithDifferentTestNamesAndDifferentTestClassAndStrategyPerClassCreatesDistinctInstance()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void getOrCreateDriver_with_different_test_names_and_different_test_class_and_strategy_per_class_creates_distinct_instance()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void getOrCreateDriverWithDifferentTestNamesAndStrategyPerClassCreatesOneInstance()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void getOrCreateDriver_with_different_test_names_and_strategy_per_class_creates_one_instance()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void getOrCreateDriverWithDifferentTestNamesCreatesDistinctInstances()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void getOrCreateDriver_with_different_test_names_creates_distinct_instances()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void getOrCreateDriverWithSameTestNamesCreatesOneInstance()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void getOrCreateDriver_with_same_test_names_creates_one_instance()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void isDriverAvailableBehavesAsExpected()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void is_driver_available_behaves_as_expected()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void pagesShouldBeInjected()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void pages_should_be_injected()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void pagesShouldBeInjected()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void pages_should_be_injected()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void pagesShouldBeInjected()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void pages_should_be_injected()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void quitAllShouldQuitAllDrivers()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void quitAll_should_quit_all_drivers()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void registeringAnotherDriverThrowException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void registering_another_driver_throw_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void registeringSameDriverDoesntThrowException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void registering_same_driver_doesnt_throw_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void registeringSameDriverMultipleTimeDoesntThrowException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void registering_same_driver_multiple_time_doesnt_throw_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldConfigureProperly()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_configure_properly()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldExecuteAsyncScriptReturnString()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_executeAsyncScript_return_String()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldExecuteScriptReturnBoolean()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_executeScript_return_Boolean()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldExecuteScriptReturnDouble()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_executeScript_return_Double()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldExecuteScriptReturnList()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_executeScript_return_List()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldExecuteScriptReturnLong()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_executeScript_return_Long()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldExecuteScriptReturnString()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_executeScript_return_String()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldFindAllFindByRetrieveList()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_findAll_findBy_retrieve_list()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldFindAllFindByRetrieveList()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_findAll_findBy_retrieve_list()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldFindByRetrieveElement()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_findBy_retrieve_element()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldFindByRetrieveList()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_findBy_retrieve_list()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldFindByRetrieveList()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_findBy_retrieve_list()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldFindByRetrievedObjectWorkForSeleniumActions()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_findBy_retrieved_object_work_for_selenium_actions()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldGetElementIntoAFrameWithFluentSwitchTo()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_get_element_into_a_frame_with_Fluent_switchTo()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldGetElementIntoAFrameWithFluentSwitchToDefault()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_get_element_into_a_frame_with_Fluent_switchToDefault()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldGetElementIntoAFrameWithFluentSwitchToBis()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_get_element_into_a_frame_with_Fluent_switchTo_bis()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldGetElementIntoAFrameWithNativeInstructions()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_get_element_into_a_frame_with_native_instructions()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void shouldNewWebDriverCreateNewInstances()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void should_new_web_driver_create_new_instances()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testIgnoreAllNegative()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void test_ignoreAll_negative()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testIgnoreAllPositive()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void test_ignoreAll_positive()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testIgnoring1Negative()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void test_ignoring_1_negative()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testIgnoring1Positive()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void test_ignoring_1_positive()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testIgnoring2Negative()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void test_ignoring_2_negative()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testIgnoring2Positive()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void test_ignoring_2_positive()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testInternalFluentWebElementInstantiate()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void test_internal_fluentwebelement_instantiate()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testNoException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void test_no_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testNoException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void test_no_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testNoExceptionWhenInnerClass()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void test_no_exception_when_inner_class()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void testSuperclassFluentWebElementInstantiate()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void test_superclass_fluentwebelement_instantiate()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void titleOfDuckDuckGoShouldContainSearchQueryName()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void title_of_duck_duck_go_should_contain_search_query_name()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenAElementIsNotPresentThenIsNotPresentReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_a_element_is_not_present_then_isNotPresent_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenAElementIsPresentThenIsNotPresentThrowAnException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_a_element_is_present_then_isNotPresent_throw_an_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenBrowserDoNotImplementsJavascriptExecutorThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_browser_do_not_implemets_Javascript_executor_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenBrowserDoesAcceptScreenshotThenNoException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_browser_does_accept_screenshot_then_no_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenBrowserDoesntAcceptScreenshotThenCustomError()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_browser_doesnt_accept_screenshot_then_custom_error()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenBrowserImplementsJavascriptExecutorThenGoToPredicate()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_browser_implemets_Javascript_executor_then_go_to_predicate()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenDefaultSharedDriverThenDriverIsClosedAfterMethodCall()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_default_shared_driver_then_driver_is_closed_after_method_call()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsDisplayedThenAreNotDisplayedThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_displayed_then_areNotDisplayed_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsDisplayedThenAreNotDisplayedThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_displayed_then_areNotDisplayed_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsDisplayedThenIsNotDisplayedThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_displayed_then_isNotDisplayed_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsDisplayedThenIsNotDisplayedThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_displayed_then_isNotDisplayed_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsEnabledThenAreEnabledReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_enabled_then_areEnabled_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsEnabledThenAreEnabledReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_enabled_then_areEnabled_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsEnabledThenIsEnabledReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_enabled_then_isEnabled_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsEnabledThenIsEnabledReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_enabled_then_isEnabled_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotDisplayedThenAreDisplayedThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_displayed_then_areDisplayed_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotDisplayedThenAreDisplayedThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_displayed_then_areDisplayed_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotDisplayedThenAreNotDisplayedReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_displayed_then_areNotDisplayed_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotDisplayedThenAreNotDisplayedReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_displayed_then_areNotDisplayed_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotDisplayedThenIsDisplayedThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_displayed_then_isDisplayed_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotDisplayedThenIsDisplayedThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_displayed_then_isDisplayed_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotDisplayedThenIsNotDisplayedReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_displayed_then_isNotDisplayed_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotDisplayedThenIsNotDisplayedReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_displayed_then_isNotDisplayed_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotDisplayedThenIsPresentReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_displayed_then_isPresent_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotDisplayedThenIsPresentReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_displayed_then_isPresent_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotEnabledThenAreEnabledThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_enabled_then_areEnabled_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotEnabledThenAreEnabledThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_enabled_then_areEnabled_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotEnabledThenIsEnabledThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_enabled_then_isEnabled_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotEnabledThenIsEnabledThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_enabled_then_isEnabled_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotEnabledThenIsNotEnabledReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_enabled_then_isNotEnabled_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotPresentThenAreNotDisplayedReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_present_then_areNotDisplayed_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotPresentThenAreNotDisplayedReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_present_then_areNotDisplayed_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotPresentThenIsNotDisplayedReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_present_then_isNotDisplayed_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsNotPresentThenIsNotDisplayedReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_not_present_then_isNotDisplayed_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsPresentThenAreDisplayedReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_present_then_areDisplayed_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsPresentThenAreDisplayedReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_present_then_areDisplayed_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsPresentThenIsDisplayedReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_present_then_isDisplayed_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenElementIsPresentThenIsDisplayedReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_element_is_present_then_isDisplayed_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenInitFailsTestIsNotCalled()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_init_fails_test_is_not_called()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenNoErrorEverythingIsCalled()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_no_error_everything_is_called()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenSingleElementIsEnabledThenIsEnabledReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_single_element_is_enabled_then_isEnabled_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenSingleElementIsNotEnabledThenIsEnabledThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_single_element_is_not_enabled_then_isEnabled_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenSingleElementIsNotEnabledThenIsNotEnabledReturnTrue()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_single_element_is_not_enabled_then_isNotEnabled_return_true()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenSingleNonexistingElementThenIsEnabledThrowsException()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_single_nonexisting_element_then_isEnabled_throws_exception()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenWebElementInTestThenTheyAreInstanciated()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_web_element_in_test_then_they_are_instanciated()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenWebElementInTestThenTheyAreInstanciated()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_web_element_in_test_then_they_are_instanciated()\"\n },\n {\n \"name\": \"fluentlenium$fluentlenium\",\n \"new_args\": \"\",\n \"new_implementation\": null,\n \"new_return_type\": \"void\",\n \"new_signature\": \"void whenWebElementInTestThenTheyAreInstanciated()\",\n \"old_args\": \"\",\n \"old_implementation\": null,\n \"old_return_type\": \"void\",\n \"old_signature\": \"void when_web_element_in_test_then_they_are_instanciated()\"\n }\n]"},"files":{"kind":"list like","value":[{"additions":1,"blob_url":"https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/deploy-settings.xml","changes":2,"contents_url":"https://api.github.com/repos/FluentLenium/FluentLenium/contents/deploy-settings.xml?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd","deletions":1,"filename":"deploy-settings.xml","new_code":"","new_methods":[],"old_code":"","old_methods":[],"patch":"@@ -6,4 +6,4 @@\n ${env.CI_DEPLOY_PASSWORD}\n \n \n-\n\\ No newline at end of file\n+","raw_url":"https://github.com/FluentLenium/FluentLenium/raw/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/deploy-settings.xml","sha":"eeedbf9ebbf33ab0c9b8f6f1510899365ba7d7e9","status":"modified"},{"additions":7,"blob_url":"https://github.com/FluentLenium/FluentLenium/blob/5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd/dev-config%2Fcheckstyle%2Ffluentlenium_checks.xml","changes":8,"contents_url":"https://api.github.com/repos/FluentLenium/FluentLenium/contents/dev-config%2Fcheckstyle%2Ffluentlenium_checks.xml?ref=5e015b37c1f051bc98013ea7924b1fdd6bb6c7dd","deletions":1,"filename":"dev-config/checkstyle/fluentlenium_checks.xml","new_code":" \n\n \n \n \n ","new_methods":[],"old_code":" ","old_methods":[],"patch":"@@ -22,6 +22,8 @@\n -->\n \n \n+ \n+\n \n \n \n \n@@ -192,6 +196,8 @@\n \n \n \n+ \n+ \n \n ","new_methods":[],"old_code":"