Commit 0d4f2a2c authored by andrei's avatar andrei

Copied 2.2.6 plugin changes from CVS. SVN contains now latest BCO code.

parent 8673327d
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry combineaccessrules="false" kind="src" path="/asm 3.0"/>
<classpathentry kind="src" path="src"/>
<classpathentry excluding="JCL/" kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="**/jdt/internal/**"/>
</accessrules>
</classpathentry>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry excluding="JCL/" kind="src" path="test"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins">
<accessrules>
<accessrule kind="accessible" pattern="**/jdt/internal/**"/>
</accessrules>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/asm3"/>
<classpathentry kind="output" path="output/eclipse"/>
</classpath>
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>de.loskutov.ByteCodeOutline</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
</natures>
</projectDescription>
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>de.loskutov.ByteCodeOutline</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>de.loskutov.FileSync.FSBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>edu.umd.cs.findbugs.plugin.eclipse.findbugsBuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.pde.PluginNature</nature>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>edu.umd.cs.findbugs.plugin.eclipse.findbugsNature</nature>
</natures>
</projectDescription>
This diff is collapsed.
#Sun Feb 11 10:22:10 CET 2007
comment_clear_blank_lines=true
comment_format_comments=true
comment_format_header=true
comment_format_html=true
comment_format_source_code=true
comment_indent_parameter_description=false
comment_indent_root_tags=false
comment_line_length=90
comment_new_line_for_parameter=false
comment_separate_root_tags=false
eclipse.preferences.version=1
formatter_settings_version=11
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
#Mon Sep 15 21:47:03 CEST 2008
cleanup.add_default_serial_version_id=true
cleanup.add_generated_serial_version_id=false
cleanup.add_missing_annotations=false
cleanup.add_missing_deprecated_annotations=true
cleanup.add_missing_methods=false
cleanup.add_missing_nls_tags=false
cleanup.add_missing_override_annotations=true
cleanup.add_serial_version_id=false
cleanup.always_use_blocks=true
cleanup.always_use_parentheses_in_expressions=false
cleanup.always_use_this_for_non_static_field_access=false
cleanup.always_use_this_for_non_static_method_access=false
cleanup.convert_to_enhanced_for_loop=false
cleanup.correct_indentation=true
cleanup.format_source_code=false
cleanup.format_source_code_changes_only=false
cleanup.make_local_variable_final=true
cleanup.make_parameters_final=false
cleanup.make_private_fields_final=true
cleanup.make_type_abstract_if_missing_method=false
cleanup.make_variable_declarations_final=true
cleanup.never_use_blocks=false
cleanup.never_use_parentheses_in_expressions=true
cleanup.organize_imports=true
cleanup.qualify_static_field_accesses_with_declaring_class=false
cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
cleanup.qualify_static_member_accesses_with_declaring_class=true
cleanup.qualify_static_method_accesses_with_declaring_class=false
cleanup.remove_private_constructors=true
cleanup.remove_trailing_whitespaces=true
cleanup.remove_trailing_whitespaces_all=true
cleanup.remove_trailing_whitespaces_ignore_empty=false
cleanup.remove_unnecessary_casts=true
cleanup.remove_unnecessary_nls_tags=true
cleanup.remove_unused_imports=true
cleanup.remove_unused_local_variables=false
cleanup.remove_unused_private_fields=true
cleanup.remove_unused_private_members=false
cleanup.remove_unused_private_methods=true
cleanup.remove_unused_private_types=true
cleanup.sort_members=false
cleanup.sort_members_all=false
cleanup.use_blocks=true
cleanup.use_blocks_only_for_return_and_throw=false
cleanup.use_parentheses_in_expressions=false
cleanup.use_this_for_non_static_field_access=false
cleanup.use_this_for_non_static_field_access_only_if_necessary=true
cleanup.use_this_for_non_static_method_access=false
cleanup.use_this_for_non_static_method_access_only_if_necessary=true
cleanup_profile=_BCO
cleanup_settings_version=2
comment_clear_blank_lines=true
comment_format_comments=true
comment_format_header=true
comment_format_html=true
comment_format_source_code=true
comment_indent_parameter_description=false
comment_indent_root_tags=false
comment_line_length=90
comment_new_line_for_parameter=false
comment_separate_root_tags=false
eclipse.preferences.version=1
editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true
formatter_settings_version=11
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
org.eclipse.jdt.ui.text.custom_code_templates=<?xml version\="1.0" encoding\="UTF-8" standalone\="no"?><templates/>
sp_cleanup.add_default_serial_version_id=true
sp_cleanup.add_generated_serial_version_id=false
sp_cleanup.add_missing_annotations=false
sp_cleanup.add_missing_deprecated_annotations=true
sp_cleanup.add_missing_methods=false
sp_cleanup.add_missing_nls_tags=false
sp_cleanup.add_missing_override_annotations=true
sp_cleanup.add_serial_version_id=false
sp_cleanup.always_use_blocks=true
sp_cleanup.always_use_parentheses_in_expressions=false
sp_cleanup.always_use_this_for_non_static_field_access=false
sp_cleanup.always_use_this_for_non_static_method_access=false
sp_cleanup.convert_to_enhanced_for_loop=false
sp_cleanup.correct_indentation=false
sp_cleanup.format_source_code=false
sp_cleanup.format_source_code_changes_only=false
sp_cleanup.make_local_variable_final=false
sp_cleanup.make_parameters_final=true
sp_cleanup.make_private_fields_final=true
sp_cleanup.make_type_abstract_if_missing_method=false
sp_cleanup.make_variable_declarations_final=true
sp_cleanup.never_use_blocks=false
sp_cleanup.never_use_parentheses_in_expressions=true
sp_cleanup.on_save_use_additional_actions=true
sp_cleanup.organize_imports=true
sp_cleanup.qualify_static_field_accesses_with_declaring_class=false
sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
sp_cleanup.qualify_static_member_accesses_with_declaring_class=true
sp_cleanup.qualify_static_method_accesses_with_declaring_class=false
sp_cleanup.remove_private_constructors=true
sp_cleanup.remove_trailing_whitespaces=true
sp_cleanup.remove_trailing_whitespaces_all=true
sp_cleanup.remove_trailing_whitespaces_ignore_empty=false
sp_cleanup.remove_unnecessary_casts=true
sp_cleanup.remove_unnecessary_nls_tags=true
sp_cleanup.remove_unused_imports=true
sp_cleanup.remove_unused_local_variables=false
sp_cleanup.remove_unused_private_fields=true
sp_cleanup.remove_unused_private_members=false
sp_cleanup.remove_unused_private_methods=true
sp_cleanup.remove_unused_private_types=true
sp_cleanup.sort_members=false
sp_cleanup.sort_members_all=false
sp_cleanup.use_blocks=true
sp_cleanup.use_blocks_only_for_return_and_throw=false
sp_cleanup.use_parentheses_in_expressions=false
sp_cleanup.use_this_for_non_static_field_access=false
sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true
sp_cleanup.use_this_for_non_static_method_access=false
sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true
......@@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Bytecode Outline Plug-in
Bundle-SymbolicName: de.loskutov.BytecodeOutline;singleton:=true
Bundle-Version: 2.2.5
Bundle-Version: 2.2.6
Bundle-ClassPath: .,
lib/asm-3.1.jar,
lib/asm-analysis-3.1.jar,
......
plugin.id=de.loskutov.BytecodeOutline
plugin.version=2.2.5
plugin.version=2.2.6
bin.includes = LICENSE.txt,\
README.txt,\
......
File added
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="de.loskutov.BytecodeOutline.feature"
label="Bytecode Outline"
version="2.2.5"
provider-name="Andrei Loskutov">
<description url="http://asm.objectweb.org/eclipse/bco/index.html">
<?xml version="1.0" encoding="UTF-8"?>
<feature
id="de.loskutov.BytecodeOutline.feature"
label="Bytecode Outline"
version="2.2.6"
provider-name="Andrei Loskutov">
<description url="http://asm.objectweb.org/eclipse/bco/index.html">
Feature contains bytecode outline and bytecode comparison view
for any java/class file.
</description>
<copyright url="..">
for any java/class file.
</description>
<copyright url="..">
Copyright (C)2004-2007 by Andrei Loskutov Loskutov@gmx.de
All rights reserved.
</copyright>
<license>
All rights reserved.
</copyright>
<license>
Copyright (C)2004-2007 by Andrei Loskutov Loskutov@gmx.de
All rights reserved.
......@@ -25,38 +25,38 @@ Redistribution and use in source and binary forms, with or without modification,
2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS&apos;&apos; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</license>
<url>
<update label="ObjectWeb update site" url="http://download.forge.objectweb.org/eclipse-update/site.xml"/>
<discovery label="ObjectWeb update site" url="http://download.forge.objectweb.org/eclipse-update/site.xml"/>
</url>
<requires>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.ui.editors"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.ui.workbench.texteditor"/>
<import plugin="org.eclipse.jdt.ui"/>
<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.jdt.debug"/>
<import plugin="org.eclipse.jdt.core" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.net"/>
</requires>
<plugin
id="de.loskutov.BytecodeOutline"
download-size="650"
install-size="650"
version="2.2.5"
unpack="false"/>
</feature>
THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS&apos;&apos; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</license>
<url>
<update label="ObjectWeb update site" url="http://download.forge.objectweb.org/eclipse-update/site.xml"/>
<discovery label="ObjectWeb update site" url="http://download.forge.objectweb.org/eclipse-update/site.xml"/>
</url>
<requires>
<import plugin="org.eclipse.ui"/>
<import plugin="org.eclipse.ui.editors"/>
<import plugin="org.eclipse.core.runtime"/>
<import plugin="org.eclipse.jface.text"/>
<import plugin="org.eclipse.ui.workbench.texteditor"/>
<import plugin="org.eclipse.jdt.ui"/>
<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.jdt.debug"/>
<import plugin="org.eclipse.jdt.core" version="3.4.0" match="greaterOrEqual"/>
<import plugin="org.eclipse.core.net"/>
</requires>
<plugin
id="de.loskutov.BytecodeOutline"
download-size="710"
install-size="710"
version="2.2.6"
unpack="false"/>
</feature>
<?xml version="1.0" encoding="UTF-8"?>
<site>
<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.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.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.5.jar" id="de.loskutov.BytecodeOutline.feature" version="2.2.5">
<category name="Bytecode Outline for Eclipse 3.4"/>
</feature>
<archive path="plugins/de.loskutov.BytecodeOutline_2.2.5.jar" url="http://download.forge.objectweb.org/asm/de.loskutov.BytecodeOutline_2.2.5.jar"/>
<category-def name="Bytecode Outline for Eclipse 3.4" label="Bytecode Outline for Eclipse 3.4"/>
</site>
<?xml version="1.0" encoding="UTF-8"?>
<site>
<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.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.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.6.jar" id="de.loskutov.BytecodeOutline.feature" version="2.2.6">
<category name="Bytecode Outline for Eclipse 3.4"/>
</feature>
<archive path="plugins/de.loskutov.BytecodeOutline_2.2.6.jar" url="http://download.forge.objectweb.org/asm/de.loskutov.BytecodeOutline_2.2.6.jar"/>
<category-def name="Bytecode Outline for Eclipse 3.4" label="Bytecode Outline for Eclipse 3.4"/>
</site>
......@@ -31,6 +31,9 @@ public class BytecodeOutlinePlugin extends AbstractUIPlugin {
*/
public BytecodeOutlinePlugin() {
super();
if(plugin != null){
throw new IllegalStateException("Bytecode outline plugin is a singleton!");
}
plugin = this;
try {
resourceBundle = ResourceBundle
......@@ -135,4 +138,4 @@ public class BytecodeOutlinePlugin extends AbstractUIPlugin {
}
}
\ No newline at end of file
}
......@@ -371,8 +371,8 @@ public class BytecodeBreakpointAdapter extends ToggleBreakpointAdapter {
Map attributes = new HashMap(10);
if (type == null) {
resource = getResource(editor);
CompilationUnit unit = parseCompilationUnit(editor);
Iterator types = unit.types().iterator();
// CompilationUnit unit = parseCompilationUnit(editor);
// Iterator types = unit.types().iterator();
// TODO unreachable API
// while (types.hasNext()) {
// TypeDeclaration declaration = (TypeDeclaration) types.next();
......
......@@ -64,7 +64,6 @@ public class BytecodeClassFileEditor extends ClassFileEditor
implements
ClassFileDocumentProvider.InputChangeListener {
private Composite fViewerComposite;
private final InputUpdater fInputUpdater;
public static final String ID = "de.loskutov.bco.editors.BytecodeClassFileEditor";
public static final String MARK = "// class version ";
......
package inner;
public class Anon5 {
final static String v15 = "Anon5";
final static String v14 = "Anon5";
{
new Object() {
final static String v15 = "Anon5$3";
final static String v14 = "Anon5$1";
};
}
static {
new Object() {
final static String v15 = "Anon5$3";
final static String v14 = "Anon5$1";
};
}
void instanceMethod1() {
new Object() {
{
new Object() {
final static String v15 = "Anon5$1A3$1";
final static String v14 = "Anon5$11";
};
}
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=167357
final static String v15 = "Anon5$1A3";
final static String v14 = "Anon5$1$A3";
};
}
void instanceMethod2() {
class A3 {
{
new Object() {
final static String v15 = "Anon5$1A3$1";
final static String v14 = "Anon5$5";
};
}
// see https://bugs.eclipse.org/bugs/show_bug.cgi?id=167357
final static String v15 = "Anon5$1A3";
final static String v14 = "Anon5$1$A3";
}
}
class A1 {
final static String v15 = "Anon5$1A3";
final static String v14 = "Anon5$1$A3";
{
new Object() {
final static String v15 = "Anon5$1A3$1";
final static String v14 = "Anon5$5";
};
}
}
static class A2 {
final static String v15 = "Anon5$1A3";
final static String v14 = "Anon5$1$A3";
{
new Object() {
final static String v15 = "Anon5$1A3$1";
final static String v14 = "Anon5$5";
};
}
static {
new Object() {
final static String v15 = "Anon5$1A3$1";
final static String v14 = "Anon5$5";
};
}
}
}
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