Commit a10de589 authored by andrei's avatar andrei

Eclipse 3.4 compatibility fix

parent e646a8c5
......@@ -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.2.3
Bundle-Version: 2.2.4
Bundle-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
lib/asm-3.1.jar,
lib/asm-analysis-3.1.jar,
lib/asm-commons-3.1.jar,
lib/asm-tree-3.1.jar,
lib/asm-util-3.1.jar
Bundle-Activator: de.loskutov.bco.BytecodeOutlinePlugin
Bundle-Vendor: Andrei Loskutov
Bundle-Localization: plugin
......
plugin.id=de.loskutov.BytecodeOutline
plugin.version=2.2.3
plugin.version=2.2.4
bin.includes = LICENSE.txt,\
README.txt,\
......@@ -10,27 +10,27 @@ bin.includes = LICENSE.txt,\
.,\
about.html,\
lib/,\
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
lib/asm-3.1.jar,\
lib/asm-analysis-3.1.jar,\
lib/asm-commons-3.1.jar,\
lib/asm-tree-3.1.jar,\
lib/asm-util-3.1.jar
jars.compile.order = .,\
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
lib/asm-3.1.jar,\
lib/asm-analysis-3.1.jar,\
lib/asm-commons-3.1.jar,\
lib/asm-tree-3.1.jar,\
lib/asm-util-3.1.jar
source.. = src/
output.. = bin/
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 =
jars.extra.classpath = lib/asm-3.1.jar,\
lib/asm-analysis-3.1.jar,\
lib/asm-commons-3.1.jar,\
lib/asm-tree-3.1.jar,\
lib/asm-util-3.1.jar
source.lib/asm-3.1.jar =
source.lib/asm-analysis-3.1.jar =
source.lib/asm-commons-3.1.jar =
source.lib/asm-tree-3.1.jar =
source.lib/asm-util-3.1.jar =
......@@ -177,6 +177,27 @@
</extension>
<extension
point="org.eclipse.ui.editorActions">
<editorContribution
targetID="org.eclipse.jdt.ui.ClassFileEditor"
id="org.eclipse.jdt.internal.ui.ClassFileEditor.ruler.actions2">
<action
label="%JavaSelectRulerAction.label"
class="org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction"
actionID="RulerClick"
id="org.eclipse.jdt.internal.ui.javaeditor.JavaSelectRulerAction2">
</action>
<action
label="%BookmarkRulerAction.label"
helpContextId="org.eclipse.ui.bookmark_action_context"
class="org.eclipse.ui.texteditor.BookmarkRulerAction"
actionID="RulerDoubleClick"
id="org.eclipse.jdt.internal.ui.javaeditor.BookmarkRulerAction2">
</action>
</editorContribution>
</extension>
<extension
point="org.eclipse.ui.editors">
<editor
......
......@@ -2,7 +2,7 @@
<feature
id="de.loskutov.BytecodeOutline.feature"
label="Bytecode Outline"
version="2.2.2"
version="2.2.4"
provider-name="Andrei Loskutov">
<description url="http://asm.objectweb.org/eclipse/bco/index.html">
......@@ -41,7 +41,7 @@ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS&apos;&apos; AND
<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" version="3.3.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.resources" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.ui.ide"/>
<import plugin="org.eclipse.compare"/>
<import plugin="org.eclipse.ui.console"/>
......@@ -56,8 +56,8 @@ THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS&apos;&apos; AND
<plugin
id="de.loskutov.BytecodeOutline"
download-size="620"
install-size="620"
download-size="650"
install-size="650"
version="0.0.0"
unpack="false"/>
......
......@@ -3,15 +3,23 @@
<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.3.jar" id="de.loskutov.BytecodeOutline.feature" version="2.1.3">
<category name="Bytecode Outline for Eclipse 3.1"/>
</feature>
<category-def name="Bytecode Outline for Eclipse 3.1" label="Bytecode Outline for Eclipse 3.2"/>
<archive path="plugins/de.loskutov.BytecodeOutline_2.1.3.jar" url="http://download.forge.objectweb.org/asm/de.loskutov.BytecodeOutline_2.1.3.jar"/>
<feature url="features/de.loskutov.BytecodeOutline.feature_2.2.2.jar" id="de.loskutov.BytecodeOutline.feature" version="2.2.2">
<feature url="features/de.loskutov.BytecodeOutline.feature_2.2.3.jar" id="de.loskutov.BytecodeOutline.feature" version="2.2.3">
<category name="Bytecode Outline for Eclipse 3.3"/>
</feature>
<archive path="plugins/de.loskutov.BytecodeOutline_2.2.2.jar" url="http://download.forge.objectweb.org/asm/de.loskutov.BytecodeOutline_2.2.2.jar"/>
<archive path="plugins/de.loskutov.BytecodeOutline_2.2.3.jar" url="http://download.forge.objectweb.org/asm/de.loskutov.BytecodeOutline_2.2.3.jar"/>
<category-def name="Bytecode Outline for Eclipse 3.3" label="Bytecode Outline for Eclipse 3.3"/>
<feature url="features/de.loskutov.BytecodeOutline.feature_2.2.4.jar" id="de.loskutov.BytecodeOutline.feature" version="2.2.4">
<category name="Bytecode Outline for Eclipse 3.4"/>
</feature>
<archive path="plugins/de.loskutov.BytecodeOutline_2.2.4.jar" url="http://download.forge.objectweb.org/asm/de.loskutov.BytecodeOutline_2.2.4.jar"/>
<category-def name="Bytecode Outline for Eclipse 3.4" label="Bytecode Outline for Eclipse 3.4"/>
</site>
......@@ -171,12 +171,12 @@ public class BytecodeBreakpointAdapter extends ToggleBreakpointAdapter {
}
}
if (!type.isBinary()) {
// resolve the type names
methodSignature = resolveMethodSignature(type, methodSignature);
if (methodSignature == null) {
report(ActionMessages.ManageMethodBreakpointActionDelegate_methodNonAvailable, part);
return Status.OK_STATUS;
}
// TODO resolve the type names
// methodSignature = resolveMethodSignature(type, methodSignature);
// if (methodSignature == null) {
// report(ActionMessages.ManageMethodBreakpointActionDelegate_methodNonAvailable, part);
// return Status.OK_STATUS;
// }
}
createMethodBreakpoint(BreakpointUtils.getBreakpointResource(method), type.getFullyQualifiedName(), methodName, methodSignature, true, false, false, -1, start, end, 0, true, attributes);
} else {
......
......@@ -22,6 +22,7 @@ import java.util.List;
import java.util.jar.JarEntry;
import java.util.jar.JarFile;
import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IFolder;
import org.eclipse.core.resources.IPathVariableManager;
import org.eclipse.core.resources.IProject;
......@@ -779,7 +780,7 @@ public class JdtUtils {
private static boolean isPackageRoot(IJavaProject project, IResource pack)
throws JavaModelException {
boolean isRoot = false;
if (project == null || pack == null) {
if (project == null || pack == null || !(pack instanceof IContainer)) {
return isRoot;
}
IPackageFragmentRoot root = project.getPackageFragmentRoot(pack);
......@@ -1462,4 +1463,4 @@ public class JdtUtils {
}
}
}
}
\ No newline at end of file
}
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