Commit 0e79c871 authored by andrei's avatar andrei

cleanup for class file editor replacement, restricted BCO to Eclipse 3.2+

parent cd8ec261
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
#Sun Apr 09 20:12:00 EDT 2006
#Tue Oct 03 15:07:33 CEST 2006
eclipse.preferences.version=1
org.eclipse.jdt.core.codeComplete.argumentPrefixes=
org.eclipse.jdt.core.codeComplete.argumentSuffixes=
......@@ -8,20 +8,17 @@ org.eclipse.jdt.core.codeComplete.localPrefixes=
org.eclipse.jdt.core.codeComplete.localSuffixes=
org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.2
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.4
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning
org.eclipse.jdt.core.compiler.problem.deprecation=warning
org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning
org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
org.eclipse.jdt.core.compiler.problem.finalParameterBound=warning
org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
......@@ -35,12 +32,14 @@ org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=private
org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=ignore
org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
......@@ -50,12 +49,12 @@ org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=warning
org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=ignore
org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
org.eclipse.jdt.core.compiler.problem.unusedImport=warning
......@@ -65,7 +64,6 @@ org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=di
org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled
org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.3
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,HIGH
org.eclipse.jdt.core.compiler.taskTags=TODO,FIXME,XXX
......
#Sun Apr 09 20:12:00 EDT 2006
#Tue Apr 11 23:11:33 CEST 2006
comment_clear_blank_lines=true
comment_format_comments=true
comment_format_header=true
......@@ -15,3 +15,4 @@ internal.default.compliance=default
org.eclipse.jdt.ui.exception.name=e
org.eclipse.jdt.ui.gettersetter.use.is=true
org.eclipse.jdt.ui.keywordthis=false
org.eclipse.jdt.ui.overrideannotation=true
......@@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Bytecode Outline Plug-in
Bundle-SymbolicName: de.loskutov.BytecodeOutline;singleton:=true
Bundle-Version: 2.1.1
Bundle-Version: 2.1.3
Bundle-ClassPath: .,
lib/asm-3.0_beta2.jar,
lib/asm-analysis-3.0_beta2.jar,
lib/asm-commons-3.0_beta2.jar,
lib/asm-tree-3.0_beta2.jar,
lib/asm-util-3.0_beta2.jar
lib/asm-3.0.jar,
lib/asm-analysis-3.0.jar,
lib/asm-commons-3.0.jar,
lib/asm-tree-3.0.jar,
lib/asm-util-3.0.jar
Bundle-Activator: de.loskutov.bco.BytecodeOutlinePlugin
Bundle-Vendor: Andrei Loskutov
Bundle-Localization: plugin
......@@ -16,7 +16,6 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.ui.editors,
org.eclipse.core.runtime,
org.eclipse.jface.text,
org.eclipse.core.filebuffers,
org.eclipse.jdt.core,
org.eclipse.ui.workbench.texteditor,
org.eclipse.jdt.ui,
......
plugin.id=de.loskutov.BytecodeOutline
plugin.version=2.1.1
plugin.version=2.1.3
bin.includes = LICENSE.txt,\
README.txt,\
......@@ -10,27 +10,27 @@ bin.includes = LICENSE.txt,\
.,\
about.html,\
lib/,\
lib/asm-3.0_beta2.jar,\
lib/asm-analysis-3.0_beta2.jar,\
lib/asm-commons-3.0_beta2.jar,\
lib/asm-tree-3.0_beta2.jar,\
lib/asm-util-3.0_beta2.jar
lib/asm-3.0.jar,\
lib/asm-analysis-3.0.jar,\
lib/asm-commons-3.0.jar,\
lib/asm-tree-3.0.jar,\
lib/asm-util-3.0.jar
jars.compile.order = .,\
lib/asm-3.0_beta2.jar,\
lib/asm-analysis-3.0_beta2.jar,\
lib/asm-commons-3.0_beta2.jar,\
lib/asm-tree-3.0_beta2.jar,\
lib/asm-util-3.0_beta2.jar
lib/asm-3.0.jar,\
lib/asm-analysis-3.0.jar,\
lib/asm-commons-3.0.jar,\
lib/asm-tree-3.0.jar,\
lib/asm-util-3.0.jar
source.. = src/
output.. = bin/
jars.extra.classpath = lib/asm-3.0_beta2.jar,\
lib/asm-analysis-3.0_beta2.jar,\
lib/asm-commons-3.0_beta2.jar,\
lib/asm-tree-3.0_beta2.jar,\
lib/asm-util-3.0_beta2.jar
source.lib/asm-3.0_beta2.jar =
source.lib/asm-analysis-3.0_beta2.jar =
source.lib/asm-commons-3.0_beta2.jar =
source.lib/asm-tree-3.0_beta2.jar =
source.lib/asm-util-3.0_beta2.jar =
jars.extra.classpath = lib/asm-3.0.jar,\
lib/asm-analysis-3.0.jar,\
lib/asm-commons-3.0.jar,\
lib/asm-tree-3.0.jar,\
lib/asm-util-3.0.jar
source.lib/asm-3.0.jar =
source.lib/asm-analysis-3.0.jar =
source.lib/asm-commons-3.0.jar =
source.lib/asm-tree-3.0.jar =
source.lib/asm-util-3.0.jar =
......@@ -165,11 +165,13 @@
point="org.eclipse.ui.editors">
<editor
class="de.loskutov.bco.editors.BytecodeClassFileEditor"
icon="icons/bytecodeview.gif"
contributorClass="de.loskutov.bco.editors.BytecodeActionBarContributor"
name="Class File Bytecode Viewer"
default="true"
icon="icons/bytecodeview.gif"
id="de.loskutov.bco.editors.BytecodeClassFileEditor"
extensions="class">
name="Class File Bytecode Viewer"
symbolicFontName="org.eclipse.jdt.ui.editors.textfont">
<contentTypeBinding contentTypeId="org.eclipse.jdt.core.javaClass"/>
</editor>
</extension>
<!-- replacement for org.eclipse.debug.ui.actions.RulerToggleBreakpointActionDelegate -->
......@@ -191,4 +193,13 @@
<toc file="doc/toc.xml" primary="true" />
</extension>
<!-- because of org.eclipse.jdt.internal.ui.javaeditor.ClassFileEditor replacement -->
<extension point="org.eclipse.core.runtime.adapters">
<factory
class="org.eclipse.jdt.internal.debug.ui.actions.RetargettableActionAdapterFactory"
adaptableType="de.loskutov.bco.editors.BytecodeClassFileEditor">
<adapter type="org.eclipse.debug.ui.actions.IRunToLineTarget"/>
<adapter type="org.eclipse.debug.ui.actions.IToggleBreakpointsTarget"/>
</factory>
</extension>
</plugin>
......@@ -2,7 +2,7 @@
<feature
id="de.loskutov.BytecodeOutline.feature"
label="Bytecode Outline"
version="2.1.0"
version="2.1.3"
provider-name="Andrei Loskutov">
<description url="http://asm.objectweb.org/eclipse/bco/index.html">
......@@ -38,23 +38,27 @@ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS&apos;&apos; AND
<import plugin="org.eclipse.ui.editors"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.core.filebuffers"/>
<import plugin="org.eclipse.jdt.core"/>
<import plugin="org.eclipse.ui.workbench.texteditor"/>
<import plugin="org.eclipse.jdt.ui"/>
<import plugin="org.eclipse.core.resources"/>
<import plugin="org.eclipse.core.resources" version="3.2.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.compare"/>
<import plugin="org.eclipse.ui.console"/>
<import plugin="org.eclipse.help.base"/>
<import plugin="org.eclipse.help.appserver"/>
<import plugin="org.eclipse.jdt.debug.ui"/>
<import plugin="org.eclipse.debug.ui"/>
<import plugin="org.eclipse.debug.core"/>
<import plugin="org.eclipse.jdt.debug"/>
<import plugin="org.eclipse.ui.views"/>
</requires>
<plugin
id="de.loskutov.BytecodeOutline"
download-size="351"
install-size="351"
version="2.1.0"
download-size="620"
install-size="620"
version="0.0.0"
unpack="false"/>
</feature>
......@@ -3,9 +3,9 @@
<description url="http://asm.objectweb.org/eclipse/bco/index.html">
Bytecode Outline Plugin Update Site
</description>
<feature url="features/de.loskutov.BytecodeOutline.feature_2.1.0.jar" id="de.loskutov.BytecodeOutline.feature" version="2.1.0">
<feature url="features/de.loskutov.BytecodeOutline.feature_2.1.3.jar" id="de.loskutov.BytecodeOutline.feature" version="2.1.3">
<category name="bytecode-outline"/>
</feature>
<archive path="plugins/de.loskutov.BytecodeOutline_2.1.0.jar" url="http://download.forge.objectweb.org/asm/de.loskutov.BytecodeOutline_2.1.0.jar"/>
<archive path="plugins/de.loskutov.BytecodeOutline_2.1.3.jar" url="http://download.forge.objectweb.org/asm/de.loskutov.BytecodeOutline_2.1.3.jar"/>
<category-def name="bytecode-outline" label="Bytecode Outline"/>
</site>
/* $Id: BytecodeClassFileEditor.java,v 1.5 2006-06-05 11:45:48 andrei Exp $ */
/* $Id: BytecodeClassFileEditor.java,v 1.6 2006-11-24 10:14:51 andrei Exp $ */
package de.loskutov.bco.editors;
......@@ -677,8 +677,10 @@ public class BytecodeClassFileEditor extends JavaEditor
protected void updateOccurrenceAnnotations(ITextSelection selection,
CompilationUnit astRoot) {
// disabled as we currently do not support "occurencies" highlighting
// super.updateOccurrenceAnnotations(selection, astRoot);
// disabled for bytecode as we currently do not support "occurencies" highlighting
if(hasMappedSource()) {
super.updateOccurrenceAnnotations(selection, astRoot);
}
}
/**
......@@ -1073,4 +1075,12 @@ public class BytecodeClassFileEditor extends JavaEditor
return null;
}
/*
* @see org.eclipse.jdt.internal.ui.javaeditor.JavaEditor#installOverrideIndicator(boolean)
* @since 3.0
*/
protected void installOverrideIndicator(boolean provideAST) {
super.installOverrideIndicator(true);
}
}
......@@ -718,6 +718,14 @@ public class JdtUtils {
}
if (path == null) {
// check the default location if not already included
IPath def = project.getOutputLocation();
if (def != null && def.isPrefixOf(resource.getFullPath())){
path = def;
}
}
if(path == null){
return dir;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment